Mercurial > hg > octave-nkf
annotate configure.ac @ 16296:ef39f8b1c5c8
configure.ac: Unconditionally define AMCOND_HAVE_QSCINTILLA.
* configure.ac: Move macro definition for AMCOND_HAVE_QSCINTILLA out
of conditional block so that it is always defined.
author | Rik <rik@octave.org> |
---|---|
date | Wed, 13 Mar 2013 09:08:10 -0700 |
parents | 0925d1f6875e |
children | 00da706fba48 |
rev | line source |
---|---|
5 | 1 dnl Process this file with autoconf to produce a configure script. |
2 dnl | |
14138
72c96de7a403
maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents:
14103
diff
changeset
|
3 dnl Copyright (C) 1993-2012 John W. Eaton |
869 | 4 ### |
5 ### This file is part of Octave. | |
6 ### | |
7 ### Octave is free software; you can redistribute it and/or modify it | |
8 ### under the terms of the GNU General Public License as published by the | |
7016 | 9 ### Free Software Foundation; either version 3 of the License, or (at |
10 ### your option) any later version. | |
869 | 11 ### |
12 ### Octave is distributed in the hope that it will be useful, but WITHOUT | |
13 ### ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
14 ### FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
15 ### for more details. | |
16 ### | |
17 ### You should have received a copy of the GNU General Public License | |
7016 | 18 ### along with Octave; see the file COPYING. If not, see |
19 ### <http://www.gnu.org/licenses/>. | |
869 | 20 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
21 AC_PREREQ([2.62]) |
16035
999f8257313b
bump version number to 3.7.2+
John W. Eaton <jwe@octave.org>
parents:
16033
diff
changeset
|
22 AC_INIT([GNU Octave], [3.7.2+], [http://octave.org/bugs.html], [octave]) |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
23 |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
24 dnl PACKAGE_VERSION is set by the AC_INIT VERSION arg |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
25 OCTAVE_VERSION="$PACKAGE_VERSION" |
14204 | 26 OCTAVE_API_VERSION_NUMBER="48" |
9917
c1210502785b
provide OCTAVE_API_VERSION_NUMBER
John W. Eaton <jwe@octave.org>
parents:
9915
diff
changeset
|
27 OCTAVE_API_VERSION="api-v$OCTAVE_API_VERSION_NUMBER+" |
16033 | 28 OCTAVE_RELEASE_DATE="2013-02-09" |
16062
cc5a7d1233f3
bump version for 3.6.4-rc2
John W. Eaton <jwe@octave.org>
parents:
15945
diff
changeset
|
29 OCTAVE_COPYRIGHT="Copyright (C) 2013 John W. Eaton and others." |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
30 AC_SUBST(OCTAVE_VERSION) |
9917
c1210502785b
provide OCTAVE_API_VERSION_NUMBER
John W. Eaton <jwe@octave.org>
parents:
9915
diff
changeset
|
31 AC_SUBST(OCTAVE_API_VERSION_NUMBER) |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
32 AC_SUBST(OCTAVE_API_VERSION) |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
33 AC_SUBST(OCTAVE_RELEASE_DATE) |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
34 AC_SUBST(OCTAVE_COPYRIGHT) |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
35 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
36 dnl FIXME: We should auto-insert the Mercurial changeset ID into the |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
37 dnl AC_REVISION field whenever configure.ac is modified. |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
38 dnl AC_REVISION($Revision: 1.603 $) |
15195 | 39 AC_CONFIG_SRCDIR([libinterp/octave.cc]) |
15059
6130d87495b8
configure.ac: replace deprecated AC_CONFIG_HEADER macro
Carnë Draug <carandraug+dev@gmail.com>
parents:
15054
diff
changeset
|
40 AC_CONFIG_HEADERS([config.h]) |
9946 | 41 AC_CONFIG_AUX_DIR([build-aux]) |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
42 AC_CONFIG_MACRO_DIR([m4]) |
869 | 43 |
9946 | 44 AM_INIT_AUTOMAKE([1.11 tar-ustar]) |
45 | |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
46 OCTAVE_CANONICAL_HOST |
5844 | 47 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
48 AC_DEFINE(OCTAVE_SOURCE, 1, [Define to 1 if this is Octave.]) |
3887 | 49 |
9091
45c832e9976d
configure.in: require autoconf 2.60; eliminate some obsolete macros
John W. Eaton <jwe@octave.org>
parents:
9090
diff
changeset
|
50 AC_USE_SYSTEM_EXTENSIONS |
1667 | 51 |
15857
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
52 ### Make configure args available for other uses. |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
53 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
54 config_opts=$ac_configure_args |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
55 AC_SUBST(config_opts) |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
56 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
57 ### Set default file locations |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
58 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
59 OCTAVE_SET_DEFAULT([octlibdir], '$(libdir)/octave/$(version)') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
60 OCTAVE_SET_DEFAULT([archlibdir], |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
61 '$(libexecdir)/octave/$(version)/exec/$(canonical_host_type)') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
62 OCTAVE_SET_DEFAULT([localarchlibdir], |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
63 '$(libexecdir)/octave/site/exec/$(canonical_host_type)') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
64 OCTAVE_SET_DEFAULT([localapiarchlibdir], |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
65 '$(libexecdir)/octave/$(api_version)/site/exec/$(canonical_host_type)') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
66 OCTAVE_SET_DEFAULT([localverarchlibdir], |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
67 '$(libexecdir)/octave/$(version)/site/exec/$(canonical_host_type)') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
68 OCTAVE_SET_DEFAULT([octfiledir], |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
69 '$(libdir)/octave/$(version)/oct/$(canonical_host_type)') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
70 OCTAVE_SET_DEFAULT([localoctfiledir], |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
71 '$(libdir)/octave/site/oct/$(canonical_host_type)') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
72 OCTAVE_SET_DEFAULT([localapioctfiledir], |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
73 '$(libdir)/octave/site/oct/$(api_version)/$(canonical_host_type)') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
74 OCTAVE_SET_DEFAULT([localveroctfiledir], |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
75 '$(libdir)/octave/$(version)/site/oct/$(canonical_host_type)') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
76 OCTAVE_SET_DEFAULT([octincludedir], '$(includedir)/octave-$(version)/octave') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
77 OCTAVE_SET_DEFAULT([fcnfiledir], '$(datadir)/octave/$(version)/m') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
78 OCTAVE_SET_DEFAULT([localfcnfiledir], '$(datadir)/octave/site/m') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
79 OCTAVE_SET_DEFAULT([localapifcnfiledir], |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
80 '$(datadir)/octave/site/$(api_version)/m') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
81 OCTAVE_SET_DEFAULT([localverfcnfiledir], '$(datadir)/octave/$(version)/site/m') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
82 OCTAVE_SET_DEFAULT([octetcdir], '$(datadir)/octave/$(version)/etc') |
15971
e27d9b9b71f4
gui: install translation files into $(datadir)/octave/$(version)/locale
Torsten <ttl@justmail.de>
parents:
15969
diff
changeset
|
83 OCTAVE_SET_DEFAULT([octlocaledir], '$(datadir)/octave/$(version)/locale') |
15857
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
84 OCTAVE_SET_DEFAULT([doc_cache_file], '$(octetcdir)/doc-cache') |
16019
5b2126a8c84f
install tests and functions to run them
John W. Eaton <jwe@octave.org>
parents:
16012
diff
changeset
|
85 OCTAVE_SET_DEFAULT([octtestsdir], '$(octetcdir)/tests') |
15857
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
86 OCTAVE_SET_DEFAULT([texi_macros_file], '$(octetcdir)/macros.texi') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
87 OCTAVE_SET_DEFAULT([imagedir], '$(datadir)/octave/$(version)/imagelib') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
88 OCTAVE_SET_DEFAULT([man1dir], '$(mandir)/man1') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
89 OCTAVE_SET_DEFAULT([man1ext], '.1') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
90 OCTAVE_SET_DEFAULT([infofile], '$(infodir)/octave.info') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
91 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
92 ### Check for programs used in building, installing, and running Octave. |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
93 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
94 ## Programs used in configuring Octave. |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
95 ## Find pkg-config executable (sets $PKG_CONFIG) |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
96 PKG_PROG_PKG_CONFIG |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
97 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
98 ## Programs used in Makefiles. |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
99 AC_PROG_AWK |
16132
43e6415393ff
build: check for grep in configure and then use it in build process.
Rik <rik@octave.org>
parents:
16090
diff
changeset
|
100 AC_PROG_GREP |
15857
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
101 OCTAVE_PROG_FIND |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
102 OCTAVE_PROG_SED |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
103 OCTAVE_PROG_PERL |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
104 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
105 ## Programs used to build parts of Octave. |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
106 OCTAVE_PROG_GPERF |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
107 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
108 OCTAVE_PROG_FLEX |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
109 AC_SUBST([LEX_OUTPUT_ROOT], [lex.octave_]) |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
110 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
111 OCTAVE_PROG_BISON |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
112 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
113 OCTAVE_PROG_MAKEINFO |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
114 OCTAVE_PROG_TEXI2DVI |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
115 OCTAVE_PROG_TEXI2PDF |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
116 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
117 ## Programs used when installing Octave. |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
118 AC_PROG_LN_S |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
119 AC_PROG_MKDIR_P |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
120 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
121 AC_PROG_INSTALL |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
122 INSTALL_SCRIPT='${INSTALL}' |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
123 AC_SUBST(INSTALL_SCRIPT) |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
124 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
125 OCTAVE_PROG_DESKTOP_FILE_INSTALL |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
126 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
127 ## Programs used when running Octave |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
128 OCTAVE_PROG_GHOSTSCRIPT |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
129 OCTAVE_PROG_GNUPLOT |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
130 OCTAVE_PROG_PAGER |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
131 OCTAVE_PROG_PYTHON |
10123
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
132 |
5451 | 133 ### Path separator. |
10123
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
134 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
135 sepchar=':' |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
136 AC_ARG_WITH([sepchar], |
5842 | 137 [AS_HELP_STRING([--with-sepchar=<char>], |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
138 [use <char> as the path separation character])]) |
5451 | 139 case $with_sepchar in |
140 yes | "") | |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
141 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
142 mingw* | msdosmsvc) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
143 sepchar=';' ;; |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
144 esac |
5451 | 145 ;; |
146 no) | |
147 AC_MSG_ERROR([You are required to define a path separation character]) | |
148 ;; | |
149 *) | |
150 sepchar=$with_sepchar | |
151 ;; | |
152 esac | |
153 AC_SUBST(sepchar) | |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
154 AC_DEFINE_UNQUOTED(SEPCHAR, ['$sepchar'], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
155 [Define this to be the path separator for your system, as a character constant.]) |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
156 AC_DEFINE_UNQUOTED(SEPCHAR_STR, ["$sepchar"], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
157 [Define this to be the path separator for your system, as a string.]) |
5451 | 158 |
15756
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
159 ### Define the path to the shell on the host system. Most systems will |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
160 ### ensure /bin/sh is the default shell so this can be safely ignored by |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
161 ### almost everyone. However, when building for Android, for example, |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
162 ### this will need to be set. |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
163 SHELL_PATH=/bin/sh |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
164 AC_ARG_WITH([shell], |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
165 [AS_HELP_STRING([--with-shell=SHELL], |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
166 [use SHELL as the shell interpreter (default: /bin/sh)])]) |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
167 case $with_shell in |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
168 no) |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
169 AC_MSG_ERROR([A shell interpreter is required]) |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
170 ;; |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
171 yes | "") |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
172 ;; |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
173 *) |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
174 SHELL_PATH=$with_shell |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
175 ;; |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
176 esac |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
177 AC_DEFINE_UNQUOTED([SHELL_PATH], ["$SHELL_PATH"], |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
178 [Define this to be the path to the shell command interpreter.]) |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
179 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
180 ### Enable bounds checking on element references within Octave's array and |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
181 ### matrix classes. This slows down some operations a bit, so it is turned off |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
182 ### by default. |
2108 | 183 |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
184 BOUNDS_CHECKING=no |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
185 AC_ARG_ENABLE([bounds-check], |
5844 | 186 [AS_HELP_STRING([--enable-bounds-check], |
15238
c4779a180134
avoid confusing --disable-foo (default is yes) configure help messages
John W. Eaton <jwe@octave.org>
parents:
15237
diff
changeset
|
187 [enable bounds checking for indexing in internal array classes])], |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
188 [if test "$enableval" = yes; then BOUNDS_CHECKING=yes; fi], []) |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
189 if test $BOUNDS_CHECKING = yes; then |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
190 AC_DEFINE(BOUNDS_CHECKING, 1, [Define to 1 to use internal bounds checking.]) |
2108 | 191 fi |
192 | |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
193 ### Use Octave's built-in memory allocator rather than straightforward malloc. |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
194 ### Disabled by default. |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
195 |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
196 USE_OCTAVE_ALLOCATOR=no |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
197 AC_ARG_ENABLE([octave-allocator], |
13838
a35d381e22b0
make octave_allocator optional and disable by default
John W. Eaton <jwe@octave.org>
parents:
13745
diff
changeset
|
198 [AS_HELP_STRING([--enable-octave-allocator], |
15238
c4779a180134
avoid confusing --disable-foo (default is yes) configure help messages
John W. Eaton <jwe@octave.org>
parents:
15237
diff
changeset
|
199 [use the obsolete octave_allocator class for many of Octave's objects (mostly octave_value types). You probably do NOT want to enable this feature.])], |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
200 [if test "$enableval" = yes; then USE_OCTAVE_ALLOCATOR=yes; fi], []) |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
201 if test $USE_OCTAVE_ALLOCATOR = yes; then |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
202 AC_DEFINE(USE_OCTAVE_ALLOCATOR, 1, |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
203 [Define to 1 to use octave_allocator class.]) |
13838
a35d381e22b0
make octave_allocator optional and disable by default
John W. Eaton <jwe@octave.org>
parents:
13745
diff
changeset
|
204 fi |
a35d381e22b0
make octave_allocator optional and disable by default
John W. Eaton <jwe@octave.org>
parents:
13745
diff
changeset
|
205 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
206 ### Use atomic operations for internal reference counting. This is required |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
207 ### for thread-safe behavior but incurs a significant slowdown, and is thus |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
208 ### disabled by default. |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
209 |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
210 USE_ATOMIC_REFCOUNT=no |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
211 AC_ARG_ENABLE([atomic-refcount], |
13985
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
212 [AS_HELP_STRING([--enable-atomic-refcount], |
15238
c4779a180134
avoid confusing --disable-foo (default is yes) configure help messages
John W. Eaton <jwe@octave.org>
parents:
15237
diff
changeset
|
213 [use atomic operations for internal reference counting. This is required for thread-safe behavior but does not by itself make Octave internals thread safe.])], |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
214 [if test "$enableval" = yes; then USE_ATOMIC_REFCOUNT=yes; fi], []) |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
215 if test $USE_ATOMIC_REFCOUNT = yes; then |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
216 AC_DEFINE(USE_ATOMIC_REFCOUNT, 1, |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
217 [Define to 1 to use atomic operations for reference counting.]) |
13985
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
218 fi |
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
219 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
220 ### Disable running Make in the doc directory. |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
221 ### This is useful, for example, when building Octave on systems without TeX. |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
222 |
10092
02453ee20140
allow building of docs to be disabled
John W. Eaton <jwe@octave.org>
parents:
10077
diff
changeset
|
223 DOCDIR=doc |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
224 AC_ARG_ENABLE([docs], |
15238
c4779a180134
avoid confusing --disable-foo (default is yes) configure help messages
John W. Eaton <jwe@octave.org>
parents:
15237
diff
changeset
|
225 [AS_HELP_STRING([--disable-docs], [don't build documentation files])], |
10092
02453ee20140
allow building of docs to be disabled
John W. Eaton <jwe@octave.org>
parents:
10077
diff
changeset
|
226 [if test "$enableval" = no; then |
02453ee20140
allow building of docs to be disabled
John W. Eaton <jwe@octave.org>
parents:
10077
diff
changeset
|
227 DOCDIR= |
02453ee20140
allow building of docs to be disabled
John W. Eaton <jwe@octave.org>
parents:
10077
diff
changeset
|
228 warn_docs="building documentation disabled; make dist will fail" |
14605
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
229 OCTAVE_CONFIGURE_WARNING([warn_docs]) |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
230 fi], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
231 []) |
10092
02453ee20140
allow building of docs to be disabled
John W. Eaton <jwe@octave.org>
parents:
10077
diff
changeset
|
232 AC_SUBST(DOCDIR) |
02453ee20140
allow building of docs to be disabled
John W. Eaton <jwe@octave.org>
parents:
10077
diff
changeset
|
233 |
5275 | 234 ### If possible, use a 64-bit integer type for array dimensions and indexing. |
235 | |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
236 USE_64_BIT_IDX_T=no |
5275 | 237 OCTAVE_IDX_TYPE=int |
238 AC_ARG_ENABLE(64, | |
5844 | 239 [AS_HELP_STRING([--enable-64], |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
240 [(EXPERIMENTAL) use 64-bit integers for array dimensions and indexing])], |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
241 [if test "$enableval" = yes; then USE_64_BIT_IDX_T=yes; fi], []) |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
242 if test $USE_64_BIT_IDX_T = yes; then |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
243 AC_CHECK_SIZEOF([void *]) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
244 AC_CHECK_SIZEOF([int]) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
245 AC_CHECK_SIZEOF([long]) |
5275 | 246 if test $ac_cv_sizeof_void_p -eq 8; then |
247 if test $ac_cv_sizeof_int -eq 8; then | |
248 OCTAVE_IDX_TYPE=int | |
249 elif test $ac_cv_sizeof_long -eq 8; then | |
250 OCTAVE_IDX_TYPE=long | |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
251 AC_DEFINE(IDX_TYPE_LONG, 1, [Define to 1 if octave index type is long.]) |
5275 | 252 else |
5857 | 253 warn_64_bit="no suitable type found for octave_idx_type so disabling 64-bit features" |
14605
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
254 OCTAVE_CONFIGURE_WARNING([warn_64_bit]) |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
255 USE_64_BIT_IDX_T=no |
5275 | 256 fi |
257 else | |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
258 warn_64_bit="pointers are not 64-bits wide; disabling 64-bit features" |
14605
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
259 OCTAVE_CONFIGURE_WARNING([warn_64_bit]) |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
260 USE_64_BIT_IDX_T=no |
5275 | 261 fi |
262 fi | |
263 AC_SUBST(OCTAVE_IDX_TYPE) | |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
264 AC_DEFINE_UNQUOTED(OCTAVE_IDX_TYPE, [$OCTAVE_IDX_TYPE], |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
265 [Define to the type of octave_idx_type (64 or 32 bit signed integer).]) |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
266 if test $USE_64_BIT_IDX_T = yes; then |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
267 AC_DEFINE(USE_64_BIT_IDX_T, 1, |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
268 [Define to 1 if using 64-bit integers for array dimensions and indexing.]) |
5275 | 269 fi |
270 AC_SUBST(USE_64_BIT_IDX_T) | |
271 | |
3215 | 272 ### It seems that there are some broken inline assembly functions in |
273 ### the GNU libc. Since I'm not sure how to test whether we are using | |
274 ### GNU libc, just disable them for all platforms. | |
275 | |
5844 | 276 AC_MSG_NOTICE([defining __NO_MATH_INLINES avoids buggy GNU libc exp function]) |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
277 AC_DEFINE(__NO_MATH_INLINES, 1, |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
278 [Define to 1 if your version of GNU libc has buggy inline assembly code for math functions like exp.]) |
3215 | 279 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
280 ### Determine which C++ compiler to use (we expect to find g++). |
869 | 281 |
405 | 282 AC_PROG_CXX |
283 AC_PROG_CXXCPP | |
869 | 284 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
285 ### Check version number when using g++. |
869 | 286 |
15167
1c711a646fa7
Deprecate configure variables CC_VERSION, CXX_VERSION.
Rik <rik@octave.org>
parents:
15166
diff
changeset
|
287 GXX_VERSION= |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
288 if test "$GXX" = yes; then |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
289 gxx_version=`$CXX -v 2>&1 | grep "^.*g.. version" | \ |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
290 sed -e 's/^.*g.. version *//' -e 's/cygnus-//' -e 's/egcs-//' -e 's/ .*//'` |
3107 | 291 |
15170
a44ff4f0a20b
Add AX_COMPARE_VERSION.m4 macro m4/ dir to make configure.ac simpler.
Rik <rik@octave.org>
parents:
15168
diff
changeset
|
292 AX_COMPARE_VERSION([$gxx_version], [lt], [3.5], |
a44ff4f0a20b
Add AX_COMPARE_VERSION.m4 macro m4/ dir to make configure.ac simpler.
Rik <rik@octave.org>
parents:
15168
diff
changeset
|
293 [AC_MSG_ERROR([g++ version $gxx_version will probably fail to compile Octave])]) |
869 | 294 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
295 GXX_VERSION=$gxx_version |
1894 | 296 fi |
15167
1c711a646fa7
Deprecate configure variables CC_VERSION, CXX_VERSION.
Rik <rik@octave.org>
parents:
15166
diff
changeset
|
297 AC_SUBST(GXX_VERSION) |
1c711a646fa7
Deprecate configure variables CC_VERSION, CXX_VERSION.
Rik <rik@octave.org>
parents:
15166
diff
changeset
|
298 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
299 ## FIXME: CXX_VERSION is deprecated and should be removed in Octave version 3.12 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
300 CXX_VERSION=$gxx_version |
1894 | 301 AC_SUBST(CXX_VERSION) |
302 | |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
303 ### Determine which C compiler to use (we expect to find gcc). |
869 | 304 |
5 | 305 AC_PROG_CC |
405 | 306 AC_PROG_CPP |
832 | 307 AC_PROG_GCC_TRADITIONAL |
869 | 308 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
309 ## Check for MSVC |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
310 have_msvc=no |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
311 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
312 msdosmsvc) |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
313 have_msvc=yes |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
314 ;; |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
315 mingw*) |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
316 AC_MSG_CHECKING([for MSVC compiler]) |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
317 AC_PREPROC_IFELSE([AC_LANG_SOURCE([[ |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
318 #ifndef _MSC_VER |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
319 #error "Not MSVC compiler" |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
320 #endif |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
321 ]])], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
322 have_msvc=yes, have_msvc=no) |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
323 AC_MSG_RESULT([$have_msvc]) |
405 | 324 ;; |
5 | 325 esac |
869 | 326 |
15142
f4684192158e
configure.ac: Split gnulib initialization into 2 parts to match recommended usage.
Rik <rik@octave.org>
parents:
15141
diff
changeset
|
327 ### gnulib initialization: part 1 |
f4684192158e
configure.ac: Split gnulib initialization into 2 parts to match recommended usage.
Rik <rik@octave.org>
parents:
15141
diff
changeset
|
328 ### Must take place immediately after a compiler is determined |
9946 | 329 |
330 gl_EARLY | |
331 | |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
332 ### Check version number when using gcc. |
869 | 333 |
15167
1c711a646fa7
Deprecate configure variables CC_VERSION, CXX_VERSION.
Rik <rik@octave.org>
parents:
15166
diff
changeset
|
334 GCC_VERSION= |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
335 if test "$GCC" = yes; then |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
336 gcc_version=`$CC -v 2>&1 | grep "^.*gcc version" | \ |
15168
66dcad99b55e
configure.ac: Correct GCC_VERSION test to return only version number and no other text.
Rik <rik@octave.org>
parents:
15167
diff
changeset
|
337 sed -e 's/^.*g.. version *//' -e 's/cygnus-//' -e 's/egcs-//' -e 's/ .*//'` |
66dcad99b55e
configure.ac: Correct GCC_VERSION test to return only version number and no other text.
Rik <rik@octave.org>
parents:
15167
diff
changeset
|
338 |
15170
a44ff4f0a20b
Add AX_COMPARE_VERSION.m4 macro m4/ dir to make configure.ac simpler.
Rik <rik@octave.org>
parents:
15168
diff
changeset
|
339 AX_COMPARE_VERSION([$gcc_version], [lt], [3], |
a44ff4f0a20b
Add AX_COMPARE_VERSION.m4 macro m4/ dir to make configure.ac simpler.
Rik <rik@octave.org>
parents:
15168
diff
changeset
|
340 [warn_gcc_version="gcc version $gcc_version is likely to cause problems" |
a44ff4f0a20b
Add AX_COMPARE_VERSION.m4 macro m4/ dir to make configure.ac simpler.
Rik <rik@octave.org>
parents:
15168
diff
changeset
|
341 OCTAVE_CONFIGURE_WARNING([warn_gcc_version])]) |
a44ff4f0a20b
Add AX_COMPARE_VERSION.m4 macro m4/ dir to make configure.ac simpler.
Rik <rik@octave.org>
parents:
15168
diff
changeset
|
342 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
343 GCC_VERSION=$gcc_version |
1894 | 344 fi |
345 AC_SUBST(CC_VERSION) | |
346 | |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
347 ## FIXME: CC_VERSION is deprecated and should be removed in Octave version 3.12 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
348 CC_VERSION=$gcc_version |
15167
1c711a646fa7
Deprecate configure variables CC_VERSION, CXX_VERSION.
Rik <rik@octave.org>
parents:
15166
diff
changeset
|
349 AC_SUBST(GCC_VERSION) |
3775 | 350 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
351 ### Determine the compiler flag necessary to create dependencies |
3775 | 352 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
353 ## Assume GCC. |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
354 INCLUDE_DEPS=yes |
3775 | 355 DEPEND_FLAGS="-M" |
356 DEPEND_EXTRA_SED_PATTERN="" | |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
357 if test "$GCC" != yes; then |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
358 case $canonical_host_type in |
6087 | 359 sparc-sun-solaris2* | i386-pc-solaris2*) |
3775 | 360 DEPEND_FLAGS="-xM1" |
361 DEPEND_EXTRA_SED_PATTERN="-e '/\/opt\/SUNWspro/d'" | |
6087 | 362 ;; |
7451 | 363 *-*-msdosmsvc) |
364 ;; | |
10123
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
365 *-*-mingw*) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
366 if test $have_msvc = no; then |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
367 INCLUDE_DEPS=no |
10123
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
368 fi |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
369 ;; |
6087 | 370 *) |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
371 INCLUDE_DEPS=no |
6087 | 372 ;; |
373 esac | |
374 fi | |
375 AC_SUBST(INCLUDE_DEPS) | |
3775 | 376 AC_SUBST(DEPEND_FLAGS) |
377 AC_SUBST(DEPEND_EXTRA_SED_PATTERN) | |
378 | |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
379 ### Check for pthread library |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
380 |
10951 | 381 AX_PTHREAD |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
382 ## Include pthread libs and flags early in case other tests need them. |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
383 ## They seem to be required for the OpenGL tests on Debian systems. |
9970
cc7ea6083774
configure.ac: use pthread flags and libs for tests
John W. Eaton <jwe@octave.org>
parents:
9946
diff
changeset
|
384 LIBS="$PTHREAD_LIBS $LIBS" |
cc7ea6083774
configure.ac: use pthread flags and libs for tests
John W. Eaton <jwe@octave.org>
parents:
9946
diff
changeset
|
385 CFLAGS="$CFLAGS $PTHREAD_CFLAGS" |
15123
4e0ab3b28418
Eliminate duplicate PTHREAD_CFLAGS inclusion in build process.
Rik <rik@octave.org>
parents:
15071
diff
changeset
|
386 CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS" |
8595
dee5d60257e4
Use Carbon framework to determine ScreenSize on Mac.
Thomas Treichl <Thomas.Treichl@gmx.net>
parents:
8577
diff
changeset
|
387 |
9603
8bea4e89326f
implement FLOAT_STORE to allow safer complex comparisons on x87
Jaroslav Hajek <highegg@gmail.com>
parents:
9596
diff
changeset
|
388 ### When compiling math for x87, problems may arise in some code comparing |
8bea4e89326f
implement FLOAT_STORE to allow safer complex comparisons on x87
Jaroslav Hajek <highegg@gmail.com>
parents:
9596
diff
changeset
|
389 ### floating-point intermediate results. |
8bea4e89326f
implement FLOAT_STORE to allow safer complex comparisons on x87
Jaroslav Hajek <highegg@gmail.com>
parents:
9596
diff
changeset
|
390 ### Generally, it helps to store the result in a local volatile variable, |
8bea4e89326f
implement FLOAT_STORE to allow safer complex comparisons on x87
Jaroslav Hajek <highegg@gmail.com>
parents:
9596
diff
changeset
|
391 ### but it also degrades performance. |
8bea4e89326f
implement FLOAT_STORE to allow safer complex comparisons on x87
Jaroslav Hajek <highegg@gmail.com>
parents:
9596
diff
changeset
|
392 ### Thus, we provide a FLOAT_TRUNCATE macro that may be defined to "volatile" |
8bea4e89326f
implement FLOAT_STORE to allow safer complex comparisons on x87
Jaroslav Hajek <highegg@gmail.com>
parents:
9596
diff
changeset
|
393 ### when compiling for x87 target, or left empty for modern SSE math, that |
8bea4e89326f
implement FLOAT_STORE to allow safer complex comparisons on x87
Jaroslav Hajek <highegg@gmail.com>
parents:
9596
diff
changeset
|
394 ### doesn't suffer from this problem at all. |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
395 AC_ARG_ENABLE([float-truncate], |
9603
8bea4e89326f
implement FLOAT_STORE to allow safer complex comparisons on x87
Jaroslav Hajek <highegg@gmail.com>
parents:
9596
diff
changeset
|
396 [AS_HELP_STRING([--enable-float-truncate], |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
397 [enables truncating intermediate FP results.])], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
398 [if test "$enableval" = yes; then |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
399 ac_float_truncate=volatile |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
400 else |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
401 ac_float_truncate= |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
402 fi], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
403 [ac_float_truncate=]) |
9603
8bea4e89326f
implement FLOAT_STORE to allow safer complex comparisons on x87
Jaroslav Hajek <highegg@gmail.com>
parents:
9596
diff
changeset
|
404 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
405 AC_DEFINE_UNQUOTED(FLOAT_TRUNCATE, [$ac_float_truncate], |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
406 [Define to volatile if you need to truncate intermediate FP results.]) |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
407 |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
408 ### Determine extra CFLAGS that may be necessary for Octave. |
9603
8bea4e89326f
implement FLOAT_STORE to allow safer complex comparisons on x87
Jaroslav Hajek <highegg@gmail.com>
parents:
9596
diff
changeset
|
409 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
410 ## On Intel systems with gcc, we may need to compile with -mieee-fp |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
411 ## to get full support for IEEE floating point. |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
412 ## |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
413 ## On Alpha/OSF systems, we need -mieee. |
869 | 414 |
3126 | 415 ieee_fp_flag= |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
416 case $canonical_host_type in |
3887 | 417 i[[3456789]]86-*-*) |
5076 | 418 if test "$GCC" = yes; then |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
419 OCTAVE_CC_FLAG([-mieee-fp], [ |
5076 | 420 ieee_fp_flag=-mieee-fp |
421 XTRA_CFLAGS="$XTRA_CFLAGS -mieee-fp" | |
5844 | 422 AC_MSG_NOTICE([adding -mieee-fp to XTRA_CFLAGS])]) |
5076 | 423 fi |
424 if test "$GXX" = yes; then | |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
425 OCTAVE_CXX_FLAG([-mieee-fp], [ |
12451 | 426 ieee_fp_flag=-mieee-fp |
427 XTRA_CXXFLAGS="$XTRA_CXXFLAGS -mieee-fp" | |
428 AC_MSG_NOTICE([adding -mieee-fp to XTRA_CXXFLAGS])]) | |
5076 | 429 fi |
324 | 430 ;; |
3127 | 431 alpha*-*-*) |
4284 | 432 if test "$GCC" = yes; then |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
433 OCTAVE_CC_FLAG([-mieee], [ |
12451 | 434 ieee_fp_flag=-mieee |
435 XTRA_CFLAGS="$XTRA_CFLAGS -mieee" | |
436 AC_MSG_NOTICE([adding -mieee to XTRA_CFLAGS])]) | |
5076 | 437 else |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
438 OCTAVE_CC_FLAG([-ieee], [ |
12451 | 439 ieee_fp_flag=-ieee |
440 XTRA_CFLAGS="$XTRA_CFLAGS -ieee" | |
441 AC_MSG_NOTICE([adding -ieee to XTRA_CFLAGS])]) | |
5076 | 442 fi |
443 if test "$GXX" = yes; then | |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
444 OCTAVE_CXX_FLAG([-mieee], [ |
12451 | 445 ieee_fp_flag=-mieee |
446 XTRA_CXXFLAGS="$XTRA_CXXFLAGS -mieee" | |
447 AC_MSG_NOTICE([adding -mieee to XTRA_CXXFLAGS])]) | |
4284 | 448 else |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
449 OCTAVE_CXX_FLAG([-ieee], [ |
12451 | 450 ieee_fp_flag=-ieee |
451 XTRA_CXXFLAGS="$XTRA_CXXFLAGS -ieee" | |
452 AC_MSG_NOTICE([adding -ieee to XTRA_CXXFLAGS])]) | |
4284 | 453 fi |
2020 | 454 ;; |
3176 | 455 *ibm-aix4*) |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
456 OCTAVE_CC_FLAG([-mminimal-toc], [ |
3351 | 457 XTRA_CFLAGS="$XTRA_CFLAGS -mminimal-toc"]) |
3176 | 458 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
459 OCTAVE_CXX_FLAG([-mminimal-toc], [ |
3351 | 460 XTRA_CXXFLAGS="$XTRA_CXXFLAGS -mminimal-toc"]) |
3176 | 461 ;; |
324 | 462 esac |
3126 | 463 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
464 AC_SUBST(XTRA_CFLAGS) |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
465 AC_SUBST(XTRA_CXXFLAGS) |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
466 |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
467 ### Test whether the compiler supports OpenMP. This is experimental so disable |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
468 ### it by default. Enable it with the flag --enable-openmp. |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
469 |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
470 USE_OPENMP=no |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
471 AC_ARG_ENABLE([openmp], |
10471
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10456
diff
changeset
|
472 [AS_HELP_STRING([--enable-openmp], |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
473 [(EXPERIMENTAL) use OpenMP SMP multi-threading])], |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
474 [if test "$enableval" = yes; then USE_OPENMP=yes; fi], []) |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
475 if test $USE_OPENMP = yes; then |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
476 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
477 mingw* | cygwin* | *-gnu*) |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
478 OCTAVE_CHECK_OPENMP(-fopenmp) |
10471
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10456
diff
changeset
|
479 ;; |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
480 msdosmsvc) |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
481 ## FIXME: is this the right flag for MSVC? |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
482 OCTAVE_CHECK_OPENMP(-openmp) |
10471
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10456
diff
changeset
|
483 ;; |
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10456
diff
changeset
|
484 ## Add other compilers supporting OpenMP here |
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10456
diff
changeset
|
485 esac |
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10456
diff
changeset
|
486 fi |
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10456
diff
changeset
|
487 |
4094 | 488 ### Defaults for cross compiling. BUILD_CC and BUILD_CXX are |
489 ### the compilers that we use for building tools on the build system. | |
4098 | 490 ### For now, we assume that the only cross compiling we can do is |
4298 | 491 ### with gcc on a Unixy system, but the dedicated hacker can override these. |
4094 | 492 |
493 if test "$cross_compiling" = yes; then | |
494 BUILD_CC="gcc" | |
495 BUILD_CFLAGS="-O2 -g" | |
496 BUILD_CXX="g++" | |
497 BUILD_CXXFLAGS="-O2 -g" | |
4298 | 498 BUILD_LDFLAGS="" |
4098 | 499 BUILD_EXEEXT="" |
4094 | 500 else |
4298 | 501 BUILD_CC='$(CC)' |
502 BUILD_CFLAGS='$(CFLAGS)' | |
503 BUILD_CXX='$(CXX)' | |
504 BUILD_CXXFLAGS='$(CXXFLAGS)' | |
505 BUILD_LDFLAGS='$(LDFLAGS)' | |
506 BUILD_EXEEXT='$(EXEEXT)' | |
4094 | 507 fi |
508 | |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
509 AC_ARG_VAR([BUILD_CC], |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
510 [build system C compiler (used if cross compiling)]) |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
511 AC_ARG_VAR([BUILD_CFLAGS], |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
512 [build system C compiler flags (used if cross compiling)]) |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
513 AC_ARG_VAR([BUILD_CXX], |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
514 [build system C++ compiler (used if cross compiling)]) |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
515 AC_ARG_VAR([BUILD_CXXFLAGS], |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
516 [build system C++ compiler flags (used if cross compiling)]) |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
517 AC_ARG_VAR([BUILD_LDFLAGS], |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
518 [build system C++ compiler link flags (used if cross compiling)]) |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
519 AC_ARG_VAR([BUILD_EXEEXT], |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
520 [build system executable extension (used if cross compiling)]) |
3222 | 521 |
3232 | 522 |
523 ### Look for math library. If found, this will add -lm to LIBS. | |
524 | |
15875
c18692212b90
configure.ac: Simplify test for math library.
Rik <rik@octave.org>
parents:
15874
diff
changeset
|
525 dnl Keep this check before the check for the Fortran compiler, |
c18692212b90
configure.ac: Simplify test for math library.
Rik <rik@octave.org>
parents:
15874
diff
changeset
|
526 dnl in case -lm is needed to compile Fortran programs. |
c18692212b90
configure.ac: Simplify test for math library.
Rik <rik@octave.org>
parents:
15874
diff
changeset
|
527 AC_CHECK_LIB(m, sin) |
3232 | 528 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
529 ### Determine the Fortran compiler and how to invoke it |
3232 | 530 |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
531 ## Default FFLAGS is -O. |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
532 if test x"$FFLAGS" = x""; then |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
533 FFLAGS="-O" |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
534 fi |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
535 |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
536 ## the F77 variable, if set, overrides AC_PROG_F77 automatically |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
537 AC_PROG_F77 |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
538 AC_F77_LIBRARY_LDFLAGS |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
539 AC_F77_DUMMY_MAIN |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
540 AC_F77_WRAPPERS |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
541 |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
542 F77_TOLOWER=yes |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
543 F77_APPEND_UNDERSCORE=yes |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
544 F77_APPEND_EXTRA_UNDERSCORE=yes |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
545 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
546 case $ac_cv_f77_mangling in |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
547 "upper case") F77_TOLOWER=no ;; |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
548 esac |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
549 case $ac_cv_f77_mangling in |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
550 "no underscore") F77_APPEND_UNDERSCORE=no ;; |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
551 esac |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
552 case $ac_cv_f77_mangling in |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
553 "no extra underscore") F77_APPEND_EXTRA_UNDERSCORE=no ;; |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
554 esac |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
555 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
556 case $canonical_host_type in |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
557 i[[3456789]]86-*-*) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
558 if test $ac_cv_f77_compiler_gnu = yes; then |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
559 OCTAVE_F77_FLAG([-mieee-fp]) |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
560 fi |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
561 ;; |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
562 alpha*-*-*) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
563 if test $ac_cv_f77_compiler_gnu = yes; then |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
564 OCTAVE_F77_FLAG([-mieee]) |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
565 else |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
566 OCTAVE_F77_FLAG([-ieee]) |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
567 OCTAVE_F77_FLAG([-fpe1]) |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
568 fi |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
569 ;; |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
570 powerpc-apple-machten*) |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
571 FFLAGS= |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
572 ;; |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
573 esac |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
574 |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
575 if test -n "$FFLAGS"; then |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
576 AC_MSG_NOTICE([defining FFLAGS to be $FFLAGS]) |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
577 fi |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
578 |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
579 AC_SUBST(F77_TOLOWER) |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
580 AC_SUBST(F77_APPEND_UNDERSCORE) |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
581 AC_SUBST(F77_APPEND_EXTRA_UNDERSCORE) |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
582 |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
583 if test -z "$F77"; then |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
584 AC_MSG_ERROR([in order to build Octave, you must have a compatible Fortran compiler or wrapper script for f2c that functions as a Fortran compiler installed and in your path. See the file INSTALL for more information.]) |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
585 fi |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
586 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
587 OCTAVE_CHECK_FUNC_FORTRAN_ISNAN |
14550
bc4c574ab3b6
Add configure check for isnan in fortran.
Carlo de Falco <cdf@users.sourceforge.net>
parents:
14398
diff
changeset
|
588 F77_ISNAN_MACRO= |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
589 if test $octave_cv_func_fortran_isnan = no; then |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
590 AC_MSG_NOTICE([substituting ISNAN(X) with X.NE.X in Fortran sources]) |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
591 F77_ISNAN_MACRO="s|ISNAN(\(@<:@^)@:>@*\))|(\1.NE.\1)|" |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
592 fi |
14550
bc4c574ab3b6
Add configure check for isnan in fortran.
Carlo de Falco <cdf@users.sourceforge.net>
parents:
14398
diff
changeset
|
593 AC_SUBST(F77_ISNAN_MACRO) |
bc4c574ab3b6
Add configure check for isnan in fortran.
Carlo de Falco <cdf@users.sourceforge.net>
parents:
14398
diff
changeset
|
594 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
595 OCTAVE_CHECK_SIZEOF_FORTRAN_INTEGER |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
596 if test $octave_cv_sizeof_fortran_integer = no; then |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
597 if test $USE_64_BIT_IDX_T = yes; then |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
598 case $F77 in |
10331
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
599 *gfortran*) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
600 case $F77_INTEGER_8_FLAG in |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
601 *-fdefault-integer-8*) |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
602 ;; |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
603 *) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
604 case $FFLAGS in |
10331
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
605 *-fdefault-integer-8*) |
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
606 AC_MSG_NOTICE([setting -fdefault-integer-8 in F77_INTEGER_8_FLAG instead of FFLAGS]) |
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
607 FFLAGS=`echo $FFLAGS | sed 's/-fdefault-integer-8//g'` |
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
608 F77_INTEGER_8_FLAG="-fdefault-integer-8" |
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
609 ;; |
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
610 *) |
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
611 AC_MSG_NOTICE([adding -fdefault-integer-8 to F77_INTEGER_8_FLAG]) |
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
612 F77_INTEGER_8_FLAG="-fdefault-integer-8" |
12451 | 613 ## Invalidate the cache and try again. |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
614 $as_unset octave_cv_sizeof_fortran_integer |
10331
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
615 ;; |
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
616 esac |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
617 ;; |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
618 esac |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
619 ;; |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
620 esac |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
621 if test -z "$octave_cv_sizeof_fortran_integer"; then |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
622 OCTAVE_CHECK_SIZEOF_FORTRAN_INTEGER |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
623 fi |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
624 if test $octave_cv_sizeof_fortran_integer = no; then |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
625 AC_MSG_ERROR([in order to build Octave with 64-bit indexing support your Fortran compiler must have an option for setting the default integer size to 8 bytes. See the file INSTALL for more information.]) |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
626 fi |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
627 else |
10331
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
628 AC_MSG_ERROR([your Fortran compiler must have an option to make integers the same size as octave_idx_type ($OCTAVE_IDX_TYPE). See the file INSTALL for more information.]) |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
629 fi |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
630 fi |
10331
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
631 AC_SUBST(F77_INTEGER_8_FLAG) |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
632 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
633 ## FIXME: Is this really used? Makefile seems to use $F77 for compiler |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
634 FC=$F77 |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
635 AC_SUBST(FC) |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
636 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
637 OCTAVE_F77_FLAG([-ffloat-store], [ |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
638 AC_MSG_RESULT([setting F77_FLOAT_STORE_FLAG to -ffloat-store]) |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
639 F77_FLOAT_STORE_FLAG=-ffloat-store |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
640 AC_SUBST(F77_FLOAT_STORE_FLAG) |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
641 ]) |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
642 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
643 ### Check for the Qhull library |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
644 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
645 OCTAVE_CHECK_LIB(qhull, QHull, |
9519
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
646 [Qhull library not found -- this will result in loss of functionality of some geometry functions.], |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
647 [libqhull/libqhull.h qhull/libqhull.h libqhull.h qhull/qhull.h qhull.h], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
648 [qh_qhull], [], [], |
9519
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
649 [warn_qhull= |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
650 OCTAVE_CHECK_QHULL_VERSION |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
651 OCTAVE_CHECK_LIB_QHULL_OK( |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
652 [TEXINFO_QHULL="@set HAVE_QHULL" |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
653 AC_DEFINE(HAVE_QHULL, 1, [Define to 1 if Qhull is available.])], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
654 [warn_qhull="Qhull library found, but does not seem to work properly -- this will result in loss of functionality of some geometry functions. Please try recompiling the library with -fno-strict-aliasing."])]) |
6855 | 655 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
656 ### Check for PCRE regex library. |
12464
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
657 |
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
658 REGEX_LIBS= |
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
659 |
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
660 pcre_fail_msg="to build Octave, you must have the PCRE library and header files installed" |
7173 | 661 |
14025
9867be070ee1
use pcre/pcre.h if it is present
John W. Eaton <jwe@octave.org>
parents:
13985
diff
changeset
|
662 AC_CHECK_HEADERS([pcre.h pcre/pcre.h]) |
9867be070ee1
use pcre/pcre.h if it is present
John W. Eaton <jwe@octave.org>
parents:
13985
diff
changeset
|
663 |
12464
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
664 AC_CACHE_CHECK([whether pcre.h defines the macros we need], |
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
665 [ac_cv_pcre_h_macros_present], |
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
666 [AC_EGREP_CPP([PCRE_HAS_MACROS_WE_NEED], [ |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
667 #if defined (HAVE_PCRE_H) |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
668 # include <pcre.h> |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
669 #elif defined (HAVE_PCRE_PCRE_H) |
15523
bf466a60651f
maint: periodic merge of stable to default
Jordi Gutiérrez Hermoso <jordigh@octave.org>
diff
changeset
|
670 # include <pcre/pcre.h> |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
671 #error "NO PCRE HEADER" |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
672 #endif |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
673 #if defined (PCRE_INFO_NAMECOUNT) \ |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
674 && defined (PCRE_INFO_NAMEENTRYSIZE) \ |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
675 && defined (PCRE_INFO_NAMETABLE) |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
676 PCRE_HAS_MACROS_WE_NEED |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
677 #endif], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
678 ac_cv_pcre_h_macros_present=yes, ac_cv_pcre_h_macros_present=no)]) |
7169 | 679 |
12464
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
680 if test $ac_cv_pcre_h_macros_present = yes; then |
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
681 ## check for pcre-config, and if so, set XTRA_CXXFLAGS appropriately |
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
682 AC_CHECK_PROG(HAVE_PCRE_CONFIG, pcre-config, [yes], [no]) |
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
683 if test $HAVE_PCRE_CONFIG = yes; then |
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
684 XTRA_CXXFLAGS="$XTRA_CXXFLAGS `pcre-config --cflags`" |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
685 REGEX_LIBS=`pcre-config --libs` |
7173 | 686 else |
12464
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
687 REGEX_LIBS="-lpcre" |
7173 | 688 fi |
8621
f1534e248260
configure.in: check for pcre_compile, don't check for other regex functions if pcre library is found
John W. Eaton <jwe@octave.org>
parents:
8618
diff
changeset
|
689 save_LIBS="$LIBS" |
f1534e248260
configure.in: check for pcre_compile, don't check for other regex functions if pcre library is found
John W. Eaton <jwe@octave.org>
parents:
8618
diff
changeset
|
690 LIBS="$REGEX_LIBS $LIBS" |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
691 AC_CHECK_FUNCS([pcre_compile], |
12464
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
692 [AC_SUBST(REGEX_LIBS)], |
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
693 [AC_MSG_ERROR([$pcre_fail_msg])]) |
8621
f1534e248260
configure.in: check for pcre_compile, don't check for other regex functions if pcre library is found
John W. Eaton <jwe@octave.org>
parents:
8618
diff
changeset
|
694 LIBS="$save_LIBS" |
7174 | 695 else |
12464
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
696 AC_MSG_ERROR([$pcre_fail_msg]) |
6133 | 697 fi |
7169 | 698 |
5270 | 699 ### Check for ZLIB library. |
3820 | 700 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
701 OCTAVE_CHECK_LIB(z, ZLIB, |
9538
d0239bddf621
use OCTAVE_CHECK_LIB to check for zlib
John W. Eaton <jwe@octave.org>
parents:
9536
diff
changeset
|
702 [ZLIB library not found. Octave will not be able to save or load compressed data files or HDF5 files.], |
d0239bddf621
use OCTAVE_CHECK_LIB to check for zlib
John W. Eaton <jwe@octave.org>
parents:
9536
diff
changeset
|
703 [zlib.h], [gzclearerr]) |
3687 | 704 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
705 ### Check for the LLVM library |
15001
894cf2c07f92
Properly restore compiler and linker flags after llvm tests
Carlo de Falco <cdf@users.sourceforge.net>
parents:
14994
diff
changeset
|
706 |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
707 build_jit=no |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
708 AC_ARG_ENABLE([jit], |
15308
a4d7909c4edb
configure.ac: Disable JIT compilation by default. Added --enable-jit to compile JIT.
Rik <rik@octave.org>
parents:
15306
diff
changeset
|
709 [AS_HELP_STRING([--enable-jit], |
a4d7909c4edb
configure.ac: Disable JIT compilation by default. Added --enable-jit to compile JIT.
Rik <rik@octave.org>
parents:
15306
diff
changeset
|
710 [(EXPERIMENTAL) enable JIT compiler])], |
a4d7909c4edb
configure.ac: Disable JIT compilation by default. Added --enable-jit to compile JIT.
Rik <rik@octave.org>
parents:
15306
diff
changeset
|
711 [if test "$enableval" = yes; then |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
712 build_jit=yes |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
713 fi], |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
714 []) |
14932
1f914446157d
Locate and link with LLVM properly
Max Brister <max@2bass.com>
parents:
14931
diff
changeset
|
715 |
14990
149d1e2224f0
configure.ac: llvm include goes in CPPFLAGS not CXXFLAGS
Max Brister <max@2bass.com>
parents:
14956
diff
changeset
|
716 LLVM_CXXFLAGS= |
14899 | 717 LLVM_CPPFLAGS= |
718 LLVM_LDFLAGS= | |
719 LLVM_LIBS= | |
720 | |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
721 if test $build_jit = yes; then |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
722 |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
723 ## Find llvm-config program from environment variable or by searching |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
724 AC_ARG_VAR([LLVM_CONFIG], [path to llvm-config utility]) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
725 AC_CHECK_PROG([LLVM_CONFIG], llvm-config, llvm-config, []) |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
726 |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
727 if test -z "$LLVM_CONFIG"; then |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
728 warn_llvm="llvm-config utility not found. JIT compiler is disabled." |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
729 else |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
730 dnl Preset warning message in case compile fails |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
731 warn_llvm="LLVM was not found or is to old. JIT compiler is disabled." |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
732 |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
733 save_CPPFLAGS="$CPPFLAGS" |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
734 save_CXXFLAGS="$CXXFLAGS" |
14994
bbc825cb2ea0
Use -I instead of -isystem if -isystem is not avaiable
Max Brister <max@2bass.com>
parents:
14993
diff
changeset
|
735 |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
736 ## Use -isystem if available because we don't want to see warnings in LLVM |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
737 LLVM_INCLUDE_FLAG=-I |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
738 OCTAVE_CC_FLAG([-isystem .], [ |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
739 LLVM_INCLUDE_FLAG=-isystem |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
740 AC_MSG_NOTICE([using -isystem for LLVM headers])]) |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
741 |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
742 dnl Use -isystem so we don't get warnings from llvm headers |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
743 LLVM_CPPFLAGS="$LLVM_INCLUDE_FLAG `$LLVM_CONFIG --includedir`" |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
744 LLVM_CXXFLAGS= |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
745 LLVM_LDFLAGS="-L`$LLVM_CONFIG --libdir`" |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
746 LLVM_LIBS=`$LLVM_CONFIG --libs` |
14994
bbc825cb2ea0
Use -I instead of -isystem if -isystem is not avaiable
Max Brister <max@2bass.com>
parents:
14993
diff
changeset
|
747 |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
748 dnl |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
749 dnl Define some extra flags that LLVM requires in order to include headers. |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
750 dnl Ideally we should get these from llvm-config, but llvm-config isn't |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
751 dnl very helpful. |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
752 dnl |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
753 CPPFLAGS="-D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS $LLVM_CPPFLAGS $CPPFLAGS" |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
754 CXXFLAGS="$LLVM_CXXFLAGS $CXXFLAGS" |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
755 AC_LANG_PUSH(C++) |
15369
715220d2b511
configure.ac: Simplify test for LLVM dependencies.
Rik <rik@octave.org>
parents:
15362
diff
changeset
|
756 AC_CHECK_HEADER([llvm/Support/TargetSelect.h], [ |
715220d2b511
configure.ac: Simplify test for LLVM dependencies.
Rik <rik@octave.org>
parents:
15362
diff
changeset
|
757 warn_llvm= |
715220d2b511
configure.ac: Simplify test for LLVM dependencies.
Rik <rik@octave.org>
parents:
15362
diff
changeset
|
758 XTRA_CXXFLAGS="$XTRA_CXXFLAGS $LLVM_CXXFLAGS $LLVM_CPPFLAGS"]) |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
759 AC_LANG_POP(C++) |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
760 CPPFLAGS="$save_CPPFLAGS" |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
761 CXXFLAGS="$save_CXXFLAGS" |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
762 fi |
14993
06f2e9bdade6
configure.ac: Skip compiling JIT if LLVM_CONFIG is not specified
Max Brister <max@2bass.com>
parents:
14990
diff
changeset
|
763 |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
764 if test -z "$warn_llvm"; then |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
765 AC_DEFINE(HAVE_LLVM, 1, [Define to 1 if LLVM is available.]) |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
766 else |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
767 build_jit=no |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
768 LLVM_CPPFLAGS= |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
769 LLVM_CXXFLAGS= |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
770 LLVM_LDFLAGS= |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
771 LLVM_LIBS= |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
772 OCTAVE_CONFIGURE_WARNING([warn_llvm]) |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
773 fi |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
774 dnl FIXME: Re-instate when JIT is enabled by default |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
775 dnl else |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
776 dnl ## JIT build disabled |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
777 dnl warn_llvm="JIT compiler disabled, some performance loss for loops" |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
778 dnl OCTAVE_CONFIGURE_WARNING([warn_llvm]) |
14899 | 779 fi |
780 | |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
781 AC_SUBST(LLVM_CPPFLAGS) |
14990
149d1e2224f0
configure.ac: llvm include goes in CPPFLAGS not CXXFLAGS
Max Brister <max@2bass.com>
parents:
14956
diff
changeset
|
782 AC_SUBST(LLVM_CXXFLAGS) |
14899 | 783 AC_SUBST(LLVM_LDFLAGS) |
784 AC_SUBST(LLVM_LIBS) | |
785 | |
9538
d0239bddf621
use OCTAVE_CHECK_LIB to check for zlib
John W. Eaton <jwe@octave.org>
parents:
9536
diff
changeset
|
786 ### Check for HDF5 library. |
5270 | 787 |
9542
f5ec5dc66824
use OCTAVE_CHECK_LIBRARY to check for HDF5
John W. Eaton <jwe@octave.org>
parents:
9540
diff
changeset
|
788 save_CPPFLAGS="$CPPFLAGS" |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
789 save_LIBS="$LIBS" |
9542
f5ec5dc66824
use OCTAVE_CHECK_LIBRARY to check for HDF5
John W. Eaton <jwe@octave.org>
parents:
9540
diff
changeset
|
790 CPPFLAGS="$Z_CPPFLAGS $CPPFLAGS" |
f5ec5dc66824
use OCTAVE_CHECK_LIBRARY to check for HDF5
John W. Eaton <jwe@octave.org>
parents:
9540
diff
changeset
|
791 LIBS="$Z_LDFLAGS $Z_LIBS $LIBS" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
792 OCTAVE_CHECK_LIB(hdf5, HDF5, |
9542
f5ec5dc66824
use OCTAVE_CHECK_LIBRARY to check for HDF5
John W. Eaton <jwe@octave.org>
parents:
9540
diff
changeset
|
793 [HDF5 library not found. Octave will not be able to save or load HDF5 data files.], |
f5ec5dc66824
use OCTAVE_CHECK_LIBRARY to check for HDF5
John W. Eaton <jwe@octave.org>
parents:
9540
diff
changeset
|
794 [hdf5.h], [H5Gget_num_objs], [], [], |
f5ec5dc66824
use OCTAVE_CHECK_LIBRARY to check for HDF5
John W. Eaton <jwe@octave.org>
parents:
9540
diff
changeset
|
795 [warn_hdf5= |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
796 OCTAVE_CHECK_HDF5_HAS_VER_16_API |
9892
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9882
diff
changeset
|
797 TEXINFO_HDF5="@set HAVE_HDF5" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
798 AC_DEFINE(HAVE_HDF5, 1, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
799 [Define to 1 if HDF5 is available and newer than version 1.6.]) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
800 if test $have_msvc = yes; then |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
801 OCTAVE_CHECK_LIB_HDF5_DLL |
10123
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
802 fi |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
803 ]) |
9542
f5ec5dc66824
use OCTAVE_CHECK_LIBRARY to check for HDF5
John W. Eaton <jwe@octave.org>
parents:
9540
diff
changeset
|
804 CPPFLAGS="$save_CPPFLAGS" |
f5ec5dc66824
use OCTAVE_CHECK_LIBRARY to check for HDF5
John W. Eaton <jwe@octave.org>
parents:
9540
diff
changeset
|
805 LIBS="$save_LIBS" |
5270 | 806 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
807 ### Check for FFTW library. Default to Fortran FFTPACK if it is not available. |
5203 | 808 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
809 ## Check for FFTW header and library. |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
810 OCTAVE_CHECK_LIB(fftw3, FFTW3, |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
811 [FFTW3 library not found. The slower FFTPACK library will be used instead.], |
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
812 [fftw3.h], [fftw_plan_dft_1d]) |
3827 | 813 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
814 OCTAVE_CHECK_LIB(fftw3f, FFTW3F, |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
815 [FFTW3F library not found. The slower FFTPACK library will be used instead.], |
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
816 [fftw3.h], [fftwf_plan_dft_1d]) |
3827 | 817 |
15960
bde7731b2b83
added FFTW multithreaded library support
Andreas Weber <andy.weber.aw@gmail.com>
parents:
15946
diff
changeset
|
818 ## Check for the multithreaded FFTW library. |
bde7731b2b83
added FFTW multithreaded library support
Andreas Weber <andy.weber.aw@gmail.com>
parents:
15946
diff
changeset
|
819 ## Fallback to singlethreaded if not found or disabled |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
820 build_fftw_threads=yes |
15960
bde7731b2b83
added FFTW multithreaded library support
Andreas Weber <andy.weber.aw@gmail.com>
parents:
15946
diff
changeset
|
821 AC_ARG_ENABLE([fftw-threads], |
bde7731b2b83
added FFTW multithreaded library support
Andreas Weber <andy.weber.aw@gmail.com>
parents:
15946
diff
changeset
|
822 [AS_HELP_STRING([--disable-fftw-threads], |
bde7731b2b83
added FFTW multithreaded library support
Andreas Weber <andy.weber.aw@gmail.com>
parents:
15946
diff
changeset
|
823 [disable Multi-threaded FFTW])], |
bde7731b2b83
added FFTW multithreaded library support
Andreas Weber <andy.weber.aw@gmail.com>
parents:
15946
diff
changeset
|
824 [if test "$enableval" = no; then |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
825 build_fftw_threads=no |
15960
bde7731b2b83
added FFTW multithreaded library support
Andreas Weber <andy.weber.aw@gmail.com>
parents:
15946
diff
changeset
|
826 fi], |
bde7731b2b83
added FFTW multithreaded library support
Andreas Weber <andy.weber.aw@gmail.com>
parents:
15946
diff
changeset
|
827 []) |
bde7731b2b83
added FFTW multithreaded library support
Andreas Weber <andy.weber.aw@gmail.com>
parents:
15946
diff
changeset
|
828 |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
829 if test $build_fftw_threads = yes; then |
15969
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15960
diff
changeset
|
830 OCTAVE_CHECK_FFTW_THREADS(fftw3, fftw_plan_with_nthreads) |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15960
diff
changeset
|
831 OCTAVE_CHECK_FFTW_THREADS(fftw3f, fftwf_plan_with_nthreads) |
15960
bde7731b2b83
added FFTW multithreaded library support
Andreas Weber <andy.weber.aw@gmail.com>
parents:
15946
diff
changeset
|
832 fi |
bde7731b2b83
added FFTW multithreaded library support
Andreas Weber <andy.weber.aw@gmail.com>
parents:
15946
diff
changeset
|
833 |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
834 AM_CONDITIONAL([AMCOND_HAVE_FFTW], |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
835 [test -n "$FFTW3_LIBS" && test -n "$FFTW3F_LIBS"]) |
3827 | 836 |
15271
648dabbb4c6b
build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
15257
diff
changeset
|
837 ## Subdirectory of liboctave/cruft to build if FFTW is not found. |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
838 FFT_DIR="fftpack" |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
839 AC_SUBST(FFT_DIR) |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
840 |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
841 ### Check for GLPK library and header. |
5235 | 842 |
9540
79b5fe2d5646
use Z_LIBS in checks for curl and glpk libraries
John W. Eaton <jwe@octave.org>
parents:
9538
diff
changeset
|
843 save_CPPFLAGS="$CPPFLAGS" |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
844 save_LIBS="$LIBS" |
9540
79b5fe2d5646
use Z_LIBS in checks for curl and glpk libraries
John W. Eaton <jwe@octave.org>
parents:
9538
diff
changeset
|
845 CPPFLAGS="$Z_CPPFLAGS $CPPFLAGS" |
79b5fe2d5646
use Z_LIBS in checks for curl and glpk libraries
John W. Eaton <jwe@octave.org>
parents:
9538
diff
changeset
|
846 LIBS="$Z_LDFLAGS $Z_LIBS $LIBS" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
847 OCTAVE_CHECK_LIB(glpk, GLPK, |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
848 [GLPK library not found. The glpk function for solving linear programs will be disabled.], |
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
849 [glpk/glpk.h glpk.h], [_glp_lpx_simplex]) |
9540
79b5fe2d5646
use Z_LIBS in checks for curl and glpk libraries
John W. Eaton <jwe@octave.org>
parents:
9538
diff
changeset
|
850 LIBS="$save_LIBS" |
79b5fe2d5646
use Z_LIBS in checks for curl and glpk libraries
John W. Eaton <jwe@octave.org>
parents:
9538
diff
changeset
|
851 CPPFLAGS="$save_CPPFLAGS" |
5235 | 852 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
853 ### Checks for cURL header and library. |
6043 | 854 |
9540
79b5fe2d5646
use Z_LIBS in checks for curl and glpk libraries
John W. Eaton <jwe@octave.org>
parents:
9538
diff
changeset
|
855 save_CPPFLAGS="$CPPFLAGS" |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
856 save_LIBS="$LIBS" |
9540
79b5fe2d5646
use Z_LIBS in checks for curl and glpk libraries
John W. Eaton <jwe@octave.org>
parents:
9538
diff
changeset
|
857 CPPFLAGS="$Z_CPPFLAGS $CPPFLAGS" |
79b5fe2d5646
use Z_LIBS in checks for curl and glpk libraries
John W. Eaton <jwe@octave.org>
parents:
9538
diff
changeset
|
858 LIBS="$Z_LDFLAGS $Z_LIBS $LIBS" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
859 OCTAVE_CHECK_LIB(curl, cURL, |
9880 | 860 [cURL library not found. The ftp objects, urlread and urlwrite functions will be disabled.], |
9519
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
861 [curl/curl.h], [curl_easy_escape]) |
15323
c42bf5cadb60
Add check for CURLOPT_DIRLISTONLY in libcurl
Mike Miller <mtmiller@ieee.org>
parents:
15317
diff
changeset
|
862 if test -z "$warn_curl"; then |
15338
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
863 ## Additional check on cURL library that was found |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
864 AC_CACHE_CHECK([for CURLOPT_DIRLISTONLY in curl/curl.h], |
16080
c53f8f706c55
Reverse logic of libcurl feature test result
Mike Miller <mtmiller@ieee.org>
parents:
16079
diff
changeset
|
865 [octave_cv_curl_has_curlopt_dirlistonly], |
15338
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
866 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
15323
c42bf5cadb60
Add check for CURLOPT_DIRLISTONLY in libcurl
Mike Miller <mtmiller@ieee.org>
parents:
15317
diff
changeset
|
867 #include <curl/curl.h> |
c42bf5cadb60
Add check for CURLOPT_DIRLISTONLY in libcurl
Mike Miller <mtmiller@ieee.org>
parents:
15317
diff
changeset
|
868 ]], [[ |
c42bf5cadb60
Add check for CURLOPT_DIRLISTONLY in libcurl
Mike Miller <mtmiller@ieee.org>
parents:
15317
diff
changeset
|
869 curl_easy_setopt ((CURL*)NULL, CURLOPT_DIRLISTONLY, 0); |
c42bf5cadb60
Add check for CURLOPT_DIRLISTONLY in libcurl
Mike Miller <mtmiller@ieee.org>
parents:
15317
diff
changeset
|
870 ]])], |
16080
c53f8f706c55
Reverse logic of libcurl feature test result
Mike Miller <mtmiller@ieee.org>
parents:
16079
diff
changeset
|
871 [octave_cv_curl_has_curlopt_dirlistonly=yes], |
c53f8f706c55
Reverse logic of libcurl feature test result
Mike Miller <mtmiller@ieee.org>
parents:
16079
diff
changeset
|
872 [octave_cv_curl_has_curlopt_dirlistonly=no]) |
15338
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
873 ]) |
16080
c53f8f706c55
Reverse logic of libcurl feature test result
Mike Miller <mtmiller@ieee.org>
parents:
16079
diff
changeset
|
874 if test $octave_cv_curl_has_curlopt_dirlistonly = no; then |
15338
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
875 AC_DEFINE(CURLOPT_DIRLISTONLY, CURLOPT_FTPLISTONLY, |
16079
3a90c3f4046d
Fix typo in changeset dc39c1d84c5b
Mike Miller <mtmiller@ieee.org>
parents:
16078
diff
changeset
|
876 [Define to the legacy option name if using an older version of cURL.]) |
15338
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
877 fi |
15323
c42bf5cadb60
Add check for CURLOPT_DIRLISTONLY in libcurl
Mike Miller <mtmiller@ieee.org>
parents:
15317
diff
changeset
|
878 fi |
9540
79b5fe2d5646
use Z_LIBS in checks for curl and glpk libraries
John W. Eaton <jwe@octave.org>
parents:
9538
diff
changeset
|
879 LIBS="$save_LIBS" |
79b5fe2d5646
use Z_LIBS in checks for curl and glpk libraries
John W. Eaton <jwe@octave.org>
parents:
9538
diff
changeset
|
880 CPPFLAGS="$save_CPPFLAGS" |
6133 | 881 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
882 ### Check for either of Graphics/ImageMagick++ libraries |
9575
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
883 |
11216
5036b0ff9597
configure.ac: Properly m4 quote AS_HELP_STRING.
Rik <octave@nomad.inbox5.com>
parents:
11214
diff
changeset
|
884 AC_ARG_WITH([magick], |
5036b0ff9597
configure.ac: Properly m4 quote AS_HELP_STRING.
Rik <octave@nomad.inbox5.com>
parents:
11214
diff
changeset
|
885 [AS_HELP_STRING([--with-magick=LIB], |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
886 [select library to use for image I/O (options: GraphicsMagick(default) or ImageMagick)])], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
887 [magick="$withval"], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
888 [magick="GraphicsMagick"]) |
11040
9ac165a67747
Modified configure.ac to allow specification of ImageMagick or GraphicsMagick. GraphicsMagick is still the default option.
John Swensen <jpswensen@gmail.com>
parents:
10986
diff
changeset
|
889 |
9ac165a67747
Modified configure.ac to allow specification of ImageMagick or GraphicsMagick. GraphicsMagick is still the default option.
John Swensen <jpswensen@gmail.com>
parents:
10986
diff
changeset
|
890 warn_magick="$magick++ library not found. The imread function for reading image files will not be fully functional." |
9575
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
891 |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
892 MAGICK_CPPFLAGS= |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
893 MAGICK_LDFLAGS= |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
894 MAGICK_LIBS= |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
895 |
11040
9ac165a67747
Modified configure.ac to allow specification of ImageMagick or GraphicsMagick. GraphicsMagick is still the default option.
John Swensen <jpswensen@gmail.com>
parents:
10986
diff
changeset
|
896 PKG_CHECK_EXISTS([$magick++], [ |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
897 ## Make sure we only get -I, -L, and -l flags. Some Graphics/ImageMagick++ |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
898 ## packages add extra flags that are useful when building |
11041 | 899 ## Graphics/ImageMagick++ extentions. These extra flags break the |
900 ## Octave build. | |
11040
9ac165a67747
Modified configure.ac to allow specification of ImageMagick or GraphicsMagick. GraphicsMagick is still the default option.
John Swensen <jpswensen@gmail.com>
parents:
10986
diff
changeset
|
901 MAGICK_LDFLAGS=`$PKG_CONFIG --libs-only-L $magick++` |
9ac165a67747
Modified configure.ac to allow specification of ImageMagick or GraphicsMagick. GraphicsMagick is still the default option.
John Swensen <jpswensen@gmail.com>
parents:
10986
diff
changeset
|
902 MAGICK_LIBS=`$PKG_CONFIG --libs-only-l $magick++` |
9ac165a67747
Modified configure.ac to allow specification of ImageMagick or GraphicsMagick. GraphicsMagick is still the default option.
John Swensen <jpswensen@gmail.com>
parents:
10986
diff
changeset
|
903 MAGICK_CPPFLAGS=`$PKG_CONFIG --cflags-only-I $magick++` |
9575
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
904 |
11040
9ac165a67747
Modified configure.ac to allow specification of ImageMagick or GraphicsMagick. GraphicsMagick is still the default option.
John Swensen <jpswensen@gmail.com>
parents:
10986
diff
changeset
|
905 warn_magick="$magick++ library fails tests. The imread function for reading image files will not be fully functional." |
7926
d74f996e005d
__magick_read__.cc: configuration and style fixes
John W. Eaton <jwe@octave.org>
parents:
7921
diff
changeset
|
906 |
9575
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
907 save_CPPFLAGS="$CPPFLAGS" |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
908 save_LIBS="$LIBS" |
9583
8dc1531e2149
correctly save and restore LIBS and CPPFLAGS when checking for GraphicsMagick++
John W. Eaton <jwe@octave.org>
parents:
9575
diff
changeset
|
909 CPPFLAGS="$MAGICK_CPPFLAGS $CPPFLAGS" |
8dc1531e2149
correctly save and restore LIBS and CPPFLAGS when checking for GraphicsMagick++
John W. Eaton <jwe@octave.org>
parents:
9575
diff
changeset
|
910 LIBS="$MAGICK_LDFLAGS $MAGICK_LIBS $LIBS" |
9575
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
911 AC_LANG_PUSH(C++) |
15338
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
912 AC_CHECK_HEADER([Magick++.h], [ |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
913 AC_CACHE_CHECK([for Magick::ColorRGB in Magick++.h], |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
914 [octave_cv_func_magick_colorrgb], |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
915 [AC_PREPROC_IFELSE([AC_LANG_SOURCE([[ |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
916 #include <Magick++.h> |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
917 ]], [[ |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
918 Magick::ColorRGB c; |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
919 ]])], |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
920 octave_cv_func_magick_colorrgb=yes, |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
921 octave_cv_func_magick_colorrgb=no) |
9575
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
922 ]) |
15338
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
923 if test $octave_cv_func_magick_colorrgb = yes; then |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
924 warn_magick= |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
925 fi |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
926 ]) |
9575
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
927 AC_LANG_POP(C++) |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
928 CPPFLAGS="$save_CPPFLAGS" |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
929 LIBS="$save_LIBS" |
15452
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
930 |
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
931 AC_CHECK_FUNCS([setlocale], [], |
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
932 [warn_magick="$magick++ requires setlocale function. The imread function for reading image files will not be fully functional."]) |
9575
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
933 ]) |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
934 |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
935 if test -z "$warn_magick"; then |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
936 AC_DEFINE(HAVE_MAGICK, 1, |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
937 [Define to 1 if Graphics/ImageMagick++ is available.]) |
7937
6661387827d6
Allow build without GraphicsMagick installed
David Bateman <dbateman@free.fr>
parents:
7934
diff
changeset
|
938 else |
9575
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
939 MAGICK_CPPFLAGS= |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
940 MAGICK_LDFLAGS= |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
941 MAGICK_LIBS= |
7926
d74f996e005d
__magick_read__.cc: configuration and style fixes
John W. Eaton <jwe@octave.org>
parents:
7921
diff
changeset
|
942 fi |
9575
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
943 AC_SUBST(MAGICK_CPPFLAGS) |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
944 AC_SUBST(MAGICK_LDFLAGS) |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
945 AC_SUBST(MAGICK_LIBS) |
6043 | 946 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
947 ### Check for X11 libraries |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
948 |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
949 AC_PATH_X |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
950 if test "$have_x" = yes; then |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
951 AC_DEFINE(HAVE_X_WINDOWS, 1, [Define to 1 if you have X11.]) |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
952 |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
953 if test "$x_includes" != "NONE"; then |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
954 X11_INCFLAGS="$x_includes" |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
955 fi |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
956 AC_SUBST(X11_INCFLAGS) |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
957 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
958 if test -z "$x_libraries"; then |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
959 AC_CHECK_LIB([X11], XrmInitialize, [X11_LIBS="-lX11"], [X11_LIBS=]) |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
960 elif test $x_libraries != "NONE"; then |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
961 AC_CHECK_LIB([X11], XrmInitialize, |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
962 [X11_LIBS="-L$x_libraries -lX11"], [X11_LIBS=], "-L$x_libraries") |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
963 fi |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
964 AC_SUBST(X11_LIBS) |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
965 fi |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
966 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
967 ### Check for the Carbon framework on MacOSX systems |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
968 OCTAVE_HAVE_FRAMEWORK([Carbon], |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
969 [[#include <Carbon/Carbon.h>]], [[CGMainDisplayID ()]], |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
970 [have_framework_carbon=yes], [have_framework_carbon=no]) |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
971 if test $have_framework_carbon = yes; then |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
972 AC_DEFINE(HAVE_FRAMEWORK_CARBON, 1, |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
973 [Define to 1 if framework CARBON is available.]) |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
974 CARBON_LIBS="-Wl,-framework -Wl,Carbon" |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
975 AC_MSG_NOTICE([adding -Wl,-framework -Wl,Carbon to CARBON_LIBS]) |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
976 AC_SUBST(CARBON_LIBS) |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
977 fi |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
978 |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
979 ### Check for list of libraries needed for native graphics renderer. |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
980 |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
981 native_graphics=yes |
7944
c2449e91f50a
configure.in: fix FTGL test to handle either FTGL/ftgl.h or ftgl.h
John W. Eaton <jwe@octave.org>
parents:
7937
diff
changeset
|
982 warn_freetype="" |
7863
2a62d45fa21d
added check for FTGL library
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7834
diff
changeset
|
983 |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
984 check_opengl=no |
11208
a44ba1cdfbb5
handle --without-opengl configure option
John W. Eaton <jwe@octave.org>
parents:
11119
diff
changeset
|
985 AC_ARG_WITH([opengl], |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
986 [AS_HELP_STRING([--without-opengl], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
987 [don't use OpenGL libraries, disable native graphics])], |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
988 [if test x"$withval" = x"no"; then |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
989 native_graphics=no |
11208
a44ba1cdfbb5
handle --without-opengl configure option
John W. Eaton <jwe@octave.org>
parents:
11119
diff
changeset
|
990 warn_opengl="--without-opengl specified. Native graphics will be disabled." |
14605
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
991 OCTAVE_CONFIGURE_WARNING([warn_opengl]) |
11208
a44ba1cdfbb5
handle --without-opengl configure option
John W. Eaton <jwe@octave.org>
parents:
11119
diff
changeset
|
992 else |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
993 check_opengl=yes |
11208
a44ba1cdfbb5
handle --without-opengl configure option
John W. Eaton <jwe@octave.org>
parents:
11119
diff
changeset
|
994 fi], |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
995 [check_opengl=yes]) |
11208
a44ba1cdfbb5
handle --without-opengl configure option
John W. Eaton <jwe@octave.org>
parents:
11119
diff
changeset
|
996 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
997 ## Check for OpenGL library |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
998 if test $check_opengl = yes; then |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
999 OCTAVE_CHECK_LIB_OPENGL |
11208
a44ba1cdfbb5
handle --without-opengl configure option
John W. Eaton <jwe@octave.org>
parents:
11119
diff
changeset
|
1000 fi |
a44ba1cdfbb5
handle --without-opengl configure option
John W. Eaton <jwe@octave.org>
parents:
11119
diff
changeset
|
1001 |
10571
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1002 GRAPHICS_LIBS= |
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1003 GRAPHICS_CFLAGS= |
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1004 |
11214
7f19b2b6e093
Remove redundant warning when 'without-opengl' option used.
Rik <octave@nomad.inbox5.com>
parents:
11209
diff
changeset
|
1005 if test -z "$OPENGL_LIBS"; then |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1006 if test $check_opengl = yes; then |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1007 native_graphics=no |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1008 warn_fltk_opengl="OpenGL libs (GL and GLU) not found. Native graphics will be disabled." |
14605
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
1009 OCTAVE_CONFIGURE_WARNING([warn_fltk_opengl]) |
11214
7f19b2b6e093
Remove redundant warning when 'without-opengl' option used.
Rik <octave@nomad.inbox5.com>
parents:
11209
diff
changeset
|
1010 fi |
7f19b2b6e093
Remove redundant warning when 'without-opengl' option used.
Rik <octave@nomad.inbox5.com>
parents:
11209
diff
changeset
|
1011 fi |
7f19b2b6e093
Remove redundant warning when 'without-opengl' option used.
Rik <octave@nomad.inbox5.com>
parents:
11209
diff
changeset
|
1012 |
7944
c2449e91f50a
configure.in: fix FTGL test to handle either FTGL/ftgl.h or ftgl.h
John W. Eaton <jwe@octave.org>
parents:
7937
diff
changeset
|
1013 if test -n "$OPENGL_LIBS"; then |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1014 AC_DEFINE(HAVE_OPENGL, 1, [Define to 1 if OpenGL is available.]) |
7863
2a62d45fa21d
added check for FTGL library
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7834
diff
changeset
|
1015 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1016 ## Check for FreeType 2 library |
9845
722bd8f6a750
configure.ac: fix freetype check
John W. Eaton <jwe@octave.org>
parents:
9817
diff
changeset
|
1017 |
15831
1cdca9bf7b7e
USe pkg-config for freetype2 configure check.
John W. Eaton <jwe@octave.org>
parents:
15536
diff
changeset
|
1018 PKG_CHECK_MODULES([FT2], [freetype2], [ |
1cdca9bf7b7e
USe pkg-config for freetype2 configure check.
John W. Eaton <jwe@octave.org>
parents:
15536
diff
changeset
|
1019 min_ft2_version=9.03 |
1cdca9bf7b7e
USe pkg-config for freetype2 configure check.
John W. Eaton <jwe@octave.org>
parents:
15536
diff
changeset
|
1020 AC_MSG_CHECKING([for FreeType -- version >= $min_ft2_version]) |
1cdca9bf7b7e
USe pkg-config for freetype2 configure check.
John W. Eaton <jwe@octave.org>
parents:
15536
diff
changeset
|
1021 $PKG_CONFIG freetype2 --atleast-version=$min_ft2_version |
1cdca9bf7b7e
USe pkg-config for freetype2 configure check.
John W. Eaton <jwe@octave.org>
parents:
15536
diff
changeset
|
1022 ac_status=$? |
1cdca9bf7b7e
USe pkg-config for freetype2 configure check.
John W. Eaton <jwe@octave.org>
parents:
15536
diff
changeset
|
1023 if test $ac_status = 0; then |
1cdca9bf7b7e
USe pkg-config for freetype2 configure check.
John W. Eaton <jwe@octave.org>
parents:
15536
diff
changeset
|
1024 AC_MSG_RESULT(yes) |
1cdca9bf7b7e
USe pkg-config for freetype2 configure check.
John W. Eaton <jwe@octave.org>
parents:
15536
diff
changeset
|
1025 AC_DEFINE(HAVE_FREETYPE, 1, [Define to 1 if you have Freetype library.]) |
1cdca9bf7b7e
USe pkg-config for freetype2 configure check.
John W. Eaton <jwe@octave.org>
parents:
15536
diff
changeset
|
1026 XTRA_CXXFLAGS="$XTRA_CXXFLAGS $FT2_CFLAGS" |
1cdca9bf7b7e
USe pkg-config for freetype2 configure check.
John W. Eaton <jwe@octave.org>
parents:
15536
diff
changeset
|
1027 else |
1cdca9bf7b7e
USe pkg-config for freetype2 configure check.
John W. Eaton <jwe@octave.org>
parents:
15536
diff
changeset
|
1028 AC_MSG_RESULT(no) |
1cdca9bf7b7e
USe pkg-config for freetype2 configure check.
John W. Eaton <jwe@octave.org>
parents:
15536
diff
changeset
|
1029 warn_freetype="FreeType library not found. Native graphics will be disabled." |
1cdca9bf7b7e
USe pkg-config for freetype2 configure check.
John W. Eaton <jwe@octave.org>
parents:
15536
diff
changeset
|
1030 fi]) |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1031 |
14605
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
1032 if test -n "$warn_freetype"; then |
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
1033 OCTAVE_CONFIGURE_WARNING([warn_freetype]) |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1034 native_graphics=no |
14605
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
1035 fi |
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
1036 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1037 ## Check for fontconfig library |
9403
4af6e29449c1
[mq]: graphics_text_engine
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9259
diff
changeset
|
1038 |
10571
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1039 warn_fontconfig="" |
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1040 if test -z "$warn_freetype"; then |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1041 PKG_CHECK_MODULES(FONTCONFIG, [fontconfig], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1042 [have_fontconfig=yes |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1043 OPENGL_LIBS="$FONTCONFIG_LIBS $OPENGL_LIBS" |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1044 XTRA_CXXFLAGS="$XTRA_CXXFLAGS $FONTCONFIG_CFLAGS" |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1045 AC_DEFINE(HAVE_FONTCONFIG, 1, [Define to 1 if fontconfig is present.])], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1046 [have_fontconfig=no |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1047 warn_fontconfig="Fontconfig library not found. Native graphics will be disabled."]) |
10571
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1048 fi |
9403
4af6e29449c1
[mq]: graphics_text_engine
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9259
diff
changeset
|
1049 |
14605
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
1050 if test -n "$warn_fontconfig"; then |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1051 native_graphics=no |
14605
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
1052 OCTAVE_CONFIGURE_WARNING([warn_fontconfig]) |
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
1053 fi |
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
1054 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1055 ## Check for FLTK (www.fltk.org) library |
11041 | 1056 |
1057 AC_ARG_WITH([fltk-prefix], [ | |
1058 AS_HELP_STRING([--with-fltk-prefix=PFX], | |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1059 [prefix where FLTK is installed (optional)])], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1060 [fltk_prefix="$withval"], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1061 [fltk_prefix=""]) |
11041 | 1062 |
1063 AC_ARG_WITH([fltk-exec-prefix], [ | |
1064 AS_HELP_STRING([--with-fltk-exec-prefix=PFX], | |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1065 [exec prefix where FLTK is installed (optional)])], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1066 [fltk_exec_prefix="$withval"], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1067 [fltk_exec_prefix=""]) |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1068 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1069 if test x"$fltk_exec_prefix" != x""; then |
10571
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1070 fltk_args="$fltk_args --exec-prefix=$fltk_exec_prefix" |
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1071 if test "x${FLTK_CONFIG+set}" != xset ; then |
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1072 FLTK_CONFIG="$fltk_exec_prefix/bin/fltk-config" |
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1073 fi |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1074 fi |
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1075 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1076 if test x"$fltk_prefix" != x""; then |
10571
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1077 fltk_args="$fltk_args --prefix=$fltk_prefix" |
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1078 if test x${FLTK_CONFIG+set} != xset ; then |
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1079 FLTK_CONFIG="$fltk_prefix/bin/fltk-config" |
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1080 fi |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1081 fi |
10571
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1082 |
11041 | 1083 AC_PATH_PROG([FLTK_CONFIG], [fltk-config], [no]) |
10571
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1084 |
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1085 warn_fltk_config="" |
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1086 warn_fltk_opengl="" |
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1087 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1088 if test "$FLTK_CONFIG" = no; then |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1089 native_graphics=no |
10571
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1090 warn_fltk_config="FLTK config script not found. Native graphics will be disabled." |
14605
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
1091 OCTAVE_CONFIGURE_WARNING([warn_fltk_config]) |
10571
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1092 else |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1093 FLTK_CFLAGS=`$FLTK_CONFIG $fltkconf_args --use-gl --cflags` |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1094 FLTK_LDFLAGS=`$FLTK_CONFIG $fltkconf_args --use-gl --ldflags` |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1095 |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
1096 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
1097 mingw*) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1098 FLTK_LDFLAGS=`echo $FLTK_LDFLAGS | sed -e 's/-mwindows//g'` |
10571
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1099 ;; |
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1100 esac |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1101 |
15338
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1102 AC_CACHE_CHECK([for OpenGL support in FLTK], |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1103 [octave_cv_fltk_opengl_support], |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1104 [save_CFLAGS="$CFLAGS" |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1105 CFLAGS="$CFLAGS $FLTK_CFLAGS" |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1106 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1107 #include <FL/gl.h> |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1108 ]], [[ |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1109 int nothing = 0; |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1110 ]])], |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1111 octave_cv_fltk_opengl_support=no, |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1112 octave_cv_fltk_opengl_support=yes) |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1113 CFLAGS="$save_CFLAGS" |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1114 ]) |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1115 if test $octave_cv_fltk_opengl_support = no; then |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1116 warn_fltk_opengl="FLTK does not have OpenGL support. Native graphics will be disabled." |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1117 else |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1118 AC_DEFINE(HAVE_FLTK, 1, [Define to 1 if FLTK is available.]) |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1119 fi |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1120 |
10571
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1121 if test -z "$warn_fltk_opengl"; then |
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1122 GRAPHICS_CFLAGS="$FLTK_CFLAGS" |
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1123 GRAPHICS_LIBS="$FLTK_LDFLAGS" |
14605
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
1124 else |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1125 native_graphics=no |
14605
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
1126 OCTAVE_CONFIGURE_WARNING([warn_fltk_opengl]) |
10571
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1127 fi |
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1128 fi |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1129 fi |
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1130 |
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1131 AC_SUBST(GRAPHICS_CFLAGS) |
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1132 AC_SUBST(GRAPHICS_LIBS) |
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1133 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1134 ### Start determination of shared vs. static libraries |
3827 | 1135 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1136 ## Use -static if compiling on Alpha OSF/1 1.3 systems. |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1137 case $canonical_host_type in |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1138 alpha*-dec-osf1.3) |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1139 LD_STATIC_FLAG=-static |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1140 ;; |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1141 esac |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1142 if test -n "$LD_STATIC_FLAG"; then |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1143 AC_MSG_NOTICE([defining LD_STATIC_FLAG to be $LD_STATIC_FLAG]) |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1144 fi |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1145 AC_SUBST(LD_STATIC_FLAG) |
3827 | 1146 |
3130 | 1147 OCTAVE_PROG_AR |
3012 | 1148 |
9801
13868ea67c71
configure.ac: fail if LT_INIT is not defined
John W. Eaton <jwe@octave.org>
parents:
9799
diff
changeset
|
1149 ifdef([LT_INIT], [], [ |
13868ea67c71
configure.ac: fail if LT_INIT is not defined
John W. Eaton <jwe@octave.org>
parents:
9799
diff
changeset
|
1150 errprint([error: you must have libtool 2.2.2 or a more recent version |
13868ea67c71
configure.ac: fail if LT_INIT is not defined
John W. Eaton <jwe@octave.org>
parents:
9799
diff
changeset
|
1151 ]) |
13868ea67c71
configure.ac: fail if LT_INIT is not defined
John W. Eaton <jwe@octave.org>
parents:
9799
diff
changeset
|
1152 m4exit([1])]) |
13868ea67c71
configure.ac: fail if LT_INIT is not defined
John W. Eaton <jwe@octave.org>
parents:
9799
diff
changeset
|
1153 |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1154 LT_PREREQ([2.2.2]) |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1155 LT_INIT([disable-static dlopen win32-dll]) |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1156 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1157 if test x"$enable_shared" = x"yes"; then |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1158 SHARED_LIBS=yes |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1159 else |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1160 SHARED_LIBS=no |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1161 fi |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1162 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1163 if test x"$enable_static" = x"yes"; then |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1164 STATIC_LIBS=yes |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1165 else |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1166 STATIC_LIBS=no |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1167 fi |
3012 | 1168 |
6137 | 1169 XTRA_CRUFT_SH_LDFLAGS= |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1170 if test $have_msvc = yes; then |
10123
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1171 FLIBS="$FLIBS -lkernel32" |
15600
fcdc284f96ef
Fix cruft.def location and usage.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15596
diff
changeset
|
1172 XTRA_CRUFT_SH_LDFLAGS="-Wl,-def:cruft/cruft.def" |
10123
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1173 fi |
6137 | 1174 AC_SUBST(XTRA_CRUFT_SH_LDFLAGS) |
6102 | 1175 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1176 ### Check for BLAS and LAPACK libraries: |
10721
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1177 |
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1178 ## Need to adjust FFLAGS to include correct integer size. |
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1179 save_FFLAGS="$FFLAGS" |
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1180 FFLAGS="$FFLAGS $F77_INTEGER_8_FLAG" |
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1181 |
10951 | 1182 AX_BLAS_WITH_F77_FUNC([:], [:]) |
1183 AX_LAPACK([:], [:]) | |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1184 |
10721
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1185 ## Restore FFLAGS. |
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1186 FFLAGS="$save_FFLAGS" |
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1187 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1188 ## If necessary, try again with -ff2c in FFLAGS |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1189 if test $ax_blas_f77_func_ok = no; then |
12538
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1190 save_FFLAGS="$FFLAGS" |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1191 FFLAGS="-ff2c $FFLAGS $F77_INTEGER_8_FLAG" |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1192 |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1193 AX_BLAS_WITH_F77_FUNC([:], [:]) |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1194 AX_LAPACK([:], [:]) |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1195 |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1196 ## Restore FFLAGS, with -ff2c if that was helpful |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1197 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1198 if test $ax_blas_f77_func_ok = no; then |
12538
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1199 FFLAGS="$save_FFLAGS" |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1200 else |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1201 FFLAGS="-ff2c $save_FFLAGS" |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1202 fi |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1203 fi |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1204 |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1205 ## On OSX, try again with a wrapper library (without -ff2c!) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1206 if test $ax_blas_f77_func_ok = no; then |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
1207 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
1208 darwin*) |
12538
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1209 ## test if wrapper functions help |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1210 octave_blaswrap_save_CFLAGS="$CFLAGS" |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1211 CFLAGS="$CFLAGS -DUSE_BLASWRAP" |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1212 AC_LANG_PUSH(C) |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1213 AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ |
15271
648dabbb4c6b
build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
15257
diff
changeset
|
1214 #include "liboctave/cruft/misc/blaswrap.c" |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1215 ]])], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1216 [mv conftest.$ac_objext blaswrap.$ac_objext |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1217 octave_blaswrap_save_BLAS_LIBS="$BLAS_LIBS" |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1218 BLAS_LIBS="blaswrap.$ac_objext -framework vecLib" |
12538
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1219 |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1220 save_FFLAGS="$FFLAGS" |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1221 FFLAGS="$FFLAGS $F77_INTEGER_8_FLAG" |
12538
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1222 |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1223 AX_BLAS_WITH_F77_FUNC([:], [:]) |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1224 AX_LAPACK([:], [:]) |
12538
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1225 |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1226 ## Restore FFLAGS. |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1227 FFLAGS="$save_FFLAGS" |
12538
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1228 |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1229 ## remove temp file |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1230 rm -f blaswrap.$ac_objext], |
15271
648dabbb4c6b
build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
15257
diff
changeset
|
1231 [AC_MSG_FAILURE([cannot compile liboctave/cruft/misc/blaswrap.c])]) |
12538
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1232 AC_LANG_POP(C) |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1233 CFLAGS="$octave_blaswrap_save_CFLAGS" |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1234 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1235 if test $ax_blas_f77_func_ok = no; then |
12538
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1236 BLAS_LIBS="$octave_blaswrap_save_BLAS_LIBS" |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1237 else |
15271
648dabbb4c6b
build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
15257
diff
changeset
|
1238 ## wrapper in cruft, remove from BLAS_LIBS |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1239 BLAS_LIBS=`echo $BLAS_LIBS | sed -e 's/blaswrap.[[^ ]]* //g'` |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1240 AC_DEFINE(USE_BLASWRAP, 1, |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1241 [Define to 1 if BLAS functions need to be wrapped (potentially needed for 64-bit OSX only).]) |
12538
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1242 fi |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1243 ;; |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1244 esac |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1245 fi |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1246 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1247 if test $ax_blas_f77_func_ok = no; then |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1248 if test $USE_64_BIT_IDX_T = yes && test $ax_blas_integer_size_ok = no; then |
10721
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1249 ## Attempt to be more informative. |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1250 AC_MSG_ERROR([BLAS doesn't seem to support 64-bit integers. This is incompatible with --enable-64.]) |
10721
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1251 else |
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1252 AC_MSG_ERROR([A BLAS library was detected but found incompatible with your Fortran 77 compiler settings.]) |
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1253 fi |
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1254 fi |
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1255 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1256 if test $ax_blas_ok = no || test $ax_lapack_ok = no; then |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1257 AC_MSG_ERROR([BLAS and LAPACK libraries are required]) |
9799
cfd0aa788ae1
remove reference blas and lapack sources
John W. Eaton <jwe@octave.org>
parents:
9794
diff
changeset
|
1258 fi |
3690 | 1259 |
10721
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1260 ### Check for the qrupdate library |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1261 |
10721
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1262 ## No need to adjust FFLAGS because only link is attempted. |
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1263 ## Must supply proper LIBS, however. |
9570
1ab56c73ec7c
use OCTAVE_CHECK_LIBRARY to check for qrupdate library
John W. Eaton <jwe@octave.org>
parents:
9568
diff
changeset
|
1264 save_LIBS="$LIBS" |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1265 LIBS="$LAPACK_LIBS $BLAS_LIBS $FLIBS $LIBS" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1266 OCTAVE_CHECK_LIB(qrupdate, qrupdate, |
9571
263a8ed419b0
configure.in: style fixes for messages
John W. Eaton <jwe@octave.org>
parents:
9570
diff
changeset
|
1267 [qrupdate not found. The QR & Cholesky updating functions will be slow.], |
9570
1ab56c73ec7c
use OCTAVE_CHECK_LIBRARY to check for qrupdate library
John W. Eaton <jwe@octave.org>
parents:
9568
diff
changeset
|
1268 [], |
9707
6f5c4c82c5fc
avoid ugly F77 names in configure
Jaroslav Hajek <highegg@gmail.com>
parents:
9648
diff
changeset
|
1269 [sqr1up], |
6f5c4c82c5fc
avoid ugly F77 names in configure
Jaroslav Hajek <highegg@gmail.com>
parents:
9648
diff
changeset
|
1270 [Fortran 77], [don't use qrupdate, disable QR & Cholesky updating functions]) |
9708 | 1271 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1272 if test $octave_cv_lib_qrupdate = yes; then |
15361
01c4f5d8a656
configure.ac: Cache results for QRUPDATE_LUU autoconf test.
Rik <rik@octave.org>
parents:
15350
diff
changeset
|
1273 AC_CACHE_CHECK([for slup1up in $QRUPDATE_LIBS], |
01c4f5d8a656
configure.ac: Cache results for QRUPDATE_LUU autoconf test.
Rik <rik@octave.org>
parents:
15350
diff
changeset
|
1274 [octave_cv_func_slup1up], |
01c4f5d8a656
configure.ac: Cache results for QRUPDATE_LUU autoconf test.
Rik <rik@octave.org>
parents:
15350
diff
changeset
|
1275 [LIBS="$LIBS $QRUPDATE_LIBS" |
01c4f5d8a656
configure.ac: Cache results for QRUPDATE_LUU autoconf test.
Rik <rik@octave.org>
parents:
15350
diff
changeset
|
1276 AC_LANG_PUSH([Fortran 77]) |
01c4f5d8a656
configure.ac: Cache results for QRUPDATE_LUU autoconf test.
Rik <rik@octave.org>
parents:
15350
diff
changeset
|
1277 AC_LINK_IFELSE([AC_LANG_CALL([], [slup1up])], |
01c4f5d8a656
configure.ac: Cache results for QRUPDATE_LUU autoconf test.
Rik <rik@octave.org>
parents:
15350
diff
changeset
|
1278 octave_cv_func_slup1up=yes, octave_cv_func_slup1up=no) |
01c4f5d8a656
configure.ac: Cache results for QRUPDATE_LUU autoconf test.
Rik <rik@octave.org>
parents:
15350
diff
changeset
|
1279 AC_LANG_POP([Fortran 77]) |
01c4f5d8a656
configure.ac: Cache results for QRUPDATE_LUU autoconf test.
Rik <rik@octave.org>
parents:
15350
diff
changeset
|
1280 ]) |
01c4f5d8a656
configure.ac: Cache results for QRUPDATE_LUU autoconf test.
Rik <rik@octave.org>
parents:
15350
diff
changeset
|
1281 if test $octave_cv_func_slup1up = yes; then |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1282 AC_DEFINE(HAVE_QRUPDATE_LUU, 1, [Define to 1 if qrupdate supports LU updates.]) |
9708 | 1283 fi |
1284 fi | |
9570
1ab56c73ec7c
use OCTAVE_CHECK_LIBRARY to check for qrupdate library
John W. Eaton <jwe@octave.org>
parents:
9568
diff
changeset
|
1285 LIBS="$save_LIBS" |
8547
d66c9b6e506a
imported patch qrupdate.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8417
diff
changeset
|
1286 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1287 ### Check for AMD library |
7619 | 1288 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1289 OCTAVE_CHECK_LIB(amd, AMD, |
9571
263a8ed419b0
configure.in: style fixes for messages
John W. Eaton <jwe@octave.org>
parents:
9570
diff
changeset
|
1290 [AMD library not found. This will result in some lack of functionality for sparse matrices.], |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1291 [suitesparse/amd.h ufsparse/amd.h amd/amd.h amd.h], |
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1292 [amd_postorder], |
10003
2ea3110e15ed
Use M4 quoting for arguments to autoconf macros containing variables
Rik <rdrider0-list@yahoo.com>
parents:
9989
diff
changeset
|
1293 [], [don't use AMD library, disable some sparse matrix functionality]) |
5451 | 1294 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1295 ### Check for CAMD library |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1296 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1297 OCTAVE_CHECK_LIB(camd, CAMD, |
9571
263a8ed419b0
configure.in: style fixes for messages
John W. Eaton <jwe@octave.org>
parents:
9570
diff
changeset
|
1298 [CAMD library not found. This will result in some lack of functionality for sparse matrices.], |
15938
398ae067e811
configure.ac: Fix CAMD/COLAMD/CCOLAMD/CXSparse include search directories
Kyle Guinn <elyk03@gmail.com>
parents:
15932
diff
changeset
|
1299 [suitesparse/camd.h ufsparse/camd.h camd/camd.h camd.h], |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1300 [camd_postorder], |
10003
2ea3110e15ed
Use M4 quoting for arguments to autoconf macros containing variables
Rik <rdrider0-list@yahoo.com>
parents:
9989
diff
changeset
|
1301 [], [don't use CAMD library, disable some sparse matrix functionality]) |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1302 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1303 ### Check for COLAMD library |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1304 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1305 OCTAVE_CHECK_LIB(colamd, COLAMD, |
9571
263a8ed419b0
configure.in: style fixes for messages
John W. Eaton <jwe@octave.org>
parents:
9570
diff
changeset
|
1306 [COLAMD library not found. This will result in some lack of functionality for sparse matrices.], |
15938
398ae067e811
configure.ac: Fix CAMD/COLAMD/CCOLAMD/CXSparse include search directories
Kyle Guinn <elyk03@gmail.com>
parents:
15932
diff
changeset
|
1307 [suitesparse/colamd.h ufsparse/colamd.h colamd/colamd.h colamd.h], |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1308 [colamd], |
10003
2ea3110e15ed
Use M4 quoting for arguments to autoconf macros containing variables
Rik <rdrider0-list@yahoo.com>
parents:
9989
diff
changeset
|
1309 [], [don't use COLAMD library, disable some sparse matrix functionality]) |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1310 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1311 ### Check for CCOLAMD library |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1312 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1313 OCTAVE_CHECK_LIB(ccolamd, CCOLAMD, |
9571
263a8ed419b0
configure.in: style fixes for messages
John W. Eaton <jwe@octave.org>
parents:
9570
diff
changeset
|
1314 [CCOLAMD library not found. This will result in some lack of functionality for sparse matrices.], |
15938
398ae067e811
configure.ac: Fix CAMD/COLAMD/CCOLAMD/CXSparse include search directories
Kyle Guinn <elyk03@gmail.com>
parents:
15932
diff
changeset
|
1315 [suitesparse/ccolamd.h ufsparse/ccolamd.h ccolamd/ccolamd.h ccolamd.h], |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1316 [ccolamd], |
10003
2ea3110e15ed
Use M4 quoting for arguments to autoconf macros containing variables
Rik <rdrider0-list@yahoo.com>
parents:
9989
diff
changeset
|
1317 [], [don't use CCOLAMD library, disable some sparse matrix functionality]) |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1318 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1319 ### Check for CHOLMOD library. |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1320 ### If your cholmod library requires cblas, then you will need to |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1321 ### configure with --with-cholmod="-lcholmod -lcblas". |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1322 |
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1323 save_LIBS="$LIBS" |
10332
5f6298220ced
configure.ac: include colamd and amd libs in LIBS when checking for cholmod library
John W. Eaton <jwe@octave.org>
parents:
10331
diff
changeset
|
1324 LIBS="$COLAMD_LDFLAGS $COLAMD_LIBS $AMD_LDFLAGS $AMD_LIBS $LAPACK_LIBS $BLAS_LIBS $FLIBS $LIBS" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1325 OCTAVE_CHECK_LIB(cholmod, CHOLMOD, |
9571
263a8ed419b0
configure.in: style fixes for messages
John W. Eaton <jwe@octave.org>
parents:
9570
diff
changeset
|
1326 [CHOLMOD library not found. This will result in some lack of functionality for sparse matrices.], |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1327 [suitesparse/cholmod.h ufsparse/cholmod.h cholmod/cholmod.h cholmod.h], |
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1328 [cholmod_start], |
10003
2ea3110e15ed
Use M4 quoting for arguments to autoconf macros containing variables
Rik <rdrider0-list@yahoo.com>
parents:
9989
diff
changeset
|
1329 [], [don't use CHOLMOD library, disable some sparse matrix functionality]) |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1330 LIBS="$save_LIBS" |
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1331 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1332 ### Check for CXSparse library |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1333 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1334 OCTAVE_CHECK_LIB(cxsparse, CXSparse, |
9571
263a8ed419b0
configure.in: style fixes for messages
John W. Eaton <jwe@octave.org>
parents:
9570
diff
changeset
|
1335 [CXSparse library not found. This will result in some lack of functionality for sparse matrices.], |
15938
398ae067e811
configure.ac: Fix CAMD/COLAMD/CCOLAMD/CXSparse include search directories
Kyle Guinn <elyk03@gmail.com>
parents:
15932
diff
changeset
|
1336 [suitesparse/cs.h ufsparse/cs.h cxsparse/cs.h cs.h], |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1337 [cs_di_sqr], |
10003
2ea3110e15ed
Use M4 quoting for arguments to autoconf macros containing variables
Rik <rdrider0-list@yahoo.com>
parents:
9989
diff
changeset
|
1338 [C++], [don't use CXSparse library, disable some sparse matrix functionality]) |
6024 | 1339 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1340 ### Check for UMFPACK library. |
5226 | 1341 |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1342 save_LIBS="$LIBS" |
9787
cc5bb7b5679f
use AMD_CPPFLAGS when checking for UMFPACK
David Grundberg <davidg@cs.umu.se>
parents:
9763
diff
changeset
|
1343 save_CPPFLAGS="$CPPFLAGS" |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1344 LIBS="$AMD_LDFLAGS $AMD_LIBS $BLAS_LIBS $FLIBS $LIBS" |
9787
cc5bb7b5679f
use AMD_CPPFLAGS when checking for UMFPACK
David Grundberg <davidg@cs.umu.se>
parents:
9763
diff
changeset
|
1345 CPPFLAGS="$AMD_CPPFLAGS $CPPFLAGS" |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1346 OCTAVE_CHECK_LIB([umfpack], UMFPACK, |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1347 [UMFPACK not found. This will result in some lack of functionality for sparse matrices.], |
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1348 [suitesparse/umfpack.h ufsparse/umfpack.h umfpack/umfpack.h umfpack.h], |
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1349 [umfpack_zi_get_determinant], |
10003
2ea3110e15ed
Use M4 quoting for arguments to autoconf macros containing variables
Rik <rdrider0-list@yahoo.com>
parents:
9989
diff
changeset
|
1350 [], [don't use UMFPACK, disable some sparse matrix functionality]) |
9787
cc5bb7b5679f
use AMD_CPPFLAGS when checking for UMFPACK
David Grundberg <davidg@cs.umu.se>
parents:
9763
diff
changeset
|
1351 CPPFLAGS="$save_CPPFLAGS" |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1352 LIBS="$save_LIBS" |
5512 | 1353 |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1354 if test -z "$UMFPACK_LIBS"; then |
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1355 ## Invalidate the cache and try again with -lcblas. |
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1356 $as_unset ac_cv_lib_umfpack_umfpack_zi_get_determinant |
15350
6a0c0d3d60b6
build: Implement some caching for OCTAVE_CHECK_LIB macro.
Rik <rik@octave.org>
parents:
15349
diff
changeset
|
1357 $as_unset octave_cv_lib_umfpack |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1358 save_LIBS="$LIBS" |
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1359 LIBS="-lcblas $AMD_LDFLAGS $AMD_LIBS $BLAS_LIBS $FLIBS $LIBS" |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1360 OCTAVE_CHECK_LIB([umfpack], UMFPACK, |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1361 [UMFPACK not found. This will result in some lack of functionality for sparse matrices.], |
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1362 [suitesparse/umfpack.h ufsparse/umfpack.h umfpack/umfpack.h umfpack.h], |
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1363 [umfpack_zi_get_determinant], |
10003
2ea3110e15ed
Use M4 quoting for arguments to autoconf macros containing variables
Rik <rdrider0-list@yahoo.com>
parents:
9989
diff
changeset
|
1364 [], [don't use UMFPACK, disable some sparse matrix functionality]) |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1365 if test -n "$UMFPACK_LIBS"; then |
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1366 UMFPACK_LIBS="$UMFPACK_LIBS -lcblas" |
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1367 fi |
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1368 LIBS="$save_LIBS" |
6133 | 1369 fi |
5513 | 1370 |
15329
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1371 ## Test features of the installed UMFPACK library |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1372 |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1373 if test -n "$UMFPACK_LIBS"; then |
15329
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1374 ## SuiteSparse >= 4.0 needs additional link library for SuiteSparse_time() |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1375 save_LIBS="$LIBS"; |
15349
90c2b2d777bf
configure.ac: Fix building of Octave with ancient versions of SuiteSparse (3.2.X)
Rik <rik@octave.org>
parents:
15346
diff
changeset
|
1376 LIBS="$UMFPACK_LIBS $AMD_LDFLAGS $AMD_LIBS $BLAS_LIBS $FLIBS $LIBS" |
15329
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1377 xtra_libs= |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1378 OCTAVE_UMFPACK_NEED_SUITESPARSE_TIME |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1379 if test $octave_cv_umfpack_need_suitesparse_time = yes; then |
15329
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1380 AC_CHECK_LIB([rt], [clock_gettime], [xtra_libs="-lrt"], [xtra_libs=]) |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1381 ## FIXME: This library list is only accurate for Linux, Mac OS X. |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1382 ## Possibly need other library names for MinGW, Cygwin. |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1383 AC_SEARCH_LIBS([SuiteSparse_time], |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1384 [suitesparseconfig SuiteSparse], |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1385 [], [], [$xtra_libs]) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1386 case $ac_cv_search_SuiteSparse_time in |
15329
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1387 -l*) |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1388 UMFPACK_LIBS="$UMFPACK_LIBS $ac_cv_search_SuiteSparse_time" |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1389 ;; |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1390 no) |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1391 UMFPACK_LIBS= |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1392 AC_MSG_WARN([UMFPACK library found but is missing SuiteSparse_time functionality.]) |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1393 AC_MSG_WARN([UMFPACK library will be disabled.]) |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1394 ;; |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1395 esac |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1396 fi |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1397 LIBS="$save_LIBS" |
15329
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1398 |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1399 ## Check for UMFPACK separately split complex matrix and RHS. |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1400 if test -n "$UMFPACK_LIBS"; then |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1401 save_LIBS="$LIBS"; |
15349
90c2b2d777bf
configure.ac: Fix building of Octave with ancient versions of SuiteSparse (3.2.X)
Rik <rik@octave.org>
parents:
15346
diff
changeset
|
1402 LIBS="$UMFPACK_LIBS $CHOLMOD_LDFLAGS $CHOLMOD_LIBS $AMD_LDFLAGS $AMD_LIBS $COLAMD_LDFLAGS $COLAMD_LIBS $LAPACK_LIBS $BLAS_LIBS $FLIBS $LIBS $xtra_libs" |
15329
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1403 OCTAVE_UMFPACK_SEPARATE_SPLIT |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1404 LIBS="$save_LIBS" |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1405 fi |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1406 fi |
5226 | 1407 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1408 ### Check for ARPACK library. |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1409 |
14144
834df9f10963
remove ARPACK files from sources and restore configure checks for external ARPACK library
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
1410 save_LIBS="$LIBS" |
834df9f10963
remove ARPACK files from sources and restore configure checks for external ARPACK library
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
1411 LIBS="$LAPACK_LIBS $BLAS_LIBS $FLIBS $LIBS" |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1412 OCTAVE_CHECK_LIB([arpack], ARPACK, |
14144
834df9f10963
remove ARPACK files from sources and restore configure checks for external ARPACK library
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
1413 [ARPACK not found. The eigs function will be disabled.], |
834df9f10963
remove ARPACK files from sources and restore configure checks for external ARPACK library
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
1414 [], |
834df9f10963
remove ARPACK files from sources and restore configure checks for external ARPACK library
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
1415 [dseupd], |
834df9f10963
remove ARPACK files from sources and restore configure checks for external ARPACK library
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
1416 [Fortran 77], [don't use the ARPACK library, disable eigs function], |
834df9f10963
remove ARPACK files from sources and restore configure checks for external ARPACK library
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
1417 [warn_arpack= |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1418 OCTAVE_CHECK_LIB_ARPACK_OK( |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1419 [AC_DEFINE(HAVE_ARPACK, 1, [Define to 1 if ARPACK is available.])], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1420 [warn_arpack="ARPACK library found, but does not seem to work properly -- disabling eigs function"])]) |
14144
834df9f10963
remove ARPACK files from sources and restore configure checks for external ARPACK library
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
1421 LIBS="$save_LIBS" |
834df9f10963
remove ARPACK files from sources and restore configure checks for external ARPACK library
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
1422 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1423 ### Check for readline library. |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1424 |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1425 OCTAVE_ENABLE_READLINE |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1426 |
4128 | 1427 ### Enable dynamic linking. --enable-shared implies this, so |
1428 ### --enable-dl is only need if you are only building static libraries | |
1429 ### and want to try dynamic linking too (works on some systems, for | |
1430 ### example, OS X and Windows). | |
1431 | |
11216
5036b0ff9597
configure.ac: Properly m4 quote AS_HELP_STRING.
Rik <octave@nomad.inbox5.com>
parents:
11214
diff
changeset
|
1432 AC_ARG_ENABLE([dl], |
15238
c4779a180134
avoid confusing --disable-foo (default is yes) configure help messages
John W. Eaton <jwe@octave.org>
parents:
15237
diff
changeset
|
1433 [AS_HELP_STRING([--disable-dl], |
c4779a180134
avoid confusing --disable-foo (default is yes) configure help messages
John W. Eaton <jwe@octave.org>
parents:
15237
diff
changeset
|
1434 [disable loading of dynamically linked modules])], |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1435 [case $enableval in |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1436 yes) ENABLE_DYNAMIC_LINKING=yes ;; |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1437 no) ENABLE_DYNAMIC_LINKING=no ;; |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1438 *) AC_MSG_ERROR([bad value $enableval for --enable-dl]) ;; |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1439 esac], |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1440 [ENABLE_DYNAMIC_LINKING=no]) |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1441 |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1442 if test $STATIC_LIBS = no && test $SHARED_LIBS = no; then |
15925
1fbeccd44271
configure.ac: Clarify warning about disabling static AND shared libraries.
Rik <rik@octave.org>
parents:
15919
diff
changeset
|
1443 AC_MSG_ERROR([You can't disable building both static AND shared libraries!]) |
3034 | 1444 fi |
1445 | |
2813 | 1446 CPICFLAG=-fPIC |
1447 CXXPICFLAG=-fPIC | |
1448 FPICFLAG=-fPIC | |
1449 SHLEXT=so | |
4190 | 1450 SHLLIB='$(SHLEXT)' |
4102 | 1451 SHLBIN= |
4138 | 1452 SHLEXT_VER='$(SHLEXT).$(version)' |
1453 SHLLIB_VER='$(SHLLIB).$(version)' | |
1454 SHLBIN_VER='$(SHLBIN).$(version)' | |
4126 | 1455 SHLLINKEXT= |
6051 | 1456 LIBPRE=lib |
9186
49a0c58a7dcf
Added SHLPRE for SHLEXT instead of SHLLIBPRE
marco_atzeri@yahoo.it
parents:
9178
diff
changeset
|
1457 SHLPRE=lib |
9189
8a348e4be8bb
repair damage done when applying changeset 49a0c58a7dcf
John W. Eaton <jwe@octave.org>
parents:
9187
diff
changeset
|
1458 SHLLIBPRE=lib |
8618
f8b3ece45bda
use separate prefix for shllib and shlbin files
John W. Eaton <jwe@octave.org>
parents:
8607
diff
changeset
|
1459 SHLBINPRE=lib |
4323 | 1460 SH_LD='$(CXX)' |
2813 | 1461 SH_LDFLAGS=-shared |
4759 | 1462 DL_LD='$(SH_LD)' |
1463 DL_LDFLAGS='$(SH_LDFLAGS)' | |
1464 MKOCTFILE_DL_LDFLAGS='$(DL_LDFLAGS)' | |
3036 | 1465 SONAME_FLAGS= |
4199 | 1466 NO_OCT_FILE_STRIP=false |
4323 | 1467 TEMPLATE_AR='$(AR)' |
3775 | 1468 TEMPLATE_ARFLAGS="$ARFLAGS" |
6137 | 1469 CRUFT_DLL_DEFS= |
1470 OCTAVE_DLL_DEFS= | |
1471 OCTINTERP_DLL_DEFS= | |
15257
7ee62f559a73
Fix compilation under Windows with GUI and LLVM enabled.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15238
diff
changeset
|
1472 OCTGUI_DLL_DEFS= |
7825
13871b7de124
Import sources for OpenGL-based renderer.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7789
diff
changeset
|
1473 OCTGRAPHICS_DLL_DEFS= |
4104 | 1474 library_path_var=LD_LIBRARY_PATH |
9613
16907d1153d1
attempt to fix LD_PRELOAD for Cygwin
John W. Eaton <jwe@octave.org>
parents:
9610
diff
changeset
|
1475 ldpreloadsep=" " |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1476 BUILD_COMPILED_AUX_PROGRAMS=no |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1477 case $canonical_host_type in |
6668 | 1478 *-*-386bsd* | *-*-netbsd*) |
2813 | 1479 SH_LD=ld |
1480 SH_LDFLAGS=-Bshareable | |
1481 ;; | |
6668 | 1482 *-*-openbsd*) |
1483 SH_LDFLAGS='-shared -fPIC' | |
1484 ;; | |
4323 | 1485 *-*-freebsd*) |
5508 | 1486 SH_LDFLAGS="-shared -Wl,-x" |
4323 | 1487 ;; |
3127 | 1488 alpha*-dec-osf*) |
2813 | 1489 CPICFLAG= |
1490 CXXPICFLAG= | |
1491 FPICFLAG= | |
4283 | 1492 SH_LDFLAGS="-shared -Wl,-expect_unresolved -Wl,'*'" |
2813 | 1493 ;; |
3956 | 1494 *-*-darwin*) |
15195 | 1495 DL_LDFLAGS='-bundle -bundle_loader $(top_builddir)/libinterp/octave $(LDFLAGS)' |
6682 | 1496 MKOCTFILE_DL_LDFLAGS='-bundle -bundle_loader $$BINDIR/octave-$$OCTAVE_VERSION$$EXEEXT' |
4759 | 1497 SH_LDFLAGS='-dynamiclib -single_module $(LDFLAGS)' |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1498 case $canonical_host_type in |
7266 | 1499 powerpc-*) |
1500 CXXPICFLAG= | |
1501 CPICFLAG= | |
1502 FPICFLAG= | |
1503 ;; | |
1504 esac | |
4759 | 1505 SHLEXT=dylib |
1506 SHLLIB='$(SHLEXT)' | |
1507 SHLEXT_VER='$(version).$(SHLEXT)' | |
1508 SHLLIB_VER='$(version).$(SHLLIB)' | |
4199 | 1509 NO_OCT_FILE_STRIP=true |
4786 | 1510 SONAME_FLAGS='-install_name $(octlibdir)/$@' |
12451 | 1511 library_path_var=DYLD_LIBRARY_PATH |
3956 | 1512 ;; |
8675
43c6012bd4c2
configure.in: separate cases for cygwin and mingw
Benjamin Lindner <lindnerben@gmx.net>
parents:
8659
diff
changeset
|
1513 *-*-cygwin*) |
9054
0735e427c6c0
configure fixes for cygwin
Marco Atzeri <marco_atzeri@yahoo.it>
parents:
9049
diff
changeset
|
1514 CPICFLAG= |
0735e427c6c0
configure fixes for cygwin
Marco Atzeri <marco_atzeri@yahoo.it>
parents:
9049
diff
changeset
|
1515 CXXPICFLAG= |
0735e427c6c0
configure fixes for cygwin
Marco Atzeri <marco_atzeri@yahoo.it>
parents:
9049
diff
changeset
|
1516 FPICFLAG= |
0735e427c6c0
configure fixes for cygwin
Marco Atzeri <marco_atzeri@yahoo.it>
parents:
9049
diff
changeset
|
1517 LIBPRE=lib |
9186
49a0c58a7dcf
Added SHLPRE for SHLEXT instead of SHLLIBPRE
marco_atzeri@yahoo.it
parents:
9178
diff
changeset
|
1518 SHLPRE=cyg |
9241
60bbc66bb0e2
Correct my previous mistake for cygwin SHLBIN and SHLBINPRE
Marco Atzeri <marco_atzeri@yahoo.it>
parents:
9231
diff
changeset
|
1519 SHLBINPRE=cyg |
8644
fac8c78b4fb9
configure.in: fix shared library definitions for Cygwin and MinGW
Marco Atzeri <marco_atzeri@yahoo.it>
parents:
8641
diff
changeset
|
1520 SHLEXT=dll |
fac8c78b4fb9
configure.in: fix shared library definitions for Cygwin and MinGW
Marco Atzeri <marco_atzeri@yahoo.it>
parents:
8641
diff
changeset
|
1521 SHLLIB=dll.a |
9241
60bbc66bb0e2
Correct my previous mistake for cygwin SHLBIN and SHLBINPRE
Marco Atzeri <marco_atzeri@yahoo.it>
parents:
9231
diff
changeset
|
1522 SHLBIN=dll |
5451 | 1523 DL_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc" |
5414 | 1524 SH_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-auto-image-base" |
9241
60bbc66bb0e2
Correct my previous mistake for cygwin SHLBIN and SHLBINPRE
Marco Atzeri <marco_atzeri@yahoo.it>
parents:
9231
diff
changeset
|
1525 SONAME_FLAGS='-Wl,--out-implib=$(patsubst $(SHLPRE)%,$(LIBPRE)%,$@).a' |
9613
16907d1153d1
attempt to fix LD_PRELOAD for Cygwin
John W. Eaton <jwe@octave.org>
parents:
9610
diff
changeset
|
1526 ldpreloadsep=":" |
4102 | 1527 ;; |
8675
43c6012bd4c2
configure.in: separate cases for cygwin and mingw
Benjamin Lindner <lindnerben@gmx.net>
parents:
8659
diff
changeset
|
1528 *-*-mingw*) |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1529 BUILD_COMPILED_AUX_PROGRAMS=yes |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1530 if test $have_msvc = yes; then |
10123
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1531 DL_LDFLAGS="-shared" |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1532 CPICFLAG= |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1533 CXXPICFLAG= |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1534 FPICFLAG= |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1535 SHLEXT=dll |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1536 SHLLIB=lib |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1537 SHLBIN=dll |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1538 LIBPRE= |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1539 SHLPRE= |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1540 SHLLIBPRE= |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1541 SHLBINPRE= |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1542 SH_LDFLAGS="-shared" |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1543 if test -n "`echo $CFLAGS | grep -e '-g'`" || test -n "`echo $CXXFLAGS | grep -e '-g'`"; then |
10123
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1544 DL_LDFLAGS="$DL_LDFLAGS -g" |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1545 SH_LDFLAGS="$SH_LDFLAGS -g" |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1546 fi |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1547 NO_OCT_FILE_STRIP=true |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1548 library_path_var=PATH |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1549 ## Extra compilation flags. |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1550 CRUFT_DLL_DEFS="-DCRUFT_DLL" |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1551 OCTAVE_DLL_DEFS="-DOCTAVE_DLL" |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1552 OCTINTERP_DLL_DEFS="-DOCTINTERP_DLL" |
15257
7ee62f559a73
Fix compilation under Windows with GUI and LLVM enabled.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15238
diff
changeset
|
1553 OCTGUI_DLL_DEFS="-DOCTGUI_DLL" |
10123
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1554 OCTGRAPHICS_DLL_DEFS="-DOCTGRAPHICS_DLL" |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1555 else |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1556 CPICFLAG= |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1557 CXXPICFLAG= |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1558 FPICFLAG= |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1559 SHLEXT=dll |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1560 SHLLIB=dll.a |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1561 SHLBIN=dll |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1562 DL_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc" |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1563 SH_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-auto-image-base" |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1564 SONAME_FLAGS='-Wl,--out-implib=$@.a' |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1565 library_path_var=PATH |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1566 fi |
8675
43c6012bd4c2
configure.in: separate cases for cygwin and mingw
Benjamin Lindner <lindnerben@gmx.net>
parents:
8659
diff
changeset
|
1567 ;; |
8618
f8b3ece45bda
use separate prefix for shllib and shlbin files
John W. Eaton <jwe@octave.org>
parents:
8607
diff
changeset
|
1568 |
6089 | 1569 *-*-msdosmsvc) |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1570 BUILD_COMPILED_AUX_PROGRAMS=yes |
6794 | 1571 DL_LDFLAGS="-shared" |
6051 | 1572 CPICFLAG= |
1573 CXXPICFLAG= | |
1574 FPICFLAG= | |
1575 SHLEXT=dll | |
1576 SHLLIB=lib | |
1577 SHLBIN=dll | |
1578 LIBPRE= | |
9186
49a0c58a7dcf
Added SHLPRE for SHLEXT instead of SHLLIBPRE
marco_atzeri@yahoo.it
parents:
9178
diff
changeset
|
1579 SHLPRE= |
9189
8a348e4be8bb
repair damage done when applying changeset 49a0c58a7dcf
John W. Eaton <jwe@octave.org>
parents:
9187
diff
changeset
|
1580 SHLLIBPRE= |
8618
f8b3ece45bda
use separate prefix for shllib and shlbin files
John W. Eaton <jwe@octave.org>
parents:
8607
diff
changeset
|
1581 SHLBINPRE= |
6794 | 1582 SH_LDFLAGS="-shared" |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1583 if test -n "`echo $CFLAGS | grep -e '-g'`" || test -n "`echo $CXXFLAGS | grep -e '-g'`"; then |
6794 | 1584 DL_LDFLAGS="$DL_LDFLAGS -g" |
1585 SH_LDFLAGS="$SH_LDFLAGS -g" | |
1586 fi | |
6255 | 1587 NO_OCT_FILE_STRIP=true |
6100 | 1588 library_path_var=PATH |
6087 | 1589 ## Extra compilation flags. |
6137 | 1590 CRUFT_DLL_DEFS="-DCRUFT_DLL" |
1591 OCTAVE_DLL_DEFS="-DOCTAVE_DLL" | |
15257
7ee62f559a73
Fix compilation under Windows with GUI and LLVM enabled.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15238
diff
changeset
|
1592 OCTGUI_DLL_DEFS="-DOCTGUI_DLL" |
7825
13871b7de124
Import sources for OpenGL-based renderer.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7789
diff
changeset
|
1593 OCTGRAPHICS_DLL_DEFS="-DOCTGRAPHICS_DLL" |
6051 | 1594 ;; |
3740 | 1595 *-*-linux* | *-*-gnu*) |
4906 | 1596 MKOCTFILE_DL_LDFLAGS="-shared -Wl,-Bsymbolic" |
4283 | 1597 SONAME_FLAGS='-Wl,-soname -Wl,$@' |
2813 | 1598 ;; |
3887 | 1599 i[[3456]]86-*-sco3.2v5*) |
4283 | 1600 SONAME_FLAGS='-Wl,-h -Wl,$@' |
3160 | 1601 SH_LDFLAGS=-G |
1602 ;; | |
2813 | 1603 rs6000-ibm-aix* | powerpc-ibm-aix*) |
1604 CPICFLAG= | |
1605 CXXPICFLAG= | |
1606 FPICFLAG= | |
9172
cd68431b395a
configure.in: shared library fixes for AIX and HPUX
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9171
diff
changeset
|
1607 library_path_var=LIBPATH |
2813 | 1608 ;; |
1609 hppa*-hp-hpux*) | |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1610 if test $ac_cv_f77_compiler_gnu = yes; then |
2813 | 1611 FPICFLAG=-fPIC |
1612 else | |
1613 FPICFLAG=+Z | |
1614 fi | |
1615 SHLEXT=sl | |
1616 SH_LDFLAGS="-shared -fPIC" | |
9172
cd68431b395a
configure.in: shared library fixes for AIX and HPUX
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9171
diff
changeset
|
1617 library_path_var=SHLIB_PATH |
cd68431b395a
configure.in: shared library fixes for AIX and HPUX
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9171
diff
changeset
|
1618 ;; |
cd68431b395a
configure.in: shared library fixes for AIX and HPUX
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9171
diff
changeset
|
1619 ia64*-hp-hpux*) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1620 if test $ac_cv_f77_compiler_gnu = yes; then |
9172
cd68431b395a
configure.in: shared library fixes for AIX and HPUX
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9171
diff
changeset
|
1621 FPICFLAG=-fPIC |
cd68431b395a
configure.in: shared library fixes for AIX and HPUX
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9171
diff
changeset
|
1622 else |
cd68431b395a
configure.in: shared library fixes for AIX and HPUX
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9171
diff
changeset
|
1623 FPICFLAG=+Z |
cd68431b395a
configure.in: shared library fixes for AIX and HPUX
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9171
diff
changeset
|
1624 fi |
cd68431b395a
configure.in: shared library fixes for AIX and HPUX
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9171
diff
changeset
|
1625 SH_LDFLAGS="-shared -fPIC" |
2813 | 1626 ;; |
1627 *-sgi-*) | |
1628 CPICFLAG= | |
1629 CXXPICFLAG= | |
1630 FPICFLAG= | |
1631 ;; | |
1632 sparc-sun-sunos4*) | |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1633 if test $ac_cv_f77_compiler_gnu = yes; then |
2813 | 1634 FPICFLAG=-fPIC |
1635 else | |
1636 FPICFLAG=-PIC | |
1637 fi | |
3059 | 1638 SH_LD=ld |
1639 SH_LDFLAGS="-assert nodefinitions" | |
2813 | 1640 ;; |
3606 | 1641 sparc-sun-solaris2* | i386-pc-solaris2*) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1642 if test $ac_cv_f77_compiler_gnu = yes; then |
2813 | 1643 FPICFLAG=-fPIC |
1644 else | |
3775 | 1645 FPICFLAG=-KPIC |
1646 fi | |
1647 if test "$GCC" = yes; then | |
1648 CPICFLAG=-fPIC | |
1649 else | |
1650 CPICFLAG=-KPIC | |
2813 | 1651 fi |
3775 | 1652 if test "$GXX" = yes; then |
1653 CXXPICFLAG=-fPIC | |
1654 SH_LDFLAGS=-shared | |
1655 else | |
1656 CXXPICFLAG=-KPIC | |
1657 SH_LDFLAGS=-G | |
1658 fi | |
6087 | 1659 ## Template closures in archive libraries need a different mechanism. |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1660 if test "$GXX" != yes; then |
4323 | 1661 TEMPLATE_AR='$(CXX)' |
3775 | 1662 TEMPLATE_ARFLAGS="-xar -o" |
1663 fi | |
2813 | 1664 ;; |
1665 esac | |
1666 | |
10986
20bb05b9fb3f
makefile rules for compiled auxiliary programs
John W. Eaton <jwe@octave.org>
parents:
10951
diff
changeset
|
1667 AM_CONDITIONAL([AMCOND_BUILD_COMPILED_AUX_PROGRAMS], |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1668 [test $BUILD_COMPILED_AUX_PROGRAMS = yes]) |
10986
20bb05b9fb3f
makefile rules for compiled auxiliary programs
John W. Eaton <jwe@octave.org>
parents:
10951
diff
changeset
|
1669 |
5844 | 1670 AC_MSG_NOTICE([defining FPICFLAG to be $FPICFLAG]) |
1671 AC_MSG_NOTICE([defining CPICFLAG to be $CPICFLAG]) | |
1672 AC_MSG_NOTICE([defining CXXPICFLAG to be $CXXPICFLAG]) | |
1673 AC_MSG_NOTICE([defining SHLEXT to be $SHLEXT]) | |
1674 AC_MSG_NOTICE([defining SHLLIB to be $SHLLIB]) | |
1675 AC_MSG_NOTICE([defining SHLBIN to be $SHLBIN]) | |
1676 AC_MSG_NOTICE([defining SHLEXT_VER to be $SHLEXT_VER]) | |
1677 AC_MSG_NOTICE([defining SHLLIB_VER to be $SHLLIB_VER]) | |
1678 AC_MSG_NOTICE([defining SHLBIN_VER to be $SHLBIN_VER]) | |
1679 AC_MSG_NOTICE([defining SHLLINKEXT to be $SHLLINKEXT]) | |
6051 | 1680 AC_MSG_NOTICE([defining LIBPRE to be $LIBPRE]) |
9186
49a0c58a7dcf
Added SHLPRE for SHLEXT instead of SHLLIBPRE
marco_atzeri@yahoo.it
parents:
9178
diff
changeset
|
1681 AC_MSG_NOTICE([defining SHLPRE to be $SHLPRE]) |
9189
8a348e4be8bb
repair damage done when applying changeset 49a0c58a7dcf
John W. Eaton <jwe@octave.org>
parents:
9187
diff
changeset
|
1682 AC_MSG_NOTICE([defining SHLLIBPRE to be $SHLLIBPRE]) |
8618
f8b3ece45bda
use separate prefix for shllib and shlbin files
John W. Eaton <jwe@octave.org>
parents:
8607
diff
changeset
|
1683 AC_MSG_NOTICE([defining SHLBINPRE to be $SHLBINPRE]) |
5844 | 1684 AC_MSG_NOTICE([defining SH_LD to be $SH_LD]) |
1685 AC_MSG_NOTICE([defining SH_LDFLAGS to be $SH_LDFLAGS]) | |
1686 AC_MSG_NOTICE([defining DL_LD to be $DL_LD]) | |
1687 AC_MSG_NOTICE([defining DL_LDFLAGS to be $DL_LDFLAGS]) | |
1688 AC_MSG_NOTICE([defining MKOCTFILE_DL_LDFLAGS to be $MKOCTFILE_DL_LDFLAGS]) | |
1689 AC_MSG_NOTICE([defining SONAME_FLAGS to be $SONAME_FLAGS]) | |
1690 AC_MSG_NOTICE([defining NO_OCT_FILE_STRIP to be $NO_OCT_FILE_STRIP]) | |
1691 AC_MSG_NOTICE([defining TEMPLATE_AR to be $TEMPLATE_AR]) | |
1692 AC_MSG_NOTICE([defining TEMPLATE_ARFLAGS to be $TEMPLATE_ARFLAGS]) | |
6137 | 1693 AC_MSG_NOTICE([defining CRUFT_DLL_DEFS to be $CRUFT_DLL_DEFS]) |
1694 AC_MSG_NOTICE([defining OCTAVE_DLL_DEFS to be $OCTAVE_DLL_DEFS]) | |
1695 AC_MSG_NOTICE([defining OCTINTERP_DLL_DEFS to be $OCTINTERP_DLL_DEFS]) | |
15257
7ee62f559a73
Fix compilation under Windows with GUI and LLVM enabled.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15238
diff
changeset
|
1696 AC_MSG_NOTICE([defining OCTGUI_DLL_DEFS to be $OCTGUI_DLL_DEFS]) |
7825
13871b7de124
Import sources for OpenGL-based renderer.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7789
diff
changeset
|
1697 AC_MSG_NOTICE([defining OCTGRAPHICS_DLL_DEFS to be $OCTGRAPHICS_DLL_DEFS]) |
5844 | 1698 AC_MSG_NOTICE([defining library_path_var to be $library_path_var]) |
2813 | 1699 AC_SUBST(FPICFLAG) |
1700 AC_SUBST(CPICFLAG) | |
1701 AC_SUBST(CXXPICFLAG) | |
1702 AC_SUBST(SHLEXT) | |
4102 | 1703 AC_SUBST(SHLLIB) |
1704 AC_SUBST(SHLBIN) | |
4126 | 1705 AC_SUBST(SHLEXT_VER) |
1706 AC_SUBST(SHLLIB_VER) | |
1707 AC_SUBST(SHLBIN_VER) | |
1708 AC_SUBST(SHLLINKEXT) | |
6051 | 1709 AC_SUBST(LIBPRE) |
9186
49a0c58a7dcf
Added SHLPRE for SHLEXT instead of SHLLIBPRE
marco_atzeri@yahoo.it
parents:
9178
diff
changeset
|
1710 AC_SUBST(SHLPRE) |
9189
8a348e4be8bb
repair damage done when applying changeset 49a0c58a7dcf
John W. Eaton <jwe@octave.org>
parents:
9187
diff
changeset
|
1711 AC_SUBST(SHLLIBPRE) |
8618
f8b3ece45bda
use separate prefix for shllib and shlbin files
John W. Eaton <jwe@octave.org>
parents:
8607
diff
changeset
|
1712 AC_SUBST(SHLBINPRE) |
2813 | 1713 AC_SUBST(SH_LD) |
1714 AC_SUBST(SH_LDFLAGS) | |
4759 | 1715 AC_SUBST(DL_LD) |
1716 AC_SUBST(DL_LDFLAGS) | |
1717 AC_SUBST(MKOCTFILE_DL_LDFLAGS) | |
3036 | 1718 AC_SUBST(SONAME_FLAGS) |
4199 | 1719 AC_SUBST(NO_OCT_FILE_STRIP) |
3775 | 1720 AC_SUBST(TEMPLATE_AR) |
1721 AC_SUBST(TEMPLATE_ARFLAGS) | |
6141 | 1722 AC_SUBST(CRUFT_DLL_DEFS) |
1723 AC_SUBST(OCTAVE_DLL_DEFS) | |
1724 AC_SUBST(OCTINTERP_DLL_DEFS) | |
15257
7ee62f559a73
Fix compilation under Windows with GUI and LLVM enabled.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15238
diff
changeset
|
1725 AC_SUBST(OCTGUI_DLL_DEFS) |
7825
13871b7de124
Import sources for OpenGL-based renderer.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7789
diff
changeset
|
1726 AC_SUBST(OCTGRAPHICS_DLL_DEFS) |
4104 | 1727 AC_SUBST(library_path_var) |
9613
16907d1153d1
attempt to fix LD_PRELOAD for Cygwin
John W. Eaton <jwe@octave.org>
parents:
9610
diff
changeset
|
1728 AC_SUBST(ldpreloadsep) |
4102 | 1729 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1730 ### More configure argument checking related to linking |
13024
f3c53fea9fb5
maint: more linking tweaks
John W. Eaton <jwe@octave.org>
parents:
13016
diff
changeset
|
1731 |
f3c53fea9fb5
maint: more linking tweaks
John W. Eaton <jwe@octave.org>
parents:
13016
diff
changeset
|
1732 AC_ARG_ENABLE([no-undefined], |
15238
c4779a180134
avoid confusing --disable-foo (default is yes) configure help messages
John W. Eaton <jwe@octave.org>
parents:
15237
diff
changeset
|
1733 [AS_HELP_STRING([--disable-no-undefined], |
c4779a180134
avoid confusing --disable-foo (default is yes) configure help messages
John W. Eaton <jwe@octave.org>
parents:
15237
diff
changeset
|
1734 [don't pass -no-undefined to libtool when linking Octave and its shared libraries])], |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1735 [case $enableval in |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1736 yes) NO_UNDEFINED_LDFLAG="-no-undefined" ;; |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1737 no) NO_UNDEFINED_LDFLAG="" ;; |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1738 *) AC_MSG_ERROR([bad value $enableval for --disable-no-undefined]) ;; |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1739 esac], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1740 [NO_UNDEFINED_LDFLAG="-no-undefined"]) |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1741 AC_SUBST(NO_UNDEFINED_LDFLAG) |
4388 | 1742 |
13024
f3c53fea9fb5
maint: more linking tweaks
John W. Eaton <jwe@octave.org>
parents:
13016
diff
changeset
|
1743 AC_ARG_ENABLE([link-all-dependencies], |
f3c53fea9fb5
maint: more linking tweaks
John W. Eaton <jwe@octave.org>
parents:
13016
diff
changeset
|
1744 [AS_HELP_STRING([--enable-link-all-dependencies], |
f3c53fea9fb5
maint: more linking tweaks
John W. Eaton <jwe@octave.org>
parents:
13016
diff
changeset
|
1745 [link Octave and its shared libraries with all dependencies, not just those immediately referenced (should not be needed on most systems)])], |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1746 [case $enableval in |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1747 yes) link_all_deps=yes ;; |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1748 no) link_all_deps=no ;; |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1749 *) AC_MSG_ERROR([bad value $enableval for --enable-link-all-depenencies]) |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1750 ;; |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1751 esac], |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1752 [link_all_deps=no]) |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1753 AM_CONDITIONAL([AMCOND_LINK_ALL_DEPS], [test $link_all_deps = yes]) |
3249 | 1754 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1755 ## Dynamic linking is now enabled only if we are building shared |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1756 ## libs and some API for dynamic linking has been detected. |
9171
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
1757 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1758 ## FIXME: A lot of the following duplicates the functionality of |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1759 ## code generated by the dlopen option for LT_INIT. |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1760 |
3705 | 1761 LD_CXX='$(CXX)' |
3232 | 1762 RDYNAMIC_FLAG= |
4110 | 1763 DL_API_MSG="" |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1764 dlopen_api=no |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1765 shl_load_api=no |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1766 loadlibrary_api=no |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1767 dyld_api=no |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1768 |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1769 if test $SHARED_LIBS = yes || test $ENABLE_DYNAMIC_LINKING = yes; then |
4163 | 1770 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1771 case $lt_cv_dlopen in |
10036
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
1772 dlopen) |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1773 dlopen_api=yes |
10036
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
1774 DL_API_MSG="(dlopen)" |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1775 AC_DEFINE(HAVE_DLOPEN_API, 1, |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1776 [Define to 1 if your system has dlopen, dlsym, dlerror, and dlclose for dynamic linking.]) |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1777 OCTAVE_CXX_FLAG([-rdynamic], [RDYNAMIC_FLAG=-rdynamic]) |
10036
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
1778 ;; |
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
1779 shl_load) |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1780 shl_load_api=yes |
10036
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
1781 DL_API_MSG="(shl_load)" |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1782 AC_DEFINE(HAVE_SHL_LOAD_API, 1, |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1783 [Define to 1 if your system has shl_load and shl_findsym for dynamic linking.]) |
10036
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
1784 ;; |
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
1785 LoadLibrary) |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1786 loadlibrary_api=yes |
10036
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
1787 DL_API_MSG="(LoadLibrary)" |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1788 AC_DEFINE(HAVE_LOADLIBRARY_API, 1, |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1789 [Define to 1 if your system has LoadLibrary for dynamic linking.]) |
10036
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
1790 ;; |
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
1791 dyld) |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1792 dyld_api=yes |
10036
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
1793 DL_API_MSG="(dyld)" |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1794 AC_DEFINE(HAVE_DYLD_API, 1, |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1795 [Define to 1 if your system has dyld for dynamic linking.]) |
10036
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
1796 ;; |
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
1797 esac |
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
1798 |
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
1799 DL_LIBS="$lt_cv_dlopen_libs" |
9515 | 1800 AC_SUBST(DL_LIBS) |
4110 | 1801 |
13010
edc5ec6e949b
maint: allow --enable-static --disable-dl to work again
John W. Eaton <jwe@octave.org>
parents:
12772
diff
changeset
|
1802 ## Disable dynamic linking if capability is not present. |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1803 if test $dlopen_api = yes \ |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1804 || test $shl_load_api = yes \ |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1805 || test $loadlibrary_api = yes \ |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1806 || test $dyld_api = yes; then |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1807 # some form of dynamic linking present |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1808 ENABLE_DYNAMIC_LINKING=yes |
13010
edc5ec6e949b
maint: allow --enable-static --disable-dl to work again
John W. Eaton <jwe@octave.org>
parents:
12772
diff
changeset
|
1809 else |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1810 ENABLE_DYNAMIC_LINKING=no |
1978 | 1811 fi |
4163 | 1812 fi |
1813 | |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1814 if test $ENABLE_DYNAMIC_LINKING = yes; then |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1815 AC_DEFINE(ENABLE_DYNAMIC_LINKING, 1, [Define to 1 if using dynamic linking.]) |
13010
edc5ec6e949b
maint: allow --enable-static --disable-dl to work again
John W. Eaton <jwe@octave.org>
parents:
12772
diff
changeset
|
1816 fi |
edc5ec6e949b
maint: allow --enable-static --disable-dl to work again
John W. Eaton <jwe@octave.org>
parents:
12772
diff
changeset
|
1817 |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1818 AM_CONDITIONAL([AMCOND_ENABLE_DYNAMIC_LINKING], |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1819 [test $ENABLE_DYNAMIC_LINKING = yes]) |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1820 |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1821 if test $SHARED_LIBS = yes; then |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1822 LIBOCTINTERP="-loctinterp$SHLLINKEXT" |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1823 LIBOCTAVE="-loctave$SHLLINKEXT" |
1978 | 1824 else |
15195 | 1825 LIBOCTINTERP='$(top_builddir)/libinterp/liboctinterp.$(LIBEXT)' |
10004
e517da95bf98
Eliminate TOPDIR variable in favor of built-in automake variables
Rik <rdrider0-list@yahoo.com>
parents:
10003
diff
changeset
|
1826 LIBOCTAVE='$(top_builddir)/liboctave/liboctave.$(LIBEXT)' |
1664 | 1827 fi |
4163 | 1828 |
4110 | 1829 AC_SUBST(LD_CXX) |
3232 | 1830 AC_SUBST(RDYNAMIC_FLAG) |
4128 | 1831 AC_SUBST(ENABLE_DYNAMIC_LINKING) |
4110 | 1832 AC_SUBST(LIBOCTINTERP) |
1833 AC_SUBST(LIBOCTAVE) | |
1901 | 1834 |
8998
a48fba01e4ac
optimize isnan/isinf/isfinite mappers
Jaroslav Hajek <highegg@gmail.com>
parents:
8940
diff
changeset
|
1835 |
15932
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1836 if test "$cross_compiling" = yes && test -n "$ac_tool_prefix"; then |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1837 CROSS_TOOL_PREFIX="$ac_tool_prefix" |
15945
a653526ea4a5
use mkoctfile, not octave_config_info to get default pkg compiler tools
John W. Eaton <jwe@octave.org>
parents:
15938
diff
changeset
|
1838 MKOCTFILE_AR='$(shell echo $(AR) | sed "s,$(CROSS_TOOL_PREFIX),,")' |
15932
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1839 MKOCTFILE_CC='$(shell echo $(CC) | sed "s,$(CROSS_TOOL_PREFIX),,")' |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1840 MKOCTFILE_CXX='$(shell echo $(CXX) | sed "s,$(CROSS_TOOL_PREFIX),,")' |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1841 MKOCTFILE_DL_LD='$(shell echo $(DL_LD) | sed "s,$(CROSS_TOOL_PREFIX),,")' |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1842 MKOCTFILE_F77='$(shell echo $(F77) | sed "s,$(CROSS_TOOL_PREFIX),,")' |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1843 MKOCTFILE_LD_CXX='$(shell echo $(LD_CXX) | sed "s,$(CROSS_TOOL_PREFIX),,")' |
15945
a653526ea4a5
use mkoctfile, not octave_config_info to get default pkg compiler tools
John W. Eaton <jwe@octave.org>
parents:
15938
diff
changeset
|
1844 MKOCTFILE_RANLIB='$(shell echo $(RANLIB) | sed "s,$(CROSS_TOOL_PREFIX),,")' |
15932
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1845 else |
15945
a653526ea4a5
use mkoctfile, not octave_config_info to get default pkg compiler tools
John W. Eaton <jwe@octave.org>
parents:
15938
diff
changeset
|
1846 MKOCTFILE_AR="$AR" |
15932
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1847 MKOCTFILE_CC="$CC" |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1848 MKOCTFILE_CXX="$CXX" |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1849 MKOCTFILE_DL_LD="$DL_LD" |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1850 MKOCTFILE_F77="$F77" |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1851 MKOCTFILE_LD_CXX="$LD_CXX" |
15945
a653526ea4a5
use mkoctfile, not octave_config_info to get default pkg compiler tools
John W. Eaton <jwe@octave.org>
parents:
15938
diff
changeset
|
1852 MKOCTFILE_RANLIB="$RANLIB" |
15932
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1853 fi |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1854 AC_MSG_NOTICE([defining CROSS_TOOL_PREFIX to be $CROSS_TOOL_PREFIX]) |
15945
a653526ea4a5
use mkoctfile, not octave_config_info to get default pkg compiler tools
John W. Eaton <jwe@octave.org>
parents:
15938
diff
changeset
|
1855 AC_MSG_NOTICE([defining MKOCTFILE_AR to be $MKOCTFILE_AR]) |
15932
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1856 AC_MSG_NOTICE([defining MKOCTFILE_CC to be $MKOCTFILE_CC]) |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1857 AC_MSG_NOTICE([defining MKOCTFILE_CXX to be $MKOCTFILE_CXX]) |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1858 AC_MSG_NOTICE([defining MKOCTFILE_DL_LD to be $MKOCTFILE_DL_LD]) |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1859 AC_MSG_NOTICE([defining MKOCTFILE_F77 to be $MKOCTFILE_F77]) |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1860 AC_MSG_NOTICE([defining MKOCTFILE_LD_CXX to be $MKOCTFILE_LD_CXX]) |
15945
a653526ea4a5
use mkoctfile, not octave_config_info to get default pkg compiler tools
John W. Eaton <jwe@octave.org>
parents:
15938
diff
changeset
|
1861 AC_MSG_NOTICE([defining MKOCTFILE_RANLIB to be $MKOCTFILE_RANLIB]) |
15932
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1862 AC_SUBST(CROSS_TOOL_PREFIX) |
15945
a653526ea4a5
use mkoctfile, not octave_config_info to get default pkg compiler tools
John W. Eaton <jwe@octave.org>
parents:
15938
diff
changeset
|
1863 AC_SUBST(MKOCTFILE_AR) |
15932
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1864 AC_SUBST(MKOCTFILE_CC) |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1865 AC_SUBST(MKOCTFILE_CXX) |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1866 AC_SUBST(MKOCTFILE_DL_LD) |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1867 AC_SUBST(MKOCTFILE_F77) |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1868 AC_SUBST(MKOCTFILE_LD_CXX) |
15945
a653526ea4a5
use mkoctfile, not octave_config_info to get default pkg compiler tools
John W. Eaton <jwe@octave.org>
parents:
15938
diff
changeset
|
1869 AC_SUBST(MKOCTFILE_RANLIB) |
15932
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1870 |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1871 ### Check for existence of various libraries |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1872 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1873 ## OS-specific test for dirent, opendir. |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
1874 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
1875 mingw*) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1876 if test $have_msvc = yes; then |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1877 AC_CHECK_LIB([dirent], [opendir]) |
10123
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1878 LIBS="$LIBS -ladvapi32 -lgdi32 -lws2_32 -luser32 -lkernel32" |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1879 else |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1880 LIBS="$LIBS -lgdi32 -lws2_32 -luser32 -lkernel32" |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1881 fi |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1882 LIBS="$LIBS -lgdi32 -lws2_32 -luser32 -lkernel32" |
956 | 1883 ;; |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
1884 msdosmsvc) |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1885 AC_CHECK_LIB([dirent], [opendir]) |
10123
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1886 LIBS="$LIBS -ladvapi32 -lgdi32 -lws2_32 -luser32 -lkernel32" |
956 | 1887 ;; |
1888 esac | |
1889 | |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1890 ## Find a termlib to use. |
15302
a8cfbc1911e4
build: Set TERM_LIBS before checking for READLINE.
Rik <rik@octave.org>
parents:
15298
diff
changeset
|
1891 OCTAVE_CHECK_LIB_TERMLIB |
8185
69c5cce38c29
implement 64-bit arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents:
8169
diff
changeset
|
1892 |
869 | 1893 ### Checks for header files. |
1894 | |
832 | 1895 AC_HEADER_DIRENT |
1377 | 1896 AC_HEADER_SYS_WAIT |
2097 | 1897 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1898 ## C headers |
4051 | 1899 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1900 dnl Use multiple AC_CHECKs to avoid line continuations '\' in list |
16078
9439f3b5c5fa
Restore default floating point state after calling Java
Mike Miller <mtmiller@ieee.org>
parents:
16068
diff
changeset
|
1901 AC_CHECK_HEADERS([curses.h direct.h dlfcn.h floatingpoint.h fpu_control.h]) |
9439f3b5c5fa
Restore default floating point state after calling Java
Mike Miller <mtmiller@ieee.org>
parents:
16068
diff
changeset
|
1902 AC_CHECK_HEADERS([grp.h ieeefp.h inttypes.h locale.h memory.h ncurses.h]) |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1903 AC_CHECK_HEADERS([poll.h pthread.h pwd.h sunmath.h sys/ioctl.h]) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1904 AC_CHECK_HEADERS([sys/param.h sys/poll.h sys/resource.h ]) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1905 AC_CHECK_HEADERS([sys/select.h sys/utsname.h termcap.h]) |
3887 | 1906 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1907 ## C++ headers |
4051 | 1908 |
1909 AC_LANG_PUSH(C++) | |
15134
edae65062740
build: Move unordered_map header tests to acinclude.m4 and add caching of results.
Rik <rik@octave.org>
parents:
15130
diff
changeset
|
1910 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1911 AC_CHECK_HEADERS([sstream]) |
15134
edae65062740
build: Move unordered_map header tests to acinclude.m4 and add caching of results.
Rik <rik@octave.org>
parents:
15130
diff
changeset
|
1912 OCTAVE_UNORDERED_MAP_HEADERS |
edae65062740
build: Move unordered_map header tests to acinclude.m4 and add caching of results.
Rik <rik@octave.org>
parents:
15130
diff
changeset
|
1913 |
4051 | 1914 AC_LANG_POP(C++) |
1915 | |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1916 ## Find a termio header to include. |
1901 | 1917 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1918 AC_CHECK_HEADERS([termios.h], have_termios_h=yes, have_termios_h=no) |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1919 AC_CHECK_HEADERS([termio.h], have_termio_h=yes, have_termio_h=no) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1920 AC_CHECK_HEADERS([sgtty.h], have_sgtty_h=yes, have_sgtty_h=no) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1921 AC_CHECK_HEADERS([fnmatch.h], have_fnmatch_h=yes, have_fnmatch_h=no) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1922 AC_CHECK_HEADERS([conio.h], have_conio_h=yes, have_conio_h=no) |
3249 | 1923 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1924 if test $have_termios_h != yes \ |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1925 && test $have_termio_h != yes \ |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1926 && test $have_sgtty_h != yes; then |
4064 | 1927 AC_MSG_WARN([I couldn't find termios.h, termio.h, or sgtty.h!]) |
832 | 1928 fi |
869 | 1929 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1930 ## For MSVC compilers, avoid #define of min/max from windows.h header |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1931 if test $have_msvc = yes; then |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1932 AC_DEFINE(NOMINMAX, 1, [Define to 1 if you want to avoid min/max macro definition in Windows headers.]) |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1933 fi |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1934 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1935 ### Determine types and size of types. |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1936 |
15172
c7d466a02065
configure.ac: Add checks for a few missing types.
Rik <rik@octave.org>
parents:
15170
diff
changeset
|
1937 AC_TYPE_INT64_T |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1938 AC_TYPE_MODE_T |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1939 AC_TYPE_OFF_T |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1940 AC_TYPE_PID_T |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1941 AC_TYPE_SIZE_T |
15172
c7d466a02065
configure.ac: Add checks for a few missing types.
Rik <rik@octave.org>
parents:
15170
diff
changeset
|
1942 AC_TYPE_SSIZE_T |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1943 AC_TYPE_UID_T |
15172
c7d466a02065
configure.ac: Add checks for a few missing types.
Rik <rik@octave.org>
parents:
15170
diff
changeset
|
1944 AC_TYPE_UINT64_T |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1945 AC_CHECK_TYPES([dev_t, ino_t]) |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1946 AC_CHECK_TYPES([long long int, unsigned long long int]) |
15172
c7d466a02065
configure.ac: Add checks for a few missing types.
Rik <rik@octave.org>
parents:
15170
diff
changeset
|
1947 AC_CHECK_TYPES([ptrdiff_t]) |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1948 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1949 ## How big are ints and how are they oriented? |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1950 ## These could probably be eliminated in favor of run-time checks. |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1951 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1952 AC_CHECK_SIZEOF([short]) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1953 AC_CHECK_SIZEOF([int]) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1954 AC_CHECK_SIZEOF([long]) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1955 AC_CHECK_SIZEOF([long long]) |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1956 ## Check for long double type (for 64-bit integers) |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1957 AC_CHECK_SIZEOF([long double]) |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1958 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1959 ### Check structures and existence of necessary members |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1960 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1961 AC_CHECK_MEMBERS([struct stat.st_blksize, struct stat.st_blocks, |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1962 struct stat.st_rdev]) |
15134
edae65062740
build: Move unordered_map header tests to acinclude.m4 and add caching of results.
Rik <rik@octave.org>
parents:
15130
diff
changeset
|
1963 AC_CHECK_MEMBERS([struct group.gr_passwd]) |
3887 | 1964 |
1186 | 1965 AC_STRUCT_TIMEZONE |
8998
a48fba01e4ac
optimize isnan/isinf/isfinite mappers
Jaroslav Hajek <highegg@gmail.com>
parents:
8940
diff
changeset
|
1966 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1967 ### Check compiler characteristics. |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1968 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1969 ## Does compiler have support for new friend template declarations? |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1970 OCTAVE_CXX_NEW_FRIEND_TEMPLATE_DECL |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1971 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1972 ## Does reinterpret_cast fail for function pointers? |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1973 OCTAVE_CXX_BROKEN_REINTERPRET_CAST |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1974 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1975 ## Check if C++ compiler allows placement delete. |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1976 OCTAVE_CXX_PLACEMENT_DELETE |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1977 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1978 ## Check if C++ compiler can auto allocate variable sized arrays. |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1979 OCTAVE_CXX_DYNAMIC_AUTO_ARRAYS |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1980 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1981 ## Check that C compiler and libraries support IEEE754 data format. |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1982 OCTAVE_IEEE754_DATA_FORMAT |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1983 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1984 ## Is C++ runtime library ISO compliant? |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1985 OCTAVE_CXX_ISO_COMPLIANT_LIBRARY |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1986 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1987 ## Are bit_and, bit_or, and bit_xor defined as templated operators? |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1988 OCTAVE_CXX_BITWISE_OP_TEMPLATES |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1989 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1990 ## Can complex class set components independently? |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1991 OCTAVE_CXX_COMPLEX_SETTERS |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1992 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1993 ## Are there functions to access real/imag parts of numbers via references? |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1994 OCTAVE_CXX_COMPLEX_REFERENCE_ACCESSORS |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1995 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1996 ## Check if fast integer arithmetics based on bit tricks is available. |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1997 OCTAVE_FAST_INT_OPS |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1998 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1999 ## Does the C compiler handle alloca() and const correctly? |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2000 AC_FUNC_ALLOCA |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2001 |
15130
f635710b3090
configure.ac: Add AM_PROG_CC_C_O check for Automake subdir-objects support in C compiler.
Rik <rik@octave.org>
parents:
15127
diff
changeset
|
2002 ## Does the C compiler support Automake subdir-objects option? |
f635710b3090
configure.ac: Add AM_PROG_CC_C_O check for Automake subdir-objects support in C compiler.
Rik <rik@octave.org>
parents:
15127
diff
changeset
|
2003 AM_PROG_CC_C_O |
f635710b3090
configure.ac: Add AM_PROG_CC_C_O check for Automake subdir-objects support in C compiler.
Rik <rik@octave.org>
parents:
15127
diff
changeset
|
2004 |
15142
f4684192158e
configure.ac: Split gnulib initialization into 2 parts to match recommended usage.
Rik <rik@octave.org>
parents:
15141
diff
changeset
|
2005 ### gnulib initialization: part 2 |
f4684192158e
configure.ac: Split gnulib initialization into 2 parts to match recommended usage.
Rik <rik@octave.org>
parents:
15141
diff
changeset
|
2006 ### After all include and path modifications have taken place |
f4684192158e
configure.ac: Split gnulib initialization into 2 parts to match recommended usage.
Rik <rik@octave.org>
parents:
15141
diff
changeset
|
2007 ### and at the same priority level as function checks. |
f4684192158e
configure.ac: Split gnulib initialization into 2 parts to match recommended usage.
Rik <rik@octave.org>
parents:
15141
diff
changeset
|
2008 |
f4684192158e
configure.ac: Split gnulib initialization into 2 parts to match recommended usage.
Rik <rik@octave.org>
parents:
15141
diff
changeset
|
2009 gl_INIT |
f4684192158e
configure.ac: Split gnulib initialization into 2 parts to match recommended usage.
Rik <rik@octave.org>
parents:
15141
diff
changeset
|
2010 |
1788 | 2011 ### Checks for functions and variables. |
869 | 2012 |
15452
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2013 dnl These checks define/undefine HAVE_FUNCNAME in config.h. |
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2014 dnl Code tests HAVE_FUNCNAME and either uses function or provides workaround. |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2015 dnl Use multiple AC_CHECKs to avoid line continuations '\' in list |
15452
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2016 AC_CHECK_FUNCS([canonicalize_file_name dup2]) |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2017 AC_CHECK_FUNCS([endgrent endpwent execvp expm1 expm1f fork]) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2018 AC_CHECK_FUNCS([getegid geteuid getgid getgrent getgrgid getgrnam]) |
15452
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2019 AC_CHECK_FUNCS([getpgrp getpid getppid getpwent getpwuid getuid]) |
15850
ffd1a99733bd
build: Check for isascii() before using it.
Rik <rik@octave.org>
parents:
15846
diff
changeset
|
2020 AC_CHECK_FUNCS([isascii kill]) |
ffd1a99733bd
build: Check for isascii() before using it.
Rik <rik@octave.org>
parents:
15846
diff
changeset
|
2021 AC_CHECK_FUNCS([lgamma lgammaf lgamma_r lgammaf_r]) |
15452
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2022 AC_CHECK_FUNCS([log1p log1pf pipe]) |
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2023 AC_CHECK_FUNCS([realpath resolvepath roundl]) |
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2024 AC_CHECK_FUNCS([select setgrent setpwent siglongjmp strsignal]) |
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2025 AC_CHECK_FUNCS([tempnam tgammaf toascii]) |
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2026 AC_CHECK_FUNCS([umask uname waitpid]) |
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2027 AC_CHECK_FUNCS([_kbhit]) |
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2028 |
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2029 dnl There are no workarounds in the code for missing these functions. |
15454
9b9f6dba39e0
build: Use putenv module from gnulib.
Rik <rik@octave.org>
parents:
15453
diff
changeset
|
2030 AC_CHECK_FUNCS([modf pow sqrt sqrtf], [], |
15452
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2031 [AC_MSG_ERROR([Missing function required to build Octave])]) |
1300 | 2032 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2033 ## exp2, round, tgamma function checks |
9171
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2034 AC_LANG_PUSH(C++) |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2035 AC_CHECK_DECLS([exp2, round, tgamma], [], [], [[#include <cmath>]]) |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2036 AC_CHECK_FUNCS([exp2 round tgamma]) |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2037 AH_VERBATIM([Z_FUNCS_AND_DECLS], [ |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2038 #if defined (__cplusplus) |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2039 extern "C" { |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2040 #endif |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2041 #if HAVE_EXP2 && ! HAVE_DECL_EXP2 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2042 double exp2 (double); |
9171
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2043 #endif |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2044 #if HAVE_ROUND && ! HAVE_DECL_ROUND |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2045 double round (double); |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2046 #endif |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2047 #if HAVE_TGAMMA && ! HAVE_DECL_TGAMMA |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2048 double tgamma (double); |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2049 #endif |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2050 #if defined (__cplusplus) |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2051 } |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2052 #endif |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2053 ]) |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2054 AC_LANG_POP(C++) |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2055 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2056 ## Look in <cmath> for the IEEE functions isnan, isinf, isfinite that we need. |
4163 | 2057 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2058 OCTAVE_CHECK_FUNC_CMATH(isnan) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2059 OCTAVE_CHECK_FUNC_CMATH(isinf) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2060 OCTAVE_CHECK_FUNC_CMATH(isfinite) |
4110 | 2061 |
15874
11d5a7276b6d
configure.ac: Remove some no longer accurate comments.
Rik <rik@octave.org>
parents:
15873
diff
changeset
|
2062 ## Check for Inf and NaN functions |
956 | 2063 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
2064 case $canonical_host_type in |
1384 | 2065 m68k-hp-hpux*) |
15874
11d5a7276b6d
configure.ac: Remove some no longer accurate comments.
Rik <rik@octave.org>
parents:
15873
diff
changeset
|
2066 ## I am told that Inf and NaN don't work on m68k HP sytems. |
956 | 2067 ;; |
2068 *) | |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2069 AC_CHECK_FUNCS([finite isnan isinf signbit]) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2070 AC_CHECK_FUNCS([_finite _isnan]) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2071 AC_CHECK_DECLS([signbit], , , [#include <math.h>]) |
6103 | 2072 ;; |
2073 esac | |
2074 | |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2075 ## Check for nonstandard, but common math functions, that we need. |
1076 | 2076 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2077 dnl Use multiple AC_CHECKs to avoid line continuations '\' in list |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2078 AC_CHECK_FUNCS([acosh acoshf asinh asinhf atanh atanhf cbrt cbrtf]) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2079 AC_CHECK_FUNCS([erf erff erfc erfcf exp2f hypotf _hypotf log2 log2f]) |
1076 | 2080 |
15852
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2081 ## Check for math defines such as M_LN2 in math.h |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2082 AC_CACHE_CHECK([for MATH DEFINES in math.h], |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2083 [octave_cv_header_math_defines], |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2084 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2085 #include <math.h> |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2086 ]], [[ |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2087 double x = M_LN2;]])], |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2088 octave_cv_header_math_defines=yes, |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2089 octave_cv_header_math_defines=no) |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2090 ]) |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2091 |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2092 if test $octave_cv_header_math_defines = no; then |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2093 ## Check again and try defining _USE_MATH_DEFINES |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2094 AC_CACHE_CHECK([whether _USE_MATH_DEFINES needs to be defined], |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2095 [octave_cv_header__use_math_defines], |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2096 [save_CPPFLAGS="$CPPFLAGS" |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2097 CPPFLAGS="$CPPFLAGS -D_USE_MATH_DEFINES" |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2098 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2099 #include <math.h> |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2100 ]], [[ |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2101 double x = M_LN2;]])], |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2102 octave_cv_header__use_math_defines=yes, |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2103 octave_cv_header__use_math_defines=no) |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2104 CPPFLAGS="$save_CPPFLAGS" |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2105 ]) |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2106 if test $octave_cv_header__use_math_defines = yes; then |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2107 octave_cv_header_math_defines=yes |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2108 AC_DEFINE(_USE_MATH_DEFINES, 1, |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2109 [Define to 1 if _USE_MATH_DEFINES is required to get math constants like M_LN2.]) |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2110 CPPFLAGS="$CPPFLAGS -D_USE_MATH_DEFINES" |
1978 | 2111 fi |
15852
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2112 fi |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2113 |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2114 if test $octave_cv_header_math_defines = yes; then |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2115 AC_DEFINE(HAVE_MATH_DEFINES, 1, |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2116 [Define to 1 if defines such as M_PI are available in math.h]) |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2117 else |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2118 AC_MSG_ERROR([MATH DEFINES in math.h such as M_PI are required to build Octave]) |
4163 | 2119 fi |
2120 | |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2121 ## Windows-specific tests for extra #defines |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2122 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2123 msdosmsvc | mingw*) |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2124 AC_MSG_CHECKING([for required _WIN32_WINNT]) |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2125 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2126 #include <windows.h> |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2127 #if _WIN32_WINNT < 0x0403 |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2128 #error "Wrong version" |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2129 #endif |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2130 ]], [])], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2131 [AC_MSG_RESULT([none])], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2132 [AC_DEFINE(_WIN32_WINNT, 0x0403, |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2133 [Define to 0x0403 to access InitializeCriticalSectionAndSpinCount.]) |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2134 AC_MSG_RESULT([0x0403])]) |
956 | 2135 ;; |
2136 esac | |
2137 | |
15452
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2138 ## Windows-specific use of functions |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2139 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2140 msdosmsvc | mingw*) |
15452
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2141 AC_CHECK_FUNCS([setvbuf], [], |
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2142 [AC_MSG_ERROR([Missing function required to build Octave])]) |
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2143 ;; |
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2144 esac |
3130 | 2145 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2146 ## Cygwin kluge for getrusage. |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2147 AC_CHECK_FUNCS([getrusage]) |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2148 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2149 cygwin*) |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2150 AC_DEFINE(RUSAGE_TIMES_ONLY, 1, |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2151 [Define to 1 if your struct rusage only has time information.]) |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2152 ;; |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2153 esac |
869 | 2154 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2155 ## Check for CGDisplayBitsPerPixel function on Mac OSX systems with Carbon |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
2156 if test $have_framework_carbon = yes; then |
15145
142e377e7e28
configure.ac: Don't run OCTAVE_CARBON_CGDISPLAYBITSPERPIXEL unless Carbon Framework is present.
Rik <rik@octave.org>
parents:
15143
diff
changeset
|
2157 OCTAVE_CARBON_CGDISPLAYBITSPERPIXEL |
142e377e7e28
configure.ac: Don't run OCTAVE_CARBON_CGDISPLAYBITSPERPIXEL unless Carbon Framework is present.
Rik <rik@octave.org>
parents:
15143
diff
changeset
|
2158 fi |
3887 | 2159 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2160 AC_CHECK_FUNCS([getpwnam], [], [AC_CHECK_LIB([sun], [getpwnam])]) |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2161 |
1388 | 2162 AC_FUNC_CLOSEDIR_VOID |
1225 | 2163 |
15143
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2164 ## Check return type of matherr() |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2165 AC_CACHE_CHECK([for struct exception in math.h], |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2166 [octave_cv_func_matherr_type], |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2167 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2168 #include <math.h> |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2169 ]], [[ |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2170 struct exception *x; |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2171 x->type; |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2172 x->name; |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2173 ]])], |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2174 octave_cv_func_matherr_type=yes, |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2175 octave_cv_func_matherr_type=no) |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2176 ]) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
2177 if test $octave_cv_func_matherr_type = yes; then |
15143
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2178 AC_DEFINE(EXCEPTION_IN_MATH, 1, |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2179 [Define to 1 if math.h declares struct exception for matherr().]) |
2488 | 2180 fi |
15143
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2181 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2182 ## Signal stuff. |
869 | 2183 |
5844 | 2184 AC_CHECK_DECLS([sys_siglist], [], [], |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2185 [[#include <signal.h> |
5844 | 2186 /* NetBSD declares sys_siglist in unistd.h. */ |
2187 #if HAVE_UNISTD_H | |
2188 # include <unistd.h> | |
2189 #endif | |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2190 ]]) |
2633 | 2191 |
16012
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2192 ### Need to disable building documentation if either gnuplot or |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2193 ### makeinfo are missing. Skip this warning if building docs was |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2194 ### disabled with a configure option. |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2195 |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2196 if test -n "$DOCDIR"; then |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2197 if test -n "$warn_gnuplot"; then |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2198 DOCDIR= |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2199 warn_docs_gnuplot="building documentation disabled because gnuplot was not found; make dist will fail" |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2200 OCTAVE_CONFIGURE_WARNING([warn_docs_gnuplot]) |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2201 fi |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2202 if test -n "$warn_makeinfo"; then |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2203 DOCDIR= |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2204 warn_docs_makeinfo="building documentation disabled because makeinfo was not found; make dist will fail" |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2205 OCTAVE_CONFIGURE_WARNING([warn_docs_makeinfo]) |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2206 fi |
14579
4dc85c4f151b
Disable building documentation if gnuplot not found
Mike Miller <mtmiller@ieee.org>
parents:
14561
diff
changeset
|
2207 fi |
4dc85c4f151b
Disable building documentation if gnuplot not found
Mike Miller <mtmiller@ieee.org>
parents:
14561
diff
changeset
|
2208 AM_CONDITIONAL([AMCOND_BUILD_DOCS], [test -n "$DOCDIR"]) |
2032 | 2209 |
4645 | 2210 ### Maybe add -Wall, -W, and -Wshadow to compiler flags now that we're |
4587 | 2211 ### done feature testing. |
869 | 2212 |
11514
a1386fab2a02
configure.ac: eliminate some code duplication when checking for extra compiler flags
John W. Eaton <jwe@octave.org>
parents:
11513
diff
changeset
|
2213 GCC_EXTRA_FLAGS="-Wall -W -Wshadow -Wformat -Wpointer-arith -Wmissing-prototypes -Wstrict-prototypes -Wwrite-strings -Wcast-align -Wcast-qual" |
a1386fab2a02
configure.ac: eliminate some code duplication when checking for extra compiler flags
John W. Eaton <jwe@octave.org>
parents:
11513
diff
changeset
|
2214 |
a1386fab2a02
configure.ac: eliminate some code duplication when checking for extra compiler flags
John W. Eaton <jwe@octave.org>
parents:
11513
diff
changeset
|
2215 GXX_EXTRA_FLAGS="-Wall -W -Wshadow -Wold-style-cast -Wformat -Wpointer-arith -Wwrite-strings -Wcast-align -Wcast-qual" |
a1386fab2a02
configure.ac: eliminate some code duplication when checking for extra compiler flags
John W. Eaton <jwe@octave.org>
parents:
11513
diff
changeset
|
2216 |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2217 try_extra_warning_flags=yes |
11514
a1386fab2a02
configure.ac: eliminate some code duplication when checking for extra compiler flags
John W. Eaton <jwe@octave.org>
parents:
11513
diff
changeset
|
2218 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2219 AC_ARG_ENABLE([extra-warning-flags], |
15238
c4779a180134
avoid confusing --disable-foo (default is yes) configure help messages
John W. Eaton <jwe@octave.org>
parents:
15237
diff
changeset
|
2220 [AS_HELP_STRING([--disable-extra-warning-flags], |
c4779a180134
avoid confusing --disable-foo (default is yes) configure help messages
John W. Eaton <jwe@octave.org>
parents:
15237
diff
changeset
|
2221 [don't add -Wall, -W, -Wshadow, and -Wold-style-cast options to CFLAGS and CXXFLAGS])], |
8938
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2222 [if test "$enableval" = no; then |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2223 try_extra_warning_flags=no |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2224 fi], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2225 []) |
8938
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2226 |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2227 if test $try_extra_warning_flags = yes; then |
11514
a1386fab2a02
configure.ac: eliminate some code duplication when checking for extra compiler flags
John W. Eaton <jwe@octave.org>
parents:
11513
diff
changeset
|
2228 for flag in $GCC_EXTRA_FLAGS; do |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2229 OCTAVE_CC_FLAG([$flag], [ |
11514
a1386fab2a02
configure.ac: eliminate some code duplication when checking for extra compiler flags
John W. Eaton <jwe@octave.org>
parents:
11513
diff
changeset
|
2230 WARN_CFLAGS="$WARN_CFLAGS $flag"; |
a1386fab2a02
configure.ac: eliminate some code duplication when checking for extra compiler flags
John W. Eaton <jwe@octave.org>
parents:
11513
diff
changeset
|
2231 AC_MSG_RESULT([adding $flag to WARN_CFLAGS])]) |
a1386fab2a02
configure.ac: eliminate some code duplication when checking for extra compiler flags
John W. Eaton <jwe@octave.org>
parents:
11513
diff
changeset
|
2232 done |
a1386fab2a02
configure.ac: eliminate some code duplication when checking for extra compiler flags
John W. Eaton <jwe@octave.org>
parents:
11513
diff
changeset
|
2233 for flag in $GXX_EXTRA_FLAGS; do |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2234 OCTAVE_CXX_FLAG([$flag], [ |
11514
a1386fab2a02
configure.ac: eliminate some code duplication when checking for extra compiler flags
John W. Eaton <jwe@octave.org>
parents:
11513
diff
changeset
|
2235 WARN_CXXFLAGS="$WARN_CXXFLAGS $flag"; |
a1386fab2a02
configure.ac: eliminate some code duplication when checking for extra compiler flags
John W. Eaton <jwe@octave.org>
parents:
11513
diff
changeset
|
2236 AC_MSG_RESULT([adding $flag to WARN_CXXFLAGS])]) |
a1386fab2a02
configure.ac: eliminate some code duplication when checking for extra compiler flags
John W. Eaton <jwe@octave.org>
parents:
11513
diff
changeset
|
2237 done |
405 | 2238 fi |
869 | 2239 |
11513
a2289858dcb2
more warning flags for GCC if configured with --enable-extra-warning-flags (on by default)
John W. Eaton <jwe@octave.org>
parents:
11511
diff
changeset
|
2240 GCC_STRICT_FLAGS="-Wconversion" |
2813 | 2241 |
11513
a2289858dcb2
more warning flags for GCC if configured with --enable-extra-warning-flags (on by default)
John W. Eaton <jwe@octave.org>
parents:
11511
diff
changeset
|
2242 GXX_STRICT_FLAGS="-Wconversion -Weffc++" |
8938
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2243 |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2244 try_strict_warning_flags=no |
8938
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2245 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2246 AC_ARG_ENABLE([strict-warning-flags], |
8938
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2247 [AS_HELP_STRING([--enable-strict-warning-flags], |
15238
c4779a180134
avoid confusing --disable-foo (default is yes) configure help messages
John W. Eaton <jwe@octave.org>
parents:
15237
diff
changeset
|
2248 [add extra strict warning options to CFLAGS and CXXFLAGS])], |
8938
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2249 [if test "$enableval" = yes; then |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2250 try_strict_warning_flags=yes |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2251 fi], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2252 []) |
2813 | 2253 |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2254 if test $try_strict_warning_flags = yes; then |
8938
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2255 for flag in $GCC_STRICT_FLAGS; do |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2256 OCTAVE_CC_FLAG([$flag], [ |
8938
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2257 WARN_CFLAGS="$WARN_CFLAGS $flag"; |
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2258 AC_MSG_RESULT([adding $flag to WARN_CFLAGS])]) |
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2259 done |
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2260 for flag in $GXX_STRICT_FLAGS; do |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2261 OCTAVE_CXX_FLAG([$flag], [ |
8938
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2262 WARN_CXXFLAGS="$WARN_CXXFLAGS $flag"; |
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2263 AC_MSG_RESULT([adding $flag to WARN_CXXFLAGS])]) |
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2264 done |
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2265 fi |
2813 | 2266 |
4626 | 2267 AC_SUBST(WARN_CFLAGS) |
2268 AC_SUBST(WARN_CXXFLAGS) | |
2269 | |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2270 ### Check for Java. |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2271 |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2272 build_java=yes |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2273 AC_ARG_ENABLE([java], |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2274 [AS_HELP_STRING([--disable-java], |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2275 [disable Java interface])], |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2276 [if test "$enableval" = no; then |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2277 build_java=no |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2278 fi], |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2279 []) |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2280 |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2281 AC_ARG_WITH([java-homedir], |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2282 [AS_HELP_STRING([--with-java-homedir=DIR], |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2283 [Java JDK directory in DIR])], |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2284 [JAVA_HOMEDIR="$withval"]) |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2285 |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2286 AC_ARG_WITH([java-includedir], |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2287 [AS_HELP_STRING([--with-java-includedir=DIR], |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2288 [look for java include file <jni.h> in DIR])], |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2289 [JAVA_CPPFLAGS="$withval"], [JAVA_CPPFLAGS=""]) |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2290 |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2291 AC_ARG_WITH([java-libdir], |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2292 [AS_HELP_STRING([--with-java-libdir=DIR], |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2293 [look for java library libjvm in DIR])], |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2294 [JAVA_LDPATH="$withval"], [JAVA_LDPATH=""]) |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2295 |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2296 ## Grab JAVA_HOME from environment variable if it exists |
15761
9f3656ada658
configure.ac: Add warning message if JAVA_HOME variable is not set.
Rik <rik@octave.org>
parents:
15756
diff
changeset
|
2297 AC_ARG_VAR([JAVA_HOME], [path to Java JDK installation]) |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2298 ## But --with-java-homedir option overrides environment variable |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2299 if test -n "$JAVA_HOMEDIR"; then |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2300 JAVA_HOME=$JAVA_HOMEDIR |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2301 fi |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2302 JAVA= |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2303 JAVAC= |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2304 JAR= |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2305 JAVA_LIBS= |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2306 |
15780
f25101b1e37f
configure.ac: Use build_java as internal script variable rather than HAVE_JAVA.
Rik <rik@octave.org>
parents:
15779
diff
changeset
|
2307 ## Fake loop so that "break" can be used to skip code blocks. |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2308 while test $build_java = yes |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2309 do |
15780
f25101b1e37f
configure.ac: Use build_java as internal script variable rather than HAVE_JAVA.
Rik <rik@octave.org>
parents:
15779
diff
changeset
|
2310 ## Unset build_java. Variable is set only if all configuration tests pass. |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2311 build_java=no |
15780
f25101b1e37f
configure.ac: Use build_java as internal script variable rather than HAVE_JAVA.
Rik <rik@octave.org>
parents:
15779
diff
changeset
|
2312 |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2313 ## Warn if JAVA_HOME is unset. It is *strongly* advised to specify JAVA_HOME. |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2314 if test -z "$JAVA_HOME"; then |
15761
9f3656ada658
configure.ac: Add warning message if JAVA_HOME variable is not set.
Rik <rik@octave.org>
parents:
15756
diff
changeset
|
2315 AC_MSG_WARN([JAVA_HOME environment variable not initialized.]) |
9f3656ada658
configure.ac: Add warning message if JAVA_HOME variable is not set.
Rik <rik@octave.org>
parents:
15756
diff
changeset
|
2316 AC_MSG_WARN([Auto-detection will proceed but is unreliable.]) |
9f3656ada658
configure.ac: Add warning message if JAVA_HOME variable is not set.
Rik <rik@octave.org>
parents:
15756
diff
changeset
|
2317 fi |
9f3656ada658
configure.ac: Add warning message if JAVA_HOME variable is not set.
Rik <rik@octave.org>
parents:
15756
diff
changeset
|
2318 |
15780
f25101b1e37f
configure.ac: Use build_java as internal script variable rather than HAVE_JAVA.
Rik <rik@octave.org>
parents:
15779
diff
changeset
|
2319 ## Search for a viable Java executable. |
15761
9f3656ada658
configure.ac: Add warning message if JAVA_HOME variable is not set.
Rik <rik@octave.org>
parents:
15756
diff
changeset
|
2320 if test -z "$JAVA_HOME"; then |
15836
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2321 JAVA_PATH="$PATH" |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2322 else |
15836
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2323 JAVA_PATH="${JAVA_HOME}$PATH_SEPARATOR${JAVA_HOME}/jre/bin$PATH_SEPARATOR${JAVA_HOME}/bin$PATH_SEPARATOR${JAVA_HOME}/../bin$PATH_SEPARATOR${PATH}" |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2324 fi |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2325 AC_PATH_PROG(JAVA, java, [], [$JAVA_PATH]) |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2326 |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2327 if test -z "$JAVA"; then |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2328 AC_MSG_WARN([No Java executable found. Octave will not be able to call Java methods.]) |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2329 break |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2330 fi |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2331 |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2332 if test -z "$JAVA_HOME"; then |
15780
f25101b1e37f
configure.ac: Use build_java as internal script variable rather than HAVE_JAVA.
Rik <rik@octave.org>
parents:
15779
diff
changeset
|
2333 ## Find JAVA_HOME for JRE by running java and querying properties. |
15846
605488d19cb3
configure.ac: Avoid non-portable sh technique of double-quoted, backtick expressions.
Rik <rik@octave.org>
parents:
15839
diff
changeset
|
2334 JAVA_TMP_HOME=`"$JAVA" -classpath ${srcdir}/build-aux OctJavaQry JAVA_HOME` |
15780
f25101b1e37f
configure.ac: Use build_java as internal script variable rather than HAVE_JAVA.
Rik <rik@octave.org>
parents:
15779
diff
changeset
|
2335 ## Strip directory back to top-level installation dir (JAVA_HOME for JDK). |
15846
605488d19cb3
configure.ac: Avoid non-portable sh technique of double-quoted, backtick expressions.
Rik <rik@octave.org>
parents:
15839
diff
changeset
|
2336 JAVA_HOME=`echo $JAVA_TMP_HOME | sed -e 's|[[/\\]]bin[[/\\]]\?$||' | sed -e 's|[[/\\]]jre[[/\\]]\?$||'` |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2337 fi |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2338 |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2339 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2340 mingw* | msdosmsvc) |
15846
605488d19cb3
configure.ac: Avoid non-portable sh technique of double-quoted, backtick expressions.
Rik <rik@octave.org>
parents:
15839
diff
changeset
|
2341 ## Under Win32 platform, we want JAVA_HOME to be in MSYS format, that is |
605488d19cb3
configure.ac: Avoid non-portable sh technique of double-quoted, backtick expressions.
Rik <rik@octave.org>
parents:
15839
diff
changeset
|
2342 ## without colon and backslashes, as it is also used as path separator. |
605488d19cb3
configure.ac: Avoid non-portable sh technique of double-quoted, backtick expressions.
Rik <rik@octave.org>
parents:
15839
diff
changeset
|
2343 ## Use quoted paths as Java may be installed in a path with whitespaces |
605488d19cb3
configure.ac: Avoid non-portable sh technique of double-quoted, backtick expressions.
Rik <rik@octave.org>
parents:
15839
diff
changeset
|
2344 ## (e.g. C:\Program Files\Java\...). |
15836
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2345 if test -n "$JAVA_HOME"; then |
15846
605488d19cb3
configure.ac: Avoid non-portable sh technique of double-quoted, backtick expressions.
Rik <rik@octave.org>
parents:
15839
diff
changeset
|
2346 JAVA_HOME=`cd "$JAVA_HOME" && pwd` |
605488d19cb3
configure.ac: Avoid non-portable sh technique of double-quoted, backtick expressions.
Rik <rik@octave.org>
parents:
15839
diff
changeset
|
2347 ## Maybe this will be useful in the future, as native Java won't |
605488d19cb3
configure.ac: Avoid non-portable sh technique of double-quoted, backtick expressions.
Rik <rik@octave.org>
parents:
15839
diff
changeset
|
2348 ## understand MSYS paths. |
605488d19cb3
configure.ac: Avoid non-portable sh technique of double-quoted, backtick expressions.
Rik <rik@octave.org>
parents:
15839
diff
changeset
|
2349 JAVA_HOME_NATIVE=`cd "$JAVA_HOME" && pwd -W` |
15836
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2350 fi |
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2351 ;; |
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2352 *) |
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2353 JAVA_HOME_NATIVE="$JAVA_HOME" |
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2354 ;; |
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2355 esac |
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2356 |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2357 ## Amend search path for JAVAC and JAR. |
15836
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2358 if test -z "$JAVA_HOME"; then |
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2359 JAVA_PATH="$PATH" |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2360 else |
15836
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2361 JAVA_PATH="${JAVA_HOME}$PATH_SEPARATOR${JAVA_HOME}/bin$PATH_SEPARATOR${JAVA_HOME}/../bin$PATH_SEPARATOR${PATH}" |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2362 fi |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2363 |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2364 AC_PATH_PROG(JAVAC, javac, [], [$JAVA_PATH]) |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2365 AC_PATH_PROG(JAR, jar, [], [$JAVA_PATH]) |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2366 |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2367 if test -z "$JAVAC" || test -z "$JAR"; then |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2368 AC_MSG_WARN([No javac compiler or jar executable found. Octave will not be able to call Java methods.]) |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2369 break |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2370 fi |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2371 |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2372 ## Check Java version is recent enough. |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2373 AC_MSG_CHECKING([for Java version]) |
15839
9a210f7fe62e
Fix incorrect shell double-quoting syntax.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15836
diff
changeset
|
2374 java_version=[`"$JAVA" -version 2>&1 | sed -n -e 's/^java version[^0-9"]*"\([^"]*\)"/\1/p'`] |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2375 AC_MSG_RESULT([$java_version]) |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2376 java_major=[`echo $java_version | sed -e 's/^\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*$/\1/'`] |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2377 java_minor=[`echo $java_version | sed -e 's/^\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*$/\2/'`] |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2378 if test $java_major -ge 1 && test $java_minor -ge 5; then |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2379 : # Version is ok. Do nothing. |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2380 else |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2381 AC_MSG_WARN([Java version is too old (< 1.5). Octave will not be able to call Java methods.]) |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2382 break |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2383 fi |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2384 |
15846
605488d19cb3
configure.ac: Avoid non-portable sh technique of double-quoted, backtick expressions.
Rik <rik@octave.org>
parents:
15839
diff
changeset
|
2385 ## At this point Win32/MSVC systems have enough configuration data. We |
605488d19cb3
configure.ac: Avoid non-portable sh technique of double-quoted, backtick expressions.
Rik <rik@octave.org>
parents:
15839
diff
changeset
|
2386 ## assume that all appropriate variables (e.g. INCLUDE and LIB) already have |
605488d19cb3
configure.ac: Avoid non-portable sh technique of double-quoted, backtick expressions.
Rik <rik@octave.org>
parents:
15839
diff
changeset
|
2387 ## the required paths to compile and link against JDK. |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2388 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2389 msdosmsvc) |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2390 build_java=yes |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2391 JAVA_LIBS=-ladvapi32 |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2392 AC_DEFINE(HAVE_JAVA, 1, |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2393 [Define to 1 if Java is available and is at least version 1.5]) |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2394 break |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2395 ;; |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2396 mingw*) |
15854
98f6abe01b5a
configure.ac: Remove unnecessary double quotes in test expression.
Rik <rik@octave.org>
parents:
15852
diff
changeset
|
2397 if test $have_msvc = yes; then |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2398 build_java=yes |
15836
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2399 JAVA_LIBS=-ladvapi32 |
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2400 AC_DEFINE(HAVE_JAVA, 1, |
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2401 [Define to 1 if Java is available and is at least version 1.5]) |
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2402 break |
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2403 fi |
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2404 ;; |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2405 esac |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2406 |
15777
b8bcb2c7f3e8
configure.ac: Search for jvm.dll on MingW/Cygwin platforms for Java.
Rik <rik@octave.org>
parents:
15769
diff
changeset
|
2407 ## Determine which library file name to search for. |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2408 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2409 darwin*) |
15777
b8bcb2c7f3e8
configure.ac: Search for jvm.dll on MingW/Cygwin platforms for Java.
Rik <rik@octave.org>
parents:
15769
diff
changeset
|
2410 jvmlib=libjvm.dylib |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2411 ;; |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2412 mingw* | cygwin*) |
15777
b8bcb2c7f3e8
configure.ac: Search for jvm.dll on MingW/Cygwin platforms for Java.
Rik <rik@octave.org>
parents:
15769
diff
changeset
|
2413 jvmlib=jvm.dll |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2414 ;; |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2415 *) |
15777
b8bcb2c7f3e8
configure.ac: Search for jvm.dll on MingW/Cygwin platforms for Java.
Rik <rik@octave.org>
parents:
15769
diff
changeset
|
2416 jvmlib=libjvm.so |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2417 ;; |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2418 esac |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2419 |
15777
b8bcb2c7f3e8
configure.ac: Search for jvm.dll on MingW/Cygwin platforms for Java.
Rik <rik@octave.org>
parents:
15769
diff
changeset
|
2420 AC_MSG_CHECKING([for $jvmlib]) |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2421 |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2422 if test -z "$JAVA_LDPATH"; then |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2423 ## Run Java to try and determine library path to libjvm.so. |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2424 JAVA_TMP_LDPATH=`$JAVA -classpath ${srcdir}/build-aux OctJavaQry JAVA_LDPATH` |
15777
b8bcb2c7f3e8
configure.ac: Search for jvm.dll on MingW/Cygwin platforms for Java.
Rik <rik@octave.org>
parents:
15769
diff
changeset
|
2425 JAVA_TMP_LDPATH=`echo $JAVA_TMP_LDPATH | sed -e "s/${PATH_SEPARATOR}/ /g"` |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2426 for dir in $JAVA_TMP_LDPATH; do |
15777
b8bcb2c7f3e8
configure.ac: Search for jvm.dll on MingW/Cygwin platforms for Java.
Rik <rik@octave.org>
parents:
15769
diff
changeset
|
2427 if test -f "$dir/$jvmlib"; then |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2428 JAVA_LDPATH=$dir |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2429 break |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2430 fi |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2431 done |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2432 fi |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2433 |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2434 if test -z "$JAVA_LDPATH"; then |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2435 ## Nothing found. Try Java again using bootpath argument. |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2436 JAVA_TMP_LDPATH=`$JAVA -classpath ${srcdir}/build-aux OctJavaQry JAVA_BOOTPATH` |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2437 JAVA_TMP_LDPATH="${JAVA_TMP_LDPATH} ${JAVA_TMP_LDPATH}/client ${JAVA_TMP_LDPATH}/server" |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2438 for dir in $JAVA_TMP_LDPATH; do |
15777
b8bcb2c7f3e8
configure.ac: Search for jvm.dll on MingW/Cygwin platforms for Java.
Rik <rik@octave.org>
parents:
15769
diff
changeset
|
2439 if test -f "$dir/$jvmlib"; then |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2440 JAVA_LDPATH=$dir |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2441 break |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2442 fi |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2443 done |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2444 fi |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2445 |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2446 if test -z "$JAVA_LDPATH"; then |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2447 ## Java failed to find it's own library path. Guess wildly. |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2448 JAVA_TMP_LDPATH=`ls -d $JAVA_HOME/jre/lib/*/client` |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2449 JAVA_TMP_LDPATH="${JAVA_TMP_LDPATH} `ls -d $JAVA_HOME/jre/lib/*/server`" |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2450 ## Add some paths that might work on Macs. |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2451 JAVA_TMP_LDPATH="${JAVA_TMP_LDPATH} ${JAVA_HOME}/../Libraries ${JAVA_HOME}/Libraries" |
15777
b8bcb2c7f3e8
configure.ac: Search for jvm.dll on MingW/Cygwin platforms for Java.
Rik <rik@octave.org>
parents:
15769
diff
changeset
|
2452 ## Add some paths that might work on MinGW |
b8bcb2c7f3e8
configure.ac: Search for jvm.dll on MingW/Cygwin platforms for Java.
Rik <rik@octave.org>
parents:
15769
diff
changeset
|
2453 JAVA_TMP_LDPATH="${JAVA_TMP_LDPATH} ${JAVA_HOME}/bin/client ${JAVA_HOME}/bin/server" |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2454 for dir in $JAVA_TMP_LDPATH; do |
15777
b8bcb2c7f3e8
configure.ac: Search for jvm.dll on MingW/Cygwin platforms for Java.
Rik <rik@octave.org>
parents:
15769
diff
changeset
|
2455 if test -f "$dir/$jvmlib"; then |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2456 JAVA_LDPATH=$dir |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2457 break |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2458 fi |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2459 done |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2460 fi |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2461 |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2462 ## Verify value passed in option --with-java-libdir |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2463 if test -n "$JAVA_LDPATH"; then |
15777
b8bcb2c7f3e8
configure.ac: Search for jvm.dll on MingW/Cygwin platforms for Java.
Rik <rik@octave.org>
parents:
15769
diff
changeset
|
2464 if test -f "${JAVA_LDPATH}/$jvmlib"; then |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2465 : # libjvm found |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2466 else |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2467 JAVA_LDPATH="" |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2468 fi |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2469 fi |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2470 |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2471 if test -z "$JAVA_LDPATH"; then |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2472 AC_MSG_RESULT([not found]) |
15777
b8bcb2c7f3e8
configure.ac: Search for jvm.dll on MingW/Cygwin platforms for Java.
Rik <rik@octave.org>
parents:
15769
diff
changeset
|
2473 AC_MSG_WARN([Library $jvmlib not found. Octave will not be able to call Java methods.]) |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2474 break |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2475 else |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2476 AC_MSG_RESULT([$JAVA_LDPATH]) |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2477 fi |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2478 |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2479 AC_MSG_CHECKING([for include file <jni.h>]) |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2480 |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2481 ## Java and JVM found. Set up flags. |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2482 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2483 darwin*) |
15918
18d1bd2596bf
Sneak the MacOS X "-framework JavaVM" into mkoctfile via LDFLAGS
Ben Abbott <bpabbott@mac.com>
parents:
15905
diff
changeset
|
2484 ## Sneak the -framework flag into mkoctfile via LDFLAGS |
15919
80612fee1110
Fix typo from 18d1bd2596bf (LFLAGS -> LDFLAGS)
Ben Abbott <bpabbott@mac.com>
parents:
15918
diff
changeset
|
2485 LDFLAGS="$LDFLAGS -framework JavaVM" |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2486 ## According to: http://developer.apple.com/unix/crossplatform.html |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2487 ## one must explicitly set the include path. |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2488 ## Unfortunately, the include path keeps moving around. |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2489 if test -n "$JAVA_CPPFLAGS"; then |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2490 JAVA_CPPFLAGS="-I${JAVA_CPPFLAGS}" |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2491 else |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2492 JAVA_CPPFLAGS="-I${JAVA_HOME}/include -I/System/Library/Frameworks/JavaVM.framework/Home/include -I/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Headers -I/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers" |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2493 fi |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2494 JAVA_LIBS="-framework JavaVM" |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2495 ;; |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2496 mingw* | cygwin*) |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2497 if test -n "$JAVA_CPPFLAGS"; then |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2498 JAVA_CPPFLAGS="-I${JAVA_CPPFLAGS}/include -I${JAVA_CPPFLAGS}/include/win32" |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2499 else |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2500 JAVA_CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/win32" |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2501 fi |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2502 JAVA_LIBS=-ladvapi32 |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2503 ;; |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2504 *) |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2505 if test -n "$JAVA_CPPFLAGS"; then |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2506 JAVA_CPPFLAGS="-I${JAVA_CPPFLAGS}/include -I${JAVA_CPPFLAGS}/include/linux" |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2507 else |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2508 JAVA_CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux" |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2509 fi |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2510 ;; |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2511 esac |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2512 |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2513 ## Verify jni.h include file exists. |
15846
605488d19cb3
configure.ac: Avoid non-portable sh technique of double-quoted, backtick expressions.
Rik <rik@octave.org>
parents:
15839
diff
changeset
|
2514 JNI_PATH=`echo $JAVA_CPPFLAGS | sed -e 's/-I//g'` |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2515 have_jni=no |
15846
605488d19cb3
configure.ac: Avoid non-portable sh technique of double-quoted, backtick expressions.
Rik <rik@octave.org>
parents:
15839
diff
changeset
|
2516 for dir in $JNI_PATH; do |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2517 if test -f "${dir}/jni.h"; then have_jni=yes; break; fi |
15846
605488d19cb3
configure.ac: Avoid non-portable sh technique of double-quoted, backtick expressions.
Rik <rik@octave.org>
parents:
15839
diff
changeset
|
2518 done |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2519 if test $have_jni = yes; then |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2520 AC_MSG_RESULT([$dir]) |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2521 else |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2522 AC_MSG_RESULT([not found]) |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2523 AC_MSG_WARN([Include file <jni.h> not found. Octave will not be able to call Java methods.]) |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2524 break |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2525 fi |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2526 |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2527 ## Passed all configuration tests. A workable Java installation was found. |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2528 build_java=yes |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2529 AC_DEFINE(HAVE_JAVA, 1, |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2530 [Define to 1 if Java is available and is at least version 1.5]) |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2531 break |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2532 done |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2533 |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2534 AM_CONDITIONAL([AMCOND_HAVE_JAVA], [test $build_java = yes]) |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2535 AC_SUBST(JAVA) |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2536 AC_SUBST(JAVAC) |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2537 AC_SUBST(JAR) |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2538 AC_SUBST(JAVA_CPPFLAGS) |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2539 AC_SUBST(JAVA_LIBS) |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2540 AC_DEFINE_UNQUOTED([JAVA_HOME], ["$JAVA_HOME"], [Java home (top-level installation dir)]) |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2541 AC_DEFINE_UNQUOTED([JAVA_LDPATH], ["$JAVA_LDPATH"], [Java library path (libjvm)]) |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2542 |
15110
4f6e058e4161
Integrate GUI building with regular octave build system.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15093
diff
changeset
|
2543 ### GUI/Qt related tests. |
4f6e058e4161
Integrate GUI building with regular octave build system.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15093
diff
changeset
|
2544 |
15596
5f031158c693
Use pkg-config to discover Qt (pkg-config is already a requirement anyway).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15538
diff
changeset
|
2545 QT_CPPFLAGS= |
5f031158c693
Use pkg-config to discover Qt (pkg-config is already a requirement anyway).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15538
diff
changeset
|
2546 QT_LDFLAGS= |
5f031158c693
Use pkg-config to discover Qt (pkg-config is already a requirement anyway).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15538
diff
changeset
|
2547 QT_LIBS= |
15297
2f0b74cf8b4d
configure.ac: Conditionally build GUI using same construct as conditionally building DOCs.
Rik <rik@octave.org>
parents:
15296
diff
changeset
|
2548 win32_terminal=no |
15873
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2549 build_gui=yes |
15297
2f0b74cf8b4d
configure.ac: Conditionally build GUI using same construct as conditionally building DOCs.
Rik <rik@octave.org>
parents:
15296
diff
changeset
|
2550 GUIDIR=libgui |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2551 AC_ARG_ENABLE([gui], |
15238
c4779a180134
avoid confusing --disable-foo (default is yes) configure help messages
John W. Eaton <jwe@octave.org>
parents:
15237
diff
changeset
|
2552 [AS_HELP_STRING([--disable-gui], [don't build the GUI])], |
15873
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2553 [if test "$enableval" = no; then build_gui=no; fi], []) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2554 |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2555 if test $build_gui = yes; then |
15296
f19d0bce85da
build: Add check for Qt libraries to configure.ac.
Rik <rik@octave.org>
parents:
15295
diff
changeset
|
2556 ## Check for Qt libraries |
f19d0bce85da
build: Add check for Qt libraries to configure.ac.
Rik <rik@octave.org>
parents:
15295
diff
changeset
|
2557 PKG_CHECK_MODULES(QT, [QtCore, QtGui, QtNetwork], |
f19d0bce85da
build: Add check for Qt libraries to configure.ac.
Rik <rik@octave.org>
parents:
15295
diff
changeset
|
2558 [], |
15873
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2559 [AC_MSG_WARN([Qt libraries not found -- disabling GUI]) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2560 build_gui=no]) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2561 |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2562 if test $build_gui = yes; then |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2563 ## Retrieve Qt compilation and linker flags |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2564 QT_CPPFLAGS="`$PKG_CONFIG --cflags-only-I QtCore QtGui QtNetwork`" |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2565 QT_LDFLAGS="`$PKG_CONFIG --libs-only-L QtCore QtGui QtNetwork`" |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2566 QT_LIBS="`$PKG_CONFIG --libs-only-l QtCore QtGui QtNetwork`" |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2567 |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2568 ## Check for Qt4 |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2569 if ! `$PKG_CONFIG --atleast-version=4.0.0 QtCore`; then |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2570 AC_MSG_WARN([Qt >= 4.0.0 not found -- disabling GUI]) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2571 build_gui=no |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2572 fi |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2573 fi |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2574 |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2575 if test $build_gui = yes; then |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2576 AC_CHECK_PROGS(MOC, [moc-qt5 moc-qt4 moc]) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2577 AC_CHECK_PROGS(UIC, [uic-qt5 uic-qt4 uic]) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2578 AC_CHECK_PROGS(RCC, [rcc]) |
16244
b74c4e967f76
gui: remove binary language files from repo and generate them during build
Torsten <ttl@justmail.de>
parents:
16171
diff
changeset
|
2579 AC_CHECK_PROGS(LRELEASE, [lrelease]) |
b74c4e967f76
gui: remove binary language files from repo and generate them during build
Torsten <ttl@justmail.de>
parents:
16171
diff
changeset
|
2580 if test -n "$MOC" && test -n "$UIC" && test -n "$RCC" && test -n "$LRELEASE"; then |
15873
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2581 AC_DEFINE(HAVE_QT, 1, |
16244
b74c4e967f76
gui: remove binary language files from repo and generate them during build
Torsten <ttl@justmail.de>
parents:
16171
diff
changeset
|
2582 [Define to 1 if Qt is available (libraries, developer header files, utility programs (moc, uic, rcc, and lrelease))]) |
15873
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2583 else |
16244
b74c4e967f76
gui: remove binary language files from repo and generate them during build
Torsten <ttl@justmail.de>
parents:
16171
diff
changeset
|
2584 AC_MSG_WARN([Qt utility programs moc, uic, rcc, and lrelease not found -- disabling GUI]) |
15873
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2585 build_gui=no |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2586 fi |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2587 fi |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2588 |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2589 if test $build_gui = yes; then |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2590 OCTAVE_CHECK_FUNC_SETPLACEHOLDERTEXT |
15298
704ab1b4c369
build: Properly choose qmake if Qt3 and Qt4 are installed (Bug #37101)
Rik <rik@octave.org>
parents:
15297
diff
changeset
|
2591 fi |
15292
637e3b7d6a56
configure.ac: Add check for Qscintilla library before building GUI.
Rik <rik@octave.org>
parents:
15291
diff
changeset
|
2592 |
15873
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2593 if test $build_gui = yes; then |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2594 ## Check for Qscintilla library which is used in the GUI editor. |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2595 AC_CACHE_CHECK([whether Qscintilla library is installed], |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2596 [octave_cv_lib_qscintilla], |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2597 [save_CPPFLAGS="$CPPFLAGS" |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2598 save_LDFLAGS="$LDFLAGS" |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2599 save_LIBS="$LIBS" |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2600 CPPFLAGS="$QT_CPPFLAGS $CPPFLAGS" |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2601 LDFLAGS="$QT_LDFLAGS $LDFLAGS" |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2602 LIBS="$QT_LIBS -lqscintilla2" |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2603 AC_LANG_PUSH(C++) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2604 AC_LINK_IFELSE([AC_LANG_PROGRAM([[ |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2605 #include <Qsci/qscilexersql.h> |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2606 ]], [[ |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2607 QsciLexerSQL sqlLexer(0); |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2608 ]])], |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2609 octave_cv_lib_qscintilla=yes, |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2610 octave_cv_lib_qscintilla=no) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2611 CPPFLAGS="$save_CPPFLAGS" |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2612 LDFLAGS="$save_LDFLAGS" |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2613 LIBS="$save_LIBS" |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2614 AC_LANG_POP([C++]) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2615 ]) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2616 if test $octave_cv_lib_qscintilla = no; then |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2617 AC_MSG_WARN([Qscintilla library not found -- disabling built-in GUI editor]) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2618 else |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2619 ## Let's assume Qscintilla library is at the same location as |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2620 ## other regular Qt libraries. |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2621 QT_LIBS="$QT_LIBS -lqscintilla2" |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2622 OCTAVE_CHECK_FUNC_FINDFIRST_MODERN |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2623 AC_DEFINE(HAVE_QSCINTILLA, 1, |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2624 [Define to 1 if the QScintilla library and header files are available]) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2625 fi |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2626 |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2627 AC_CHECK_FUNCS([setlocale], [], |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2628 [AC_MSG_WARN([setlocale not found -- disabling GUI]) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2629 build_gui=no]) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2630 |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2631 if test $build_gui = yes; then |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2632 case $host_os in |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2633 mingw* | msdosmsvc*) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2634 AC_CHECK_FUNCS([setvbuf], [win32_terminal=yes], |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2635 [AC_MSG_WARN([setvbuf not found -- disabling GUI]) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2636 build_gui=no]) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2637 ;; |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2638 *) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2639 AC_CHECK_HEADERS([pty.h libutil.h util.h]) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2640 AC_SEARCH_LIBS([openpty], [util], |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2641 [AC_DEFINE(HAVE_OPENPTY, [], [Define whether openpty exists])]) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2642 AC_CHECK_FUNCS([chmod chown ftruncate mmap munmap], [], |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2643 [AC_MSG_ERROR([At least one of chmod, chown, ftruncate, mmap, and munmap not found -- disabling GUI]) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2644 build_gui=no]) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2645 ;; |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2646 esac |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2647 fi |
15117
3735a0e783cb
more tweaks for the gui build
John W. Eaton <jwe@octave.org>
parents:
15116
diff
changeset
|
2648 fi |
15873
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2649 fi |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2650 |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2651 if test $build_gui = no; then |
15297
2f0b74cf8b4d
configure.ac: Conditionally build GUI using same construct as conditionally building DOCs.
Rik <rik@octave.org>
parents:
15296
diff
changeset
|
2652 ## GUI disabled. Eliminate building GUIDIR directory |
2f0b74cf8b4d
configure.ac: Conditionally build GUI using same construct as conditionally building DOCs.
Rik <rik@octave.org>
parents:
15296
diff
changeset
|
2653 GUIDIR= |
15117
3735a0e783cb
more tweaks for the gui build
John W. Eaton <jwe@octave.org>
parents:
15116
diff
changeset
|
2654 fi |
15873
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2655 AM_CONDITIONAL([AMCOND_BUILD_GUI], [test $build_gui = yes]) |
16296
ef39f8b1c5c8
configure.ac: Unconditionally define AMCOND_HAVE_QSCINTILLA.
Rik <rik@octave.org>
parents:
16294
diff
changeset
|
2656 AM_CONDITIONAL([AMCOND_HAVE_QSCINTILLA], [test $octave_cv_lib_qscintilla = yes]) |
15156
141b0b108292
allow building without gui to work
John W. Eaton <jwe@octave.org>
parents:
15150
diff
changeset
|
2657 AM_CONDITIONAL([WIN32_TERMINAL], [test $win32_terminal = yes]) |
15596
5f031158c693
Use pkg-config to discover Qt (pkg-config is already a requirement anyway).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15538
diff
changeset
|
2658 AC_SUBST(QT_CPPFLAGS) |
5f031158c693
Use pkg-config to discover Qt (pkg-config is already a requirement anyway).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15538
diff
changeset
|
2659 AC_SUBST(QT_LDFLAGS) |
5f031158c693
Use pkg-config to discover Qt (pkg-config is already a requirement anyway).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15538
diff
changeset
|
2660 AC_SUBST(QT_LIBS) |
15297
2f0b74cf8b4d
configure.ac: Conditionally build GUI using same construct as conditionally building DOCs.
Rik <rik@octave.org>
parents:
15296
diff
changeset
|
2661 AC_SUBST(GUIDIR) |
15116
3d7a7ae53bbf
Further integration of GUI in the build system.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15115
diff
changeset
|
2662 |
1146 | 2663 ### Run configure in subdirectories. |
2664 | |
1304 | 2665 export CC |
2666 export CXX | |
2667 export F77 | |
2668 | |
3923 | 2669 ### Some things to add to the bottom of config.h. |
2670 | |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2671 dnl ------------------------------------------------------------ |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2672 |
3923 | 2673 AH_BOTTOM([ |
10411 | 2674 #if !defined (GNULIB_NAMESPACE) |
2675 #define GNULIB_NAMESPACE gnulib | |
2676 #endif | |
2677 | |
3923 | 2678 #if defined (__GNUC__) |
5389 | 2679 #define GCC_ATTR_DEPRECATED __attribute__ ((__deprecated__)) |
15127
87411930d6c4
avoid "function declared 'noreturn' has a return statement" warning.
John W. Eaton <jwe@octave.org>
parents:
15126
diff
changeset
|
2680 #define HAVE_ATTR_DEPRECATED |
87411930d6c4
avoid "function declared 'noreturn' has a return statement" warning.
John W. Eaton <jwe@octave.org>
parents:
15126
diff
changeset
|
2681 |
3923 | 2682 #define GCC_ATTR_NORETURN __attribute__ ((__noreturn__)) |
15127
87411930d6c4
avoid "function declared 'noreturn' has a return statement" warning.
John W. Eaton <jwe@octave.org>
parents:
15126
diff
changeset
|
2683 #define HAVE_ATTR_NORETURN |
87411930d6c4
avoid "function declared 'noreturn' has a return statement" warning.
John W. Eaton <jwe@octave.org>
parents:
15126
diff
changeset
|
2684 |
3923 | 2685 #define GCC_ATTR_UNUSED __attribute__ ((__unused__)) |
15127
87411930d6c4
avoid "function declared 'noreturn' has a return statement" warning.
John W. Eaton <jwe@octave.org>
parents:
15126
diff
changeset
|
2686 #define HAVE_ATTR_UNUSED |
3923 | 2687 #else |
5389 | 2688 #define GCC_ATTR_DEPRECATED |
3923 | 2689 #define GCC_ATTR_NORETURN |
2690 #define GCC_ATTR_UNUSED | |
2691 #endif | |
2692 | |
2693 #define X_CAST(T, E) (T) (E) | |
2694 | |
5854 | 2695 #if defined (CXX_BROKEN_REINTERPRET_CAST) |
2696 #define FCN_PTR_CAST(T, E) (T) (E) | |
2697 #else | |
2698 #define FCN_PTR_CAST(T, E) reinterpret_cast<T> (E) | |
2699 #endif | |
2700 | |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2701 #if ! defined (HAVE_DEV_T) |
4064 | 2702 typedef short dev_t; |
3923 | 2703 #endif |
2704 | |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2705 #if ! defined (HAVE_INO_T) |
4064 | 2706 typedef unsigned long ino_t; |
3923 | 2707 #endif |
2708 | |
6122 | 2709 #if defined (_MSC_VER) |
2710 #define __WIN32__ | |
6276 | 2711 #define WIN32 |
6122 | 2712 /* missing parameters in macros */ |
2713 #pragma warning (disable: 4003) | |
2714 /* missing implementations in template instantiation */ | |
2715 #pragma warning (disable: 4996) | |
2716 /* deprecated function names (FIXME?) */ | |
2717 #pragma warning (disable: 4661) | |
2718 #endif | |
2719 | |
4377 | 2720 #if defined (__WIN32__) && ! defined (__CYGWIN__) |
4101 | 2721 #define OCTAVE_HAVE_WINDOWS_FILESYSTEM 1 |
6049 | 2722 #elif defined (__CYGWIN__) |
4377 | 2723 #define OCTAVE_HAVE_WINDOWS_FILESYSTEM 1 |
2724 #define OCTAVE_HAVE_POSIX_FILESYSTEM 1 | |
6049 | 2725 #else |
2726 #define OCTAVE_HAVE_POSIX_FILESYSTEM 1 | |
4101 | 2727 #endif |
2728 | |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
2729 /* Define to 1 if we expect to have <windows.h>, Sleep, etc. */ |
4102 | 2730 #if defined (__WIN32__) && ! defined (__CYGWIN__) |
4101 | 2731 #define OCTAVE_USE_WINDOWS_API 1 |
2732 #endif | |
4153 | 2733 |
8577
ab61b47d3435
configure.in (AH_BOTTOM): Also check __MACH__ when defining OCTAVE_USE_OS_X_API
John W. Eaton <jwe@octave.org>
parents:
8573
diff
changeset
|
2734 #if defined (__APPLE__) && defined (__MACH__) |
8573
da61d0f7ce0b
configure.in (AH_BOTTOM): define OCTAVE_USE_OS_X_API if __APPLE__ is defined
John W. Eaton <jwe@octave.org>
parents:
8562
diff
changeset
|
2735 #define OCTAVE_USE_OS_X_API 1 |
da61d0f7ce0b
configure.in (AH_BOTTOM): define OCTAVE_USE_OS_X_API if __APPLE__ is defined
John W. Eaton <jwe@octave.org>
parents:
8562
diff
changeset
|
2736 #endif |
da61d0f7ce0b
configure.in (AH_BOTTOM): define OCTAVE_USE_OS_X_API if __APPLE__ is defined
John W. Eaton <jwe@octave.org>
parents:
8562
diff
changeset
|
2737 |
4180 | 2738 /* sigsetjmp is a macro, not a function. */ |
2739 #if defined (sigsetjmp) && defined (HAVE_SIGLONGJMP) | |
2740 #define OCTAVE_HAVE_SIG_JUMP | |
2741 #endif | |
4249 | 2742 |
4552 | 2743 #if defined (_UNICOS) |
2744 #define F77_USES_CRAY_CALLING_CONVENTION | |
2745 #endif | |
2746 | |
2747 #if 0 | |
2748 #define F77_USES_VISUAL_FORTRAN_CALLING_CONVENTION | |
2749 #endif | |
5275 | 2750 |
5297 | 2751 #ifdef USE_64_BIT_IDX_T |
2752 #define SIZEOF_OCTAVE_IDX_TYPE 8 | |
2753 #else | |
2754 #define SIZEOF_OCTAVE_IDX_TYPE SIZEOF_INT | |
2755 #endif | |
2756 | |
9648
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2757 /* To be able to use long doubles for 64-bit mixed arithmetics, we need |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2758 them at least 80 bits wide and we need roundl declared in math.h. |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
2759 FIXME: Maybe substitute this by a more precise check in the future? */ |
8185
69c5cce38c29
implement 64-bit arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents:
8169
diff
changeset
|
2760 #if (SIZEOF_LONG_DOUBLE >= 10) && defined (HAVE_ROUNDL) |
69c5cce38c29
implement 64-bit arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents:
8169
diff
changeset
|
2761 #define OCTAVE_INT_USE_LONG_DOUBLE |
69c5cce38c29
implement 64-bit arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents:
8169
diff
changeset
|
2762 #endif |
69c5cce38c29
implement 64-bit arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents:
8169
diff
changeset
|
2763 |
7067 | 2764 #define OCTAVE_EMPTY_CPP_ARG |
2765 | |
9648
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2766 /* Octave is currently unable to use FFTW unless both float |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
2767 and double versions are available. */ |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
2768 #if defined (HAVE_FFTW3) && defined (HAVE_FFTW3F) |
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
2769 #define HAVE_FFTW |
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
2770 #endif |
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
2771 |
9648
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2772 /* Backward compatibility. */ |
9610
bb36a5730ecc
configure.in (AH_BOTTOM): If HAVE_Z is defined, define HAVE_ZLIB
John W. Eaton <jwe@octave.org>
parents:
9603
diff
changeset
|
2773 #if defined (HAVE_Z) |
bb36a5730ecc
configure.in (AH_BOTTOM): If HAVE_Z is defined, define HAVE_ZLIB
John W. Eaton <jwe@octave.org>
parents:
9603
diff
changeset
|
2774 #define HAVE_ZLIB |
bb36a5730ecc
configure.in (AH_BOTTOM): If HAVE_Z is defined, define HAVE_ZLIB
John W. Eaton <jwe@octave.org>
parents:
9603
diff
changeset
|
2775 #endif |
bb36a5730ecc
configure.in (AH_BOTTOM): If HAVE_Z is defined, define HAVE_ZLIB
John W. Eaton <jwe@octave.org>
parents:
9603
diff
changeset
|
2776 |
9648
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2777 /* oct-dlldefs.h */ |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2778 |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2779 #if defined (_MSC_VER) |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2780 #define OCTAVE_EXPORT __declspec(dllexport) |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2781 #define OCTAVE_IMPORT __declspec(dllimport) |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2782 #else |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2783 /* All other compilers, at least for now. */ |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2784 #define OCTAVE_EXPORT |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2785 #define OCTAVE_IMPORT |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2786 #endif |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2787 |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2788 /* API macro for libcruft */ |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2789 #ifdef CRUFT_DLL |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2790 #define CRUFT_API OCTAVE_EXPORT |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2791 #else |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2792 #define CRUFT_API OCTAVE_IMPORT |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2793 #endif |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2794 |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2795 /* API macro for liboctave */ |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2796 #ifdef OCTAVE_DLL |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2797 #define OCTAVE_API OCTAVE_EXPORT |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2798 #else |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2799 #define OCTAVE_API OCTAVE_IMPORT |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2800 #endif |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2801 |
15195 | 2802 /* API macro for libinterp */ |
9648
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2803 #ifdef OCTINTERP_DLL |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2804 #define OCTINTERP_API OCTAVE_EXPORT |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2805 #else |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2806 #define OCTINTERP_API OCTAVE_IMPORT |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2807 #endif |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2808 |
15195 | 2809 /* API macro for libinterp/graphics */ |
9648
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2810 #ifdef OCTGRAPHICS_DLL |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2811 #define OCTGRAPHICS_API OCTAVE_EXPORT |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2812 #else |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2813 #define OCTGRAPHICS_API OCTAVE_IMPORT |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2814 #endif |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2815 |
15257
7ee62f559a73
Fix compilation under Windows with GUI and LLVM enabled.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15238
diff
changeset
|
2816 /* API macro for libgui */ |
7ee62f559a73
Fix compilation under Windows with GUI and LLVM enabled.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15238
diff
changeset
|
2817 #ifdef OCTGUI_DLL |
7ee62f559a73
Fix compilation under Windows with GUI and LLVM enabled.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15238
diff
changeset
|
2818 #define OCTGUI_API OCTAVE_EXPORT |
7ee62f559a73
Fix compilation under Windows with GUI and LLVM enabled.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15238
diff
changeset
|
2819 #else |
7ee62f559a73
Fix compilation under Windows with GUI and LLVM enabled.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15238
diff
changeset
|
2820 #define OCTGUI_API OCTAVE_IMPORT |
7ee62f559a73
Fix compilation under Windows with GUI and LLVM enabled.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15238
diff
changeset
|
2821 #endif |
7ee62f559a73
Fix compilation under Windows with GUI and LLVM enabled.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15238
diff
changeset
|
2822 |
9648
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2823 /* oct-types.h */ |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2824 |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2825 typedef OCTAVE_IDX_TYPE octave_idx_type; |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2826 |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2827 #include <stdint.h> |
13985
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
2828 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
2829 /* Tag indicating Octave config.h has been included */ |
13985
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
2830 #define OCTAVE_CONFIG_INCLUDED 1 |
3923 | 2831 ]) |
2832 | |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2833 dnl end of AH_BOTTOM |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2834 dnl ------------------------------------------------------------ |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2835 |
15779
4456ad3d8a56
configure.ac: Ensure that all AC_DEFINEs are captured by UGLY_DEFS variable.
Rik <rik@octave.org>
parents:
15777
diff
changeset
|
2836 ### Make all AC_DEFINES available to testif feature of test.m function. |
4456ad3d8a56
configure.ac: Ensure that all AC_DEFINEs are captured by UGLY_DEFS variable.
Rik <rik@octave.org>
parents:
15777
diff
changeset
|
2837 ### This must reside at the bottom of configure.ac after all AC_DEFINES |
4456ad3d8a56
configure.ac: Ensure that all AC_DEFINEs are captured by UGLY_DEFS variable.
Rik <rik@octave.org>
parents:
15777
diff
changeset
|
2838 ### have been made. |
4456ad3d8a56
configure.ac: Ensure that all AC_DEFINEs are captured by UGLY_DEFS variable.
Rik <rik@octave.org>
parents:
15777
diff
changeset
|
2839 |
4456ad3d8a56
configure.ac: Ensure that all AC_DEFINEs are captured by UGLY_DEFS variable.
Rik <rik@octave.org>
parents:
15777
diff
changeset
|
2840 AC_OUTPUT_MAKE_DEFS |
4456ad3d8a56
configure.ac: Ensure that all AC_DEFINEs are captured by UGLY_DEFS variable.
Rik <rik@octave.org>
parents:
15777
diff
changeset
|
2841 |
869 | 2842 ### Do the substitutions in all the Makefiles. |
2843 | |
8850
538184c540a9
Add make target "configfiles" to automatically regenerate configuration files
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
8849
diff
changeset
|
2844 AC_SUBST(ac_config_files) |
9645 | 2845 AC_SUBST(ac_config_headers) |
8850
538184c540a9
Add make target "configfiles" to automatically regenerate configuration files
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
8849
diff
changeset
|
2846 |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2847 AC_CONFIG_FILES([ |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2848 Makefile |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2849 doc/Makefile |
16246
98d8d1f4b7f8
build: Add creation of Doxygen docs to build system
Rik <rik@octave.org>
parents:
16244
diff
changeset
|
2850 doc/doxyhtml/Makefile |
12336
af2b18354a8e
Add new Octave O logo to Mercurial and build process.
Rik <octave@nomad.inbox5.com>
parents:
12218
diff
changeset
|
2851 doc/icons/Makefile |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2852 doc/interpreter/Makefile |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2853 doc/liboctave/Makefile |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2854 doc/refcard/Makefile |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2855 examples/Makefile |
9946 | 2856 libgnu/Makefile |
15196
017f0b2e6933
rename gui directory to libgu
John W. Eaton <jwe@octave.org>
parents:
15195
diff
changeset
|
2857 libgui/Makefile |
15195 | 2858 libinterp/Makefile |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2859 liboctave/Makefile |
15271
648dabbb4c6b
build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
15257
diff
changeset
|
2860 liboctave/cruft/Makefile |
648dabbb4c6b
build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
15257
diff
changeset
|
2861 liboctave/cruft/mkf77def |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2862 scripts/Makefile |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2863 src/Makefile |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2864 test/Makefile]) |
8850
538184c540a9
Add make target "configfiles" to automatically regenerate configuration files
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
8849
diff
changeset
|
2865 |
3887 | 2866 AC_OUTPUT |
1225 | 2867 |
2868 ### Print a summary so that important information isn't missed. | |
2869 | |
5844 | 2870 AC_MSG_NOTICE([ |
1225 | 2871 |
2872 Octave is now configured for $canonical_host_type | |
2873 | |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2874 Source directory: $srcdir |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2875 Installation prefix: $prefix |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2876 C compiler: $CC $XTRA_CFLAGS $WARN_CFLAGS $CFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2877 C++ compiler: $CXX $XTRA_CXXFLAGS $WARN_CXXFLAGS $CXXFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2878 Fortran compiler: $F77 $FFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2879 Fortran libraries: $FLIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2880 Lex libraries: $LEXLIB |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2881 LIBS: $LIBS |
9519
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
2882 |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2883 AMD CPPFLAGS: $AMD_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2884 AMD LDFLAGS: $AMD_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2885 AMD libraries: $AMD_LIBS |
14144
834df9f10963
remove ARPACK files from sources and restore configure checks for external ARPACK library
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
2886 ARPACK CPPFLAGS: $ARPACK_CPPFLAGS |
834df9f10963
remove ARPACK files from sources and restore configure checks for external ARPACK library
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
2887 ARPACK LDFLAGS: $ARPACK_LDFLAGS |
834df9f10963
remove ARPACK files from sources and restore configure checks for external ARPACK library
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
2888 ARPACK libraries: $ARPACK_LIBS |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2889 BLAS libraries: $BLAS_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2890 CAMD CPPFLAGS: $CAMD_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2891 CAMD LDFLAGS: $CAMD_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2892 CAMD libraries: $CAMD_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2893 CARBON libraries: $CARBON_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2894 CCOLAMD CPPFLAGS: $CCOLAMD_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2895 CCOLAMD LDFLAGS: $CCOLAMD_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2896 CCOLAMD libraries: $CCOLAMD_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2897 CHOLMOD CPPFLAGS: $CHOLMOD_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2898 CHOLMOD LDFLAGS: $CHOLMOD_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2899 CHOLMOD libraries: $CHOLMOD_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2900 COLAMD CPPFLAGS: $COLAMD_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2901 COLAMD LDFLAGS: $COLAMD_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2902 COLAMD libraries: $COLAMD_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2903 CURL CPPFLAGS: $CURL_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2904 CURL LDFLAGS: $CURL_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2905 CURL libraries: $CURL_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2906 CXSPARSE CPPFLAGS: $CXSPARSE_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2907 CXSPARSE LDFLAGS: $CXSPARSE_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2908 CXSPARSE libraries: $CXSPARSE_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2909 DL libraries: $DL_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2910 FFTW3 CPPFLAGS: $FFTW3_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2911 FFTW3 LDFLAGS: $FFTW3_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2912 FFTW3 libraries: $FFTW3_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2913 FFTW3F CPPFLAGS: $FFTW3F_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2914 FFTW3F LDFLAGS: $FFTW3F_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2915 FFTW3F libraries: $FFTW3F_LIBS |
9846
1d90fc211872
configure.ac: report freetype, fontconfig, and fltk cflags and libs info
John W. Eaton <jwe@octave.org>
parents:
9845
diff
changeset
|
2916 fontconfig CFLAGS: $FONTCONFIG_CFLAGS |
15012
a25937adede9
configure.ac: consistency on output (using the same word for the same thing)
Carnë Draug <carandraug+dev@gmail.com>
parents:
15001
diff
changeset
|
2917 fontconfig libraries: $FONTCONFIG_LIBS |
a25937adede9
configure.ac: consistency on output (using the same word for the same thing)
Carnë Draug <carandraug+dev@gmail.com>
parents:
15001
diff
changeset
|
2918 FreeType2 CFLAGS: $FT2_CFLAGS |
a25937adede9
configure.ac: consistency on output (using the same word for the same thing)
Carnë Draug <carandraug+dev@gmail.com>
parents:
15001
diff
changeset
|
2919 FreeType2 libraries: $FT2_LIBS |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2920 GLPK CPPFLAGS: $GLPK_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2921 GLPK LDFLAGS: $GLPK_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2922 GLPK libraries: $GLPK_LIBS |
9846
1d90fc211872
configure.ac: report freetype, fontconfig, and fltk cflags and libs info
John W. Eaton <jwe@octave.org>
parents:
9845
diff
changeset
|
2923 graphics CFLAGS: $GRAPHICS_CFLAGS |
15012
a25937adede9
configure.ac: consistency on output (using the same word for the same thing)
Carnë Draug <carandraug+dev@gmail.com>
parents:
15001
diff
changeset
|
2924 graphics libraries: $GRAPHICS_LIBS |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2925 HDF5 CPPFLAGS: $HDF5_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2926 HDF5 LDFLAGS: $HDF5_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2927 HDF5 libraries: $HDF5_LIBS |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2928 Java home: $JAVA_HOME |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2929 Java JVM path: $JAVA_LDPATH |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
15600
diff
changeset
|
2930 Java CPPFLAGS: $JAVA_CPPFLAGS |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
15600
diff
changeset
|
2931 Java libraries: $JAVA_LIBS |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2932 LAPACK libraries: $LAPACK_LIBS |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
2933 LLVM CPPFLAGS: $LLVM_CPPFLAGS |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
2934 LLVM LDFLAGS: $LLVM_LDFLAGS |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
2935 LLVM libraries: $LLVM_LIBS |
11040
9ac165a67747
Modified configure.ac to allow specification of ImageMagick or GraphicsMagick. GraphicsMagick is still the default option.
John Swensen <jpswensen@gmail.com>
parents:
10986
diff
changeset
|
2936 Magick++ CPPFLAGS: $MAGICK_CPPFLAGS |
9ac165a67747
Modified configure.ac to allow specification of ImageMagick or GraphicsMagick. GraphicsMagick is still the default option.
John Swensen <jpswensen@gmail.com>
parents:
10986
diff
changeset
|
2937 Magick++ LDFLAGS: $MAGICK_LDFLAGS |
9ac165a67747
Modified configure.ac to allow specification of ImageMagick or GraphicsMagick. GraphicsMagick is still the default option.
John Swensen <jpswensen@gmail.com>
parents:
10986
diff
changeset
|
2938 Magick++ libraries: $MAGICK_LIBS |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2939 OPENGL libraries: $OPENGL_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2940 PTHREAD flags: $PTHREAD_CFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2941 PTHREAD libraries: $PTHREAD_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2942 QHULL CPPFLAGS: $QHULL_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2943 QHULL LDFLAGS: $QHULL_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2944 QHULL libraries: $QHULL_LIBS |
15424
cabe2fa4566c
build: Add and organize octave_config_info variables.
Rik <rik@octave.org>
parents:
15412
diff
changeset
|
2945 QRUPDATE CPPFLAGS: $QRUPDATE_CPPFLAGS |
cabe2fa4566c
build: Add and organize octave_config_info variables.
Rik <rik@octave.org>
parents:
15412
diff
changeset
|
2946 QRUPDATE LDFLAGS: $QRUPDATE_LDFLAGS |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2947 QRUPDATE libraries: $QRUPDATE_LIBS |
15596
5f031158c693
Use pkg-config to discover Qt (pkg-config is already a requirement anyway).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15538
diff
changeset
|
2948 Qt CPPFLAGS: $QT_CPPFLAGS |
5f031158c693
Use pkg-config to discover Qt (pkg-config is already a requirement anyway).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15538
diff
changeset
|
2949 Qt LDFLAGS: $QT_LDFLAGS |
5f031158c693
Use pkg-config to discover Qt (pkg-config is already a requirement anyway).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15538
diff
changeset
|
2950 Qt libraries: $QT_LIBS |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2951 READLINE libraries: $READLINE_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2952 REGEX libraries: $REGEX_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2953 TERM libraries: $TERM_LIBS |
15424
cabe2fa4566c
build: Add and organize octave_config_info variables.
Rik <rik@octave.org>
parents:
15412
diff
changeset
|
2954 UMFPACK CPPFLAGS: $UMFPACK_CPPFLAGS |
cabe2fa4566c
build: Add and organize octave_config_info variables.
Rik <rik@octave.org>
parents:
15412
diff
changeset
|
2955 UMFPACK LDFLAGS: $UMFPACK_LDFLAGS |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2956 UMFPACK libraries: $UMFPACK_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2957 X11 include flags: $X11_INCFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2958 X11 libraries: $X11_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2959 Z CPPFLAGS: $Z_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2960 Z LDFLAGS: $Z_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2961 Z libraries: $Z_LIBS |
9519
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
2962 |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2963 Default pager: $DEFAULT_PAGER |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2964 gnuplot: $GNUPLOT |
1664 | 2965 |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
2966 Build Octave GUI: $build_gui |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
2967 JIT compiler for loops: $build_jit |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2968 Build Java interface: $build_java |
4110 | 2969 Do internal array bounds checking: $BOUNDS_CHECKING |
13838
a35d381e22b0
make octave_allocator optional and disable by default
John W. Eaton <jwe@octave.org>
parents:
13745
diff
changeset
|
2970 Use octave_allocator: $USE_OCTAVE_ALLOCATOR |
4110 | 2971 Build static libraries: $STATIC_LIBS |
2972 Build shared libraries: $SHARED_LIBS | |
4128 | 2973 Dynamic Linking: $ENABLE_DYNAMIC_LINKING $DL_API_MSG |
4110 | 2974 Include support for GNU readline: $USE_READLINE |
5275 | 2975 64-bit array dims and indexing: $USE_64_BIT_IDX_T |
1225 | 2976 ]) |
3105 | 2977 |
2978 warn_msg_printed=false | |
2979 | |
14605
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
2980 OCTAVE_CONFIGURE_WARNING_SUMMARY |
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
2981 |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2982 if test $ENABLE_DYNAMIC_LINKING = yes; then |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2983 if test $SHARED_LIBS = no; then |
4469 | 2984 AC_MSG_WARN([You used --enable-dl but not --enable-shared.]) |
2985 AC_MSG_WARN([Are you sure that is what you want to do?]) | |
2986 warn_msg_printed=true | |
2987 fi | |
2988 fi | |
2989 | |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2990 if test $USE_64_BIT_IDX_T = yes; then |
6161 | 2991 AC_MSG_WARN([]) |
5857 | 2992 AC_MSG_WARN([You used the EXPERIMENTAL --enable-64 option.]) |
2993 AC_MSG_WARN([Are you sure that is what you want to do?]) | |
2994 AC_MSG_WARN([]) | |
10331
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
2995 AC_MSG_WARN([Your Fortran compiler must have an option to generate]) |
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
2996 AC_MSG_WARN([code with 8 byte signed INTEGER values. This option]) |
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
2997 AC_MSG_WARN([should be specified in the F77_INTEGER_8_FLAG variable]) |
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
2998 AC_MSG_WARN([Make. This should work automatically for gfortran. If]) |
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
2999 AC_MSG_WARN([you use another compiler, you will need to set this]) |
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
3000 AC_MSG_WARN([variable on the configure command line. You must also]) |
14144
834df9f10963
remove ARPACK files from sources and restore configure checks for external ARPACK library
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
3001 AC_MSG_WARN([compile the ARPACK, BLAS, LAPACK, QRUPDATE, and SuiteSparse]) |
10331
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
3002 AC_MSG_WARN([libraries to use 8 byte signed integers for array indexing.]) |
6161 | 3003 AC_MSG_WARN([]) |
5857 | 3004 warn_msg_printed=true |
3105 | 3005 fi |
3006 | |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
3007 if test $USE_OPENMP = yes; then |
10471
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10456
diff
changeset
|
3008 AC_MSG_WARN([]) |
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10456
diff
changeset
|
3009 AC_MSG_WARN([You used the EXPERIMENTAL --enable-openmp option.]) |
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10456
diff
changeset
|
3010 AC_MSG_WARN([Are you sure that is what you want to do?]) |
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10456
diff
changeset
|
3011 AC_MSG_WARN([]) |
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10456
diff
changeset
|
3012 AC_MSG_WARN([This option enables experimental SMP multithreding]) |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
3013 AC_MSG_WARN([code that has had very little testing. There is no]) |
10471
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10456
diff
changeset
|
3014 AC_MSG_WARN([certainity that the results returned by Octave with]) |
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10456
diff
changeset
|
3015 AC_MSG_WARN([this option enabled will be correct.]) |
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10456
diff
changeset
|
3016 AC_MSG_WARN([]) |
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10456
diff
changeset
|
3017 warn_msg_printed=true |
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10456
diff
changeset
|
3018 fi |
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10456
diff
changeset
|
3019 |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
3020 if test $native_graphics != yes; then |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
3021 AC_MSG_WARN([]) |
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
3022 AC_MSG_WARN([I didn't find the necessary libraries to compile native]) |
10011
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3023 AC_MSG_WARN([graphics. It isn't necessary to have native graphics,]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3024 AC_MSG_WARN([but you will need to have gnuplot installed or you won't]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3025 AC_MSG_WARN([be able to use any of Octave's plotting commands]) |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
3026 AC_MSG_WARN([]) |
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
3027 warn_msg_printed=true |
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
3028 fi |
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
3029 |
10011
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3030 if test -n "$warn_gnuplot"; then |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
3031 if test $native_graphics = yes; then |
10011
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3032 AC_MSG_WARN([]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3033 AC_MSG_WARN([I didn't find gnuplot. Plotting commands will use the]) |
11576
8ac9687dbe9f
rename backend to graphics_toolkit
John W. Eaton <jwe@octave.org>
parents:
11542
diff
changeset
|
3034 AC_MSG_WARN([native graphics toolkit.]) |
10011
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3035 else |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3036 AC_MSG_WARN([I didn't find gnuplot. It isn't necessary to have gnuplot]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3037 AC_MSG_WARN([installed, but you won't be able to use any of Octave's]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3038 AC_MSG_WARN([plotting commands without it.]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3039 fi |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3040 AC_MSG_WARN([]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3041 AC_MSG_WARN([If gnuplot is installed, but isn't in your path, you can]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3042 AC_MSG_WARN([tell Octave where to find it by using the gnuplot_binary]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3043 AC_MSG_WARN([function. For example,]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3044 AC_MSG_WARN([]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3045 AC_MSG_WARN([gnuplot_binary ("/full/path/and/name/of/gnuplot/binary")]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3046 AC_MSG_WARN([]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3047 AC_MSG_WARN([at the Octave prompt.]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3048 AC_MSG_WARN([]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3049 AC_MSG_WARN([Setting default value to $GNUPLOT]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3050 AC_MSG_WARN([]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3051 |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3052 warn_msg_printed=true |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3053 fi |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3054 |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
3055 if test $USE_ATOMIC_REFCOUNT = yes; then |
13985
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
3056 AC_MSG_WARN([]) |
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
3057 AC_MSG_WARN([Using atomic reference counting.]) |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
3058 AC_MSG_WARN([This feature allows access to Octave data safely from]) |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
3059 AC_MSG_WARN([another thread, for instance from a GUI. However this]) |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
3060 AC_MSG_WARN([results in a small performance penalty in the Octave]) |
13985
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
3061 AC_MSG_WARN([interpreter.]) |
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
3062 AC_MSG_WARN([]) |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
3063 if test $USE_OCTAVE_ALLOCATOR = yes; then |
13985
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
3064 AC_MSG_WARN([Thread-safe behavior is not guaranteed unless you also]) |
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
3065 AC_MSG_WARN([disable the use of the octave_allocator class.]) |
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
3066 AC_MSG_WARN([]) |
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
3067 fi |
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
3068 warn_msg_printed=true |
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
3069 fi |
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
3070 |
6191 | 3071 if $warn_msg_printed; then |
10003
2ea3110e15ed
Use M4 quoting for arguments to autoconf macros containing variables
Rik <rdrider0-list@yahoo.com>
parents:
9989
diff
changeset
|
3072 AC_MSG_NOTICE([]) |
14657
8a84849ad986
build: Restore printing some summary ./configure warnings at the end
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14630
diff
changeset
|
3073 AC_MSG_NOTICE([NOTE: Libraries or auxiliary programs may be skipped if they are]) |
8a84849ad986
build: Restore printing some summary ./configure warnings at the end
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14630
diff
changeset
|
3074 AC_MSG_NOTICE([NOTE: not found OR if they are missing required features on your]) |
8a84849ad986
build: Restore printing some summary ./configure warnings at the end
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14630
diff
changeset
|
3075 AC_MSG_NOTICE([NOTE: system. ]) |
6161 | 3076 fi |
3077 | |
3105 | 3078 ### End of configure. |