Mercurial > jwe > octave
annotate configure.ac @ 22150:c4901d7a2d7d
Remove check for std::tr1::unordered_map because we depend on C++11.
* rand.cc: remove conditional include of unordered_map from std::tr1
if it's missing from std. Octave is already dependent on C++11 so it
is no longer needed.
* configure.ac: remove call to OCTAVE_UNORDERED_MAP_HEADERS.
* m4/acinclude.m4: remove unused OCTAVE_UNORDERED_MAP_HEADERS macro.
author | Carnë Draug <carandraug@octave.org> |
---|---|
date | Wed, 20 Jul 2016 15:32:53 +0100 |
parents | a51d5c5c71e6 |
children | 766f934db568 |
rev | line source |
---|---|
5 | 1 dnl Process this file with autoconf to produce a configure script. |
2 dnl | |
19697
4197fc428c7d
maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents:
19676
diff
changeset
|
3 dnl Copyright (C) 1993-2015 John W. Eaton |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
4 ### |
869 | 5 ### This file is part of Octave. |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
6 ### |
869 | 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. | |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
11 ### |
869 | 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. | |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
16 ### |
869 | 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 |
19825
bc3e6e96da81
bump required autoconf version to 2.63
John W. Eaton <jwe@octave.org>
parents:
19816
diff
changeset
|
21 AC_PREREQ([2.63]) |
20223
5d6a2c4caf05
configure.ac: Bump development branch to version 4.1.0+.
Rik <rik@octave.org>
parents:
20153
diff
changeset
|
22 AC_INIT([GNU Octave], [4.1.0+], [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 |
18229
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
24 dnl Note that the version number is duplicated here and in AC_INIT |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
25 dnl because AC_INIT requires it to be static, not computed from |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
26 dnl shell variables. |
19905
52d2bbf49c92
maint: Bump version number for 4.0.0-rc1.
John W. Eaton <jwe@octave.org>
parents:
19862
diff
changeset
|
27 OCTAVE_MAJOR_VERSION=4 |
20235
3e8c188b20a7
maint: Periodic merge of stable to default.
John W. Eaton <jwe@octave.org>
diff
changeset
|
28 OCTAVE_MINOR_VERSION=1 |
3e8c188b20a7
maint: Periodic merge of stable to default.
John W. Eaton <jwe@octave.org>
diff
changeset
|
29 OCTAVE_PATCH_VERSION=0+ |
18229
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
30 |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
31 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
|
32 OCTAVE_VERSION="$PACKAGE_VERSION" |
18229
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
33 |
19697
4197fc428c7d
maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents:
19676
diff
changeset
|
34 OCTAVE_COPYRIGHT="Copyright (C) 2015 John W. Eaton and others." |
18549 | 35 |
20234 | 36 OCTAVE_RELEASE_DATE="2015-05-26" |
18229
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
37 |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
38 ## The "API version" is used as a way of checking that interfaces in the |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
39 ## liboctave and libinterp libraries haven't changed in a backwardly |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
40 ## incompatible way when loading .oct files. A better way to do that is |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
41 ## with library versioning, but not all systems support that. |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
42 ## NOTE: This macro will be removed in a future version of Octave. If |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
43 ## you insist on checking for features using a version number, use the |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
44 ## OCTAVE_MAJOR_VERSION, OCTAVE_MINOR_VERSION, and |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
45 ## OCTAVE_PATCH_VERSION macros instead. |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
46 ## FIXME: Since we also set libtool versions for liboctave and |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
47 ## libinterp, perhaps we should be computing the "api version" from |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
48 ## those versions numbers in some way instead of setting it |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
49 ## independently here. |
20134
57b6e06ed811
maint: update library version numbers for upcoming release
Mike Miller <mtmiller@octave.org>
parents:
20099
diff
changeset
|
50 OCTAVE_API_VERSION="api-v50+" |
18229
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
51 |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
52 AC_SUBST(OCTAVE_MAJOR_VERSION) |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
53 AC_SUBST(OCTAVE_MINOR_VERSION) |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
54 AC_SUBST(OCTAVE_PATCH_VERSION) |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
55 AC_SUBST(OCTAVE_VERSION) |
18229
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
56 AC_SUBST(OCTAVE_COPYRIGHT) |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
57 AC_SUBST(OCTAVE_RELEASE_DATE) |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
58 AC_SUBST(OCTAVE_API_VERSION) |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
59 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
60 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
|
61 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
|
62 dnl AC_REVISION($Revision: 1.603 $) |
15195 | 63 AC_CONFIG_SRCDIR([libinterp/octave.cc]) |
16330
306e0ac231d0
move AH_BOTTOM output to separate header file
John W. Eaton <jwe@octave.org>
parents:
16329
diff
changeset
|
64 AC_CONFIG_HEADERS([config.h:config.in.h]) |
9946 | 65 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
|
66 AC_CONFIG_MACRO_DIR([m4]) |
869 | 67 |
17562
76a8a179bf5b
Move Automake options into AM_INIT_AUTOMAKE
Mike Miller <mtmiller@ieee.org>
parents:
17465
diff
changeset
|
68 AM_INIT_AUTOMAKE([1.11 foreign -Wno-portability -Wno-override tar-ustar subdir-objects]) |
9946 | 69 |
19801
c1654224bc99
enable silent makefile rules by default
John W. Eaton <jwe@octave.org>
parents:
19744
diff
changeset
|
70 ## Add the option to enable silent rules and make silent rules the |
c1654224bc99
enable silent makefile rules by default
John W. Eaton <jwe@octave.org>
parents:
19744
diff
changeset
|
71 ## default behavior. Available since Automake 1.11 and included by |
c1654224bc99
enable silent makefile rules by default
John W. Eaton <jwe@octave.org>
parents:
19744
diff
changeset
|
72 ## default starting with Automake 1.13. |
c1654224bc99
enable silent makefile rules by default
John W. Eaton <jwe@octave.org>
parents:
19744
diff
changeset
|
73 AM_SILENT_RULES([yes]) |
17375
bc018154e46a
build: Support optional Automake silent rules
Mike Miller <mtmiller@ieee.org>
parents:
17330
diff
changeset
|
74 |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
75 OCTAVE_CANONICAL_HOST |
5844 | 76 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
77 AC_DEFINE(OCTAVE_SOURCE, 1, [Define to 1 if this is Octave.]) |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
78 |
9091
45c832e9976d
configure.in: require autoconf 2.60; eliminate some obsolete macros
John W. Eaton <jwe@octave.org>
parents:
9090
diff
changeset
|
79 AC_USE_SYSTEM_EXTENSIONS |
1667 | 80 |
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
|
81 ### 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
|
82 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
83 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
|
84 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
|
85 |
21409
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
86 ## Set default file locations. |
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
|
87 |
21392
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
88 ## Where to install and expect libraries like liboctave.a, liboctinterp.a, |
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
89 ## and other architecture-dependent data. |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
90 OCTAVE_SET_DEFAULT([octlibdir], '${libdir}/octave/${version}') |
21392
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
91 |
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
92 ## Where to put executables to be run by Octave rather than |
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
93 ## the user. This path usually includes the Octave version |
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
94 ## and configuration name, so that multiple configurations |
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
95 ## for multiple versions of Octave may be installed at once. |
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
|
96 OCTAVE_SET_DEFAULT([archlibdir], |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
97 '${libexecdir}/octave/${version}/exec/${canonical_host_type}') |
21392
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
98 |
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
99 ## Where to put executables to be run by Octave rather than by the |
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
100 ## user that are specific to this site. |
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_SET_DEFAULT([localarchlibdir], |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
102 '${libexecdir}/octave/site/exec/${canonical_host_type}') |
21392
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
103 |
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
|
104 OCTAVE_SET_DEFAULT([localapiarchlibdir], |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
105 '${libexecdir}/octave/${api_version}/site/exec/${canonical_host_type}') |
21392
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
106 |
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
|
107 OCTAVE_SET_DEFAULT([localverarchlibdir], |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
108 '${libexecdir}/octave/${version}/site/exec/${canonical_host_type}') |
21392
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
109 |
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
110 ## Where to put object files that will by dynamically loaded. |
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
111 ## This path usually includes the Octave version and configuration |
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
112 ## name, so that multiple configurations for multiple versions of |
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
113 ## Octave may be installed at once. |
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
|
114 OCTAVE_SET_DEFAULT([octfiledir], |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
115 '${libdir}/octave/${version}/oct/${canonical_host_type}') |
21392
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
116 |
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
117 ## Directories Octave should search for object files that will be |
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
118 ## dynamically loaded and that are specific to this site |
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
119 ## (i.e. customizations), before consulting ${octfiledir}. This should |
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
120 ## be a colon-separated list of directories. |
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
|
121 OCTAVE_SET_DEFAULT([localoctfiledir], |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
122 '${libdir}/octave/site/oct/${canonical_host_type}') |
21392
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
123 |
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
|
124 OCTAVE_SET_DEFAULT([localapioctfiledir], |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
125 '${libdir}/octave/site/oct/${api_version}/${canonical_host_type}') |
21392
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
126 |
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
|
127 OCTAVE_SET_DEFAULT([localveroctfiledir], |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
128 '${libdir}/octave/${version}/site/oct/${canonical_host_type}') |
21392
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
129 |
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
130 ## Where to install Octave's include files. |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
131 OCTAVE_SET_DEFAULT([octincludedir], '${includedir}/octave-${version}/octave') |
21392
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
132 |
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
133 ## Where to install the function file distributed with |
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
134 ## Octave. This includes the Octave version, so that the |
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
135 ## function files for different versions of Octave will install |
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
136 ## themselves in separate directories. |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
137 OCTAVE_SET_DEFAULT([fcnfiledir], '${datadir}/octave/${version}/m') |
21392
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
138 |
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
139 ## Directories Octave should search for function files specific |
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
140 ## to this site (i.e. customizations), before consulting |
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
141 ## ${fcnfiledir}. This should be a colon-separated list of |
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
142 ## directories. |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
143 OCTAVE_SET_DEFAULT([localfcnfiledir], '${datadir}/octave/site/m') |
21392
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
144 |
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
|
145 OCTAVE_SET_DEFAULT([localapifcnfiledir], |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
146 '${datadir}/octave/site/${api_version}/m') |
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
147 |
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
148 OCTAVE_SET_DEFAULT([localverfcnfiledir], '${datadir}/octave/${version}/site/m') |
21392
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
149 |
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
150 ## Where to install and expect extra files like NEWS and doc-cache. |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
151 OCTAVE_SET_DEFAULT([octetcdir], '${datadir}/octave/${version}/etc') |
21392
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
152 |
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
153 ## Where to install and expect the language files for the gui. |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
154 OCTAVE_SET_DEFAULT([octlocaledir], '${datadir}/octave/${version}/locale') |
21392
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
155 |
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
156 ## The full path to the default doc cache file. |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
157 OCTAVE_SET_DEFAULT([doc_cache_file], '${octetcdir}/doc-cache') |
21392
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
158 |
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
159 ## Where to install test files. |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
160 OCTAVE_SET_DEFAULT([octtestsdir], '${octetcdir}/tests') |
21392
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
161 |
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
162 ## The full path to the default texi macros file. |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
163 OCTAVE_SET_DEFAULT([texi_macros_file], '${octetcdir}/macros.texi') |
21392
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
164 |
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
165 ## Where Octave will search to find image files. |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
166 OCTAVE_SET_DEFAULT([imagedir], '${datadir}/octave/${version}/imagelib') |
21392
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
167 |
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
168 ## Where Octave will search for example data files shipped with distribution. |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
169 OCTAVE_SET_DEFAULT([octdatadir], '${datadir}/octave/${version}/data') |
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
170 |
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
171 ## Where Octave will look for startup files |
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
172 OCTAVE_SET_DEFAULT([startupfiledir], ['${fcnfiledir}/startup']) |
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
173 OCTAVE_SET_DEFAULT([localstartupfiledir], ['${localfcnfiledir}/startup']) |
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
174 |
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
175 OCTAVE_SET_DEFAULT([man1dir], '${mandir}/man1') |
21392
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
176 |
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
|
177 OCTAVE_SET_DEFAULT([man1ext], '.1') |
21392
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
178 |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
179 OCTAVE_SET_DEFAULT([infofile], '${infodir}/octave.info') |
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
|
180 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
181 ### 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
|
182 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
183 ## 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
|
184 ## 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
|
185 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
|
186 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
187 ## 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
|
188 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
|
189 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
|
190 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
|
191 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
|
192 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
|
193 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
194 ## 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
|
195 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
|
196 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
197 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
|
198 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
|
199 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
200 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
|
201 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
202 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
|
203 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
|
204 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
|
205 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
206 ## 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
|
207 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
|
208 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
|
209 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
210 AC_PROG_INSTALL |
21409
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
211 INSTALL_SCRIPT="${INSTALL}" |
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
|
212 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
|
213 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
214 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
|
215 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
216 ## 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
|
217 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
|
218 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
|
219 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
|
220 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
|
221 |
19744
1687269e31e4
build: Generate Octave logo icons from SVG source (bug #37062)
Mike Miller <mtmiller@ieee.org>
parents:
19733
diff
changeset
|
222 ## Programs used to generate icons file formats. |
1687269e31e4
build: Generate Octave logo icons from SVG source (bug #37062)
Mike Miller <mtmiller@ieee.org>
parents:
19733
diff
changeset
|
223 OCTAVE_PROG_ICOTOOL |
1687269e31e4
build: Generate Octave logo icons from SVG source (bug #37062)
Mike Miller <mtmiller@ieee.org>
parents:
19733
diff
changeset
|
224 OCTAVE_PROG_RSVG_CONVERT |
1687269e31e4
build: Generate Octave logo icons from SVG source (bug #37062)
Mike Miller <mtmiller@ieee.org>
parents:
19733
diff
changeset
|
225 AM_CONDITIONAL([AMCOND_HAVE_ICON_TOOLS], |
1687269e31e4
build: Generate Octave logo icons from SVG source (bug #37062)
Mike Miller <mtmiller@ieee.org>
parents:
19733
diff
changeset
|
226 [test -n "$ICOTOOL" && test -n "$RSVG_CONVERT"]) |
1687269e31e4
build: Generate Octave logo icons from SVG source (bug #37062)
Mike Miller <mtmiller@ieee.org>
parents:
19733
diff
changeset
|
227 |
16522
bfff338c56d1
set default terminal font for the GUI from the configure script
John W. Eaton <jwe@octave.org>
parents:
16371
diff
changeset
|
228 ### Default terminal font for the GUI |
bfff338c56d1
set default terminal font for the GUI from the configure script
John W. Eaton <jwe@octave.org>
parents:
16371
diff
changeset
|
229 case $host_os in |
bfff338c56d1
set default terminal font for the GUI from the configure script
John W. Eaton <jwe@octave.org>
parents:
16371
diff
changeset
|
230 mingw* | msdosmsvc) |
bfff338c56d1
set default terminal font for the GUI from the configure script
John W. Eaton <jwe@octave.org>
parents:
16371
diff
changeset
|
231 DEFAULT_TERMINAL_FONT="Lucida Console" |
10123
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
232 ;; |
16522
bfff338c56d1
set default terminal font for the GUI from the configure script
John W. Eaton <jwe@octave.org>
parents:
16371
diff
changeset
|
233 *) |
bfff338c56d1
set default terminal font for the GUI from the configure script
John W. Eaton <jwe@octave.org>
parents:
16371
diff
changeset
|
234 DEFAULT_TERMINAL_FONT="Courier" |
10123
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
235 ;; |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
236 esac |
16522
bfff338c56d1
set default terminal font for the GUI from the configure script
John W. Eaton <jwe@octave.org>
parents:
16371
diff
changeset
|
237 DEFAULT_TERMINAL_FONT_SIZE=10 |
bfff338c56d1
set default terminal font for the GUI from the configure script
John W. Eaton <jwe@octave.org>
parents:
16371
diff
changeset
|
238 AC_SUBST(DEFAULT_TERMINAL_FONT) |
bfff338c56d1
set default terminal font for the GUI from the configure script
John W. Eaton <jwe@octave.org>
parents:
16371
diff
changeset
|
239 AC_SUBST(DEFAULT_TERMINAL_FONT_SIZE) |
10123
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
240 |
5451 | 241 ### 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
|
242 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
243 sepchar=':' |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
244 AC_ARG_WITH([sepchar], |
5842 | 245 [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
|
246 [use <char> as the path separation character])]) |
5451 | 247 case $with_sepchar in |
248 yes | "") | |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
249 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
250 mingw* | msdosmsvc) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
251 sepchar=';' ;; |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
252 esac |
18352
c460566106f0
configure.ac: Find Qt libs in framework option for Macs (bug #41236)
Michael C. Grant <mcg@cvxr.com>
parents:
18342
diff
changeset
|
253 ;; |
5451 | 254 no) |
255 AC_MSG_ERROR([You are required to define a path separation character]) | |
256 ;; | |
257 *) | |
258 sepchar=$with_sepchar | |
18352
c460566106f0
configure.ac: Find Qt libs in framework option for Macs (bug #41236)
Michael C. Grant <mcg@cvxr.com>
parents:
18342
diff
changeset
|
259 ;; |
5451 | 260 esac |
261 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
|
262 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
|
263 [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
|
264 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
|
265 [Define this to be the path separator for your system, as a string.]) |
5451 | 266 |
15756
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
267 ### 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
|
268 ### 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
|
269 ### 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
|
270 ### this will need to be set. |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
271 SHELL_PATH=/bin/sh |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
272 AC_ARG_WITH([shell], |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
273 [AS_HELP_STRING([--with-shell=SHELL], |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
274 [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
|
275 case $with_shell in |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
276 no) |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
277 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
|
278 ;; |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
279 yes | "") |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
280 ;; |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
281 *) |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
282 SHELL_PATH=$with_shell |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
283 ;; |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
284 esac |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
285 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
|
286 [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
|
287 |
21818
7b0436d0f5be
rename maintainer-mode configure option to hd-id (bug #48101)
John W. Eaton <jwe@octave.org>
parents:
21815
diff
changeset
|
288 ENABLE_HG_ID=yes |
7b0436d0f5be
rename maintainer-mode configure option to hd-id (bug #48101)
John W. Eaton <jwe@octave.org>
parents:
21815
diff
changeset
|
289 AC_ARG_ENABLE([hg-id], |
7b0436d0f5be
rename maintainer-mode configure option to hd-id (bug #48101)
John W. Eaton <jwe@octave.org>
parents:
21815
diff
changeset
|
290 [AS_HELP_STRING([--disable-hg-id], |
7b0436d0f5be
rename maintainer-mode configure option to hd-id (bug #48101)
John W. Eaton <jwe@octave.org>
parents:
21815
diff
changeset
|
291 [disable embedding of hg id in libraries])], |
7b0436d0f5be
rename maintainer-mode configure option to hd-id (bug #48101)
John W. Eaton <jwe@octave.org>
parents:
21815
diff
changeset
|
292 [if test "$enableval" = no; then ENABLE_HG_ID=no; fi], []) |
7b0436d0f5be
rename maintainer-mode configure option to hd-id (bug #48101)
John W. Eaton <jwe@octave.org>
parents:
21815
diff
changeset
|
293 AM_CONDITIONAL([AMCOND_ENABLE_HG_ID], [test $ENABLE_HG_ID = yes]) |
21815
418b6066e544
new maintainer-mode for build (bug #48101)
John W. Eaton <jwe@octave.org>
parents:
21802
diff
changeset
|
294 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
295 ### 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
|
296 ### 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
|
297 ### by default. |
2108 | 298 |
21131
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
299 ENABLE_BOUNDS_CHECK=no |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
300 AC_ARG_ENABLE([bounds-check], |
5844 | 301 [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
|
302 [enable bounds checking for indexing in internal array classes])], |
21131
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
303 [if test "$enableval" = yes; then ENABLE_BOUNDS_CHECK=yes; fi], []) |
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
304 if test $ENABLE_BOUNDS_CHECK = yes; then |
21229
a83e7a384ee0
create and install a subset of config.h in octave-config.h
John W. Eaton <jwe@octave.org>
parents:
21211
diff
changeset
|
305 AC_DEFINE(OCTAVE_ENABLE_BOUNDS_CHECK, 1, [Define to 1 to use internal bounds checking.]) |
2108 | 306 fi |
307 | |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
308 ### Use atomic operations for internal reference counting. This is required |
18584
89b7bd7d0b83
configure.ac: Use atomic reference counting by default for Qt toolkit.
Rik <rik@octave.org>
parents:
18551
diff
changeset
|
309 ### for thread-safe behavior (Qt Handles) but incurs a significant slowdown. |
89b7bd7d0b83
configure.ac: Use atomic reference counting by default for Qt toolkit.
Rik <rik@octave.org>
parents:
18551
diff
changeset
|
310 ### Enabled by default until a higher performing solution can be found. |
89b7bd7d0b83
configure.ac: Use atomic reference counting by default for Qt toolkit.
Rik <rik@octave.org>
parents:
18551
diff
changeset
|
311 |
21131
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
312 ENABLE_ATOMIC_REFCOUNT=yes |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
313 AC_ARG_ENABLE([atomic-refcount], |
18584
89b7bd7d0b83
configure.ac: Use atomic reference counting by default for Qt toolkit.
Rik <rik@octave.org>
parents:
18551
diff
changeset
|
314 [AS_HELP_STRING([--disable-atomic-refcount], |
89b7bd7d0b83
configure.ac: Use atomic reference counting by default for Qt toolkit.
Rik <rik@octave.org>
parents:
18551
diff
changeset
|
315 [Do not use atomic operations for internal reference counting. This option is required for thread-safe behavior as used in the GUI's Qt plotting toolkit. Performance for CLI-only builds is improved by disabling this feature.])], |
21131
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
316 [if test "$enableval" = no; then ENABLE_ATOMIC_REFCOUNT=no; fi], []) |
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
317 if test $ENABLE_ATOMIC_REFCOUNT = yes; then |
21229
a83e7a384ee0
create and install a subset of config.h in octave-config.h
John W. Eaton <jwe@octave.org>
parents:
21211
diff
changeset
|
318 AC_DEFINE(OCTAVE_ENABLE_ATOMIC_REFCOUNT, 1, |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
319 [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
|
320 fi |
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
321 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
322 ### Disable running Make in the doc directory. |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
323 ### 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
|
324 |
20307
c3c1fb44f9b5
eliminate recursive make invocations in doc directory tree
John W. Eaton <jwe@octave.org>
parents:
20306
diff
changeset
|
325 ENABLE_DOCS=yes |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
326 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
|
327 [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
|
328 [if test "$enableval" = no; then |
20307
c3c1fb44f9b5
eliminate recursive make invocations in doc directory tree
John W. Eaton <jwe@octave.org>
parents:
20306
diff
changeset
|
329 ENABLE_DOCS=no |
10092
02453ee20140
allow building of docs to be disabled
John W. Eaton <jwe@octave.org>
parents:
10077
diff
changeset
|
330 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
|
331 OCTAVE_CONFIGURE_WARNING([warn_docs]) |
21131
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
332 fi], []) |
10092
02453ee20140
allow building of docs to be disabled
John W. Eaton <jwe@octave.org>
parents:
10077
diff
changeset
|
333 |
5275 | 334 ### If possible, use a 64-bit integer type for array dimensions and indexing. |
335 | |
21131
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
336 ENABLE_64=no |
5275 | 337 OCTAVE_IDX_TYPE=int |
338 AC_ARG_ENABLE(64, | |
5844 | 339 [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
|
340 [(EXPERIMENTAL) use 64-bit integers for array dimensions and indexing])], |
21131
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
341 [if test "$enableval" = yes; then ENABLE_64=yes; fi], []) |
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
342 if test $ENABLE_64 = yes; then |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
343 AC_CHECK_SIZEOF([void *]) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
344 AC_CHECK_SIZEOF([int]) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
345 AC_CHECK_SIZEOF([long]) |
16313
6aafe87a3144
use int64_t for idx type if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16297
diff
changeset
|
346 AC_CHECK_SIZEOF([int64_t]) |
5275 | 347 if test $ac_cv_sizeof_void_p -eq 8; then |
16313
6aafe87a3144
use int64_t for idx type if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16297
diff
changeset
|
348 OCTAVE_IDX_TYPE=int64_t |
5275 | 349 else |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
350 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
|
351 OCTAVE_CONFIGURE_WARNING([warn_64_bit]) |
21131
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
352 ENABLE_64=no |
5275 | 353 fi |
354 fi | |
355 AC_SUBST(OCTAVE_IDX_TYPE) | |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
356 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
|
357 [Define to the type of octave_idx_type (64 or 32 bit signed integer).]) |
21131
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
358 if test $ENABLE_64 = yes; then |
21229
a83e7a384ee0
create and install a subset of config.h in octave-config.h
John W. Eaton <jwe@octave.org>
parents:
21211
diff
changeset
|
359 AC_DEFINE(OCTAVE_ENABLE_64, 1, |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
360 [Define to 1 if using 64-bit integers for array dimensions and indexing.]) |
5275 | 361 fi |
21131
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
362 AC_SUBST(ENABLE_64) |
5275 | 363 |
3215 | 364 ### It seems that there are some broken inline assembly functions in |
365 ### the GNU libc. Since I'm not sure how to test whether we are using | |
366 ### GNU libc, just disable them for all platforms. | |
367 | |
5844 | 368 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
|
369 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
|
370 [Define to 1 if your version of GNU libc has buggy inline assembly code for math functions like exp.]) |
3215 | 371 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
372 ### Determine which C++ compiler to use (we expect to find g++). |
869 | 373 |
405 | 374 AC_PROG_CXX |
375 AC_PROG_CXXCPP | |
869 | 376 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
377 ### Determine which C compiler to use (we expect to find gcc). |
869 | 378 |
5 | 379 AC_PROG_CC |
405 | 380 AC_PROG_CPP |
832 | 381 AC_PROG_GCC_TRADITIONAL |
869 | 382 |
19840
4006a7377a19
don't save and restore FFLAGS in configure (bug #44359)
John W. Eaton <jwe@octave.org>
parents:
19839
diff
changeset
|
383 ## Save and restore CFLAGS and CXXFLAGS globally. These variables |
4006a7377a19
don't save and restore FFLAGS in configure (bug #44359)
John W. Eaton <jwe@octave.org>
parents:
19839
diff
changeset
|
384 ## are for users, so we shouldn't be touching them. Instead, we should |
4006a7377a19
don't save and restore FFLAGS in configure (bug #44359)
John W. Eaton <jwe@octave.org>
parents:
19839
diff
changeset
|
385 ## set the corresponding AM_ flags (currently by way of the XTRA_ variables). |
4006a7377a19
don't save and restore FFLAGS in configure (bug #44359)
John W. Eaton <jwe@octave.org>
parents:
19839
diff
changeset
|
386 ## However, for the duration of the configure script, we may set CFLAGS |
4006a7377a19
don't save and restore FFLAGS in configure (bug #44359)
John W. Eaton <jwe@octave.org>
parents:
19839
diff
changeset
|
387 ## and CXXFLAGS so that subsequent tests succeed. Temporary settings |
4006a7377a19
don't save and restore FFLAGS in configure (bug #44359)
John W. Eaton <jwe@octave.org>
parents:
19839
diff
changeset
|
388 ## like this are currently done for pthreads and openmp, for example. |
19839
d3dcc62512d7
do a better job of saving and restoring compiler flags (bug #44353)
John W. Eaton <jwe@octave.org>
parents:
19838
diff
changeset
|
389 original_octave_configure_CFLAGS="$CFLAGS" |
d3dcc62512d7
do a better job of saving and restoring compiler flags (bug #44353)
John W. Eaton <jwe@octave.org>
parents:
19838
diff
changeset
|
390 original_octave_configure_CXXFLAGS="$CXXFLAGS" |
d3dcc62512d7
do a better job of saving and restoring compiler flags (bug #44353)
John W. Eaton <jwe@octave.org>
parents:
19838
diff
changeset
|
391 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
392 ## Check for MSVC |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
393 have_msvc=no |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
394 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
395 msdosmsvc) |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
396 have_msvc=yes |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
397 ;; |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
398 mingw*) |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
399 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
|
400 AC_PREPROC_IFELSE([AC_LANG_SOURCE([[ |
21724
aba2e6293dd8
use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents:
21681
diff
changeset
|
401 #if ! defined (_MSC_VER) |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
402 #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
|
403 #endif |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
404 ]])], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
405 have_msvc=yes, have_msvc=no) |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
406 AC_MSG_RESULT([$have_msvc]) |
405 | 407 ;; |
5 | 408 esac |
869 | 409 |
15142
f4684192158e
configure.ac: Split gnulib initialization into 2 parts to match recommended usage.
Rik <rik@octave.org>
parents:
15141
diff
changeset
|
410 ### 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
|
411 ### Must take place immediately after a compiler is determined |
9946 | 412 |
413 gl_EARLY | |
414 | |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
415 ### Check version number when using gcc. |
869 | 416 |
15167
1c711a646fa7
Deprecate configure variables CC_VERSION, CXX_VERSION.
Rik <rik@octave.org>
parents:
15166
diff
changeset
|
417 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
|
418 if test "$GCC" = yes; then |
17878
0d660785098e
work around GCC bug in stl_algo.h (nth_element and sort; bug #40436)
John W. Eaton <jwe@octave.org>
parents:
17877
diff
changeset
|
419 AC_MSG_CHECKING([C compiler version number]) |
17661
1978a6c76aa9
Use user-specified SED during build process (bug #40273).
Rik <rik@octave.org>
parents:
17640
diff
changeset
|
420 gcc_version=`$CC -v 2>&1 | $GREP "^.*gcc version" | \ |
1978a6c76aa9
Use user-specified SED during build process (bug #40273).
Rik <rik@octave.org>
parents:
17640
diff
changeset
|
421 $SED -e 's/^.*g.. version *//' -e 's/cygnus-//' -e 's/egcs-//' -e 's/ .*//'` |
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
|
422 |
15170
a44ff4f0a20b
Add AX_COMPARE_VERSION.m4 macro m4/ dir to make configure.ac simpler.
Rik <rik@octave.org>
parents:
15168
diff
changeset
|
423 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
|
424 [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
|
425 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
|
426 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
427 GCC_VERSION=$gcc_version |
17878
0d660785098e
work around GCC bug in stl_algo.h (nth_element and sort; bug #40436)
John W. Eaton <jwe@octave.org>
parents:
17877
diff
changeset
|
428 AC_MSG_RESULT([$GCC_VERSION]) |
1894 | 429 fi |
17877
540d1c122b08
* configure.ac: Also check for g++ version.
John W. Eaton <jwe@octave.org>
parents:
17844
diff
changeset
|
430 AC_SUBST(GCC_VERSION) |
1894 | 431 |
19353
dbde327460be
configure.ac: Remove redundant check for GXX_VERSION. Raise required version to 4.1.
Rik <rik@octave.org>
parents:
19352
diff
changeset
|
432 ### Check version number when using g++ . |
dbde327460be
configure.ac: Remove redundant check for GXX_VERSION. Raise required version to 4.1.
Rik <rik@octave.org>
parents:
19352
diff
changeset
|
433 ### It might be different from the gcc version number. |
17877
540d1c122b08
* configure.ac: Also check for g++ version.
John W. Eaton <jwe@octave.org>
parents:
17844
diff
changeset
|
434 |
540d1c122b08
* configure.ac: Also check for g++ version.
John W. Eaton <jwe@octave.org>
parents:
17844
diff
changeset
|
435 GXX_VERSION= |
540d1c122b08
* configure.ac: Also check for g++ version.
John W. Eaton <jwe@octave.org>
parents:
17844
diff
changeset
|
436 if test "$GXX" = yes; then |
17878
0d660785098e
work around GCC bug in stl_algo.h (nth_element and sort; bug #40436)
John W. Eaton <jwe@octave.org>
parents:
17877
diff
changeset
|
437 AC_MSG_CHECKING([C++ compiler version number]) |
0d660785098e
work around GCC bug in stl_algo.h (nth_element and sort; bug #40436)
John W. Eaton <jwe@octave.org>
parents:
17877
diff
changeset
|
438 gxx_version=`$CXX -v 2>&1 | $GREP "^.*g.. version" | \ |
17877
540d1c122b08
* configure.ac: Also check for g++ version.
John W. Eaton <jwe@octave.org>
parents:
17844
diff
changeset
|
439 $SED -e 's/^.*g.. version *//' -e 's/cygnus-//' -e 's/egcs-//' -e 's/ .*//'` |
540d1c122b08
* configure.ac: Also check for g++ version.
John W. Eaton <jwe@octave.org>
parents:
17844
diff
changeset
|
440 |
19353
dbde327460be
configure.ac: Remove redundant check for GXX_VERSION. Raise required version to 4.1.
Rik <rik@octave.org>
parents:
19352
diff
changeset
|
441 AX_COMPARE_VERSION([$gxx_version], [lt], [4.1], |
17877
540d1c122b08
* configure.ac: Also check for g++ version.
John W. Eaton <jwe@octave.org>
parents:
17844
diff
changeset
|
442 [warn_gxx_version="g++ version $gxx_version is likely to cause problems" |
540d1c122b08
* configure.ac: Also check for g++ version.
John W. Eaton <jwe@octave.org>
parents:
17844
diff
changeset
|
443 OCTAVE_CONFIGURE_WARNING([warn_gxx_version])]) |
540d1c122b08
* configure.ac: Also check for g++ version.
John W. Eaton <jwe@octave.org>
parents:
17844
diff
changeset
|
444 |
540d1c122b08
* configure.ac: Also check for g++ version.
John W. Eaton <jwe@octave.org>
parents:
17844
diff
changeset
|
445 GXX_VERSION=$gxx_version |
17878
0d660785098e
work around GCC bug in stl_algo.h (nth_element and sort; bug #40436)
John W. Eaton <jwe@octave.org>
parents:
17877
diff
changeset
|
446 AC_MSG_RESULT([$GXX_VERSION]) |
17877
540d1c122b08
* configure.ac: Also check for g++ version.
John W. Eaton <jwe@octave.org>
parents:
17844
diff
changeset
|
447 fi |
540d1c122b08
* configure.ac: Also check for g++ version.
John W. Eaton <jwe@octave.org>
parents:
17844
diff
changeset
|
448 AC_SUBST(GXX_VERSION) |
3775 | 449 |
17878
0d660785098e
work around GCC bug in stl_algo.h (nth_element and sort; bug #40436)
John W. Eaton <jwe@octave.org>
parents:
17877
diff
changeset
|
450 OCTAVE_CHECK_BROKEN_STL_ALGO_H |
0d660785098e
work around GCC bug in stl_algo.h (nth_element and sort; bug #40436)
John W. Eaton <jwe@octave.org>
parents:
17877
diff
changeset
|
451 AM_CONDITIONAL([AMCOND_HAVE_BROKEN_STL_ALGO_H], |
0d660785098e
work around GCC bug in stl_algo.h (nth_element and sort; bug #40436)
John W. Eaton <jwe@octave.org>
parents:
17877
diff
changeset
|
452 [test $octave_cv_broken_stl_algo_h = yes]) |
0d660785098e
work around GCC bug in stl_algo.h (nth_element and sort; bug #40436)
John W. Eaton <jwe@octave.org>
parents:
17877
diff
changeset
|
453 |
17888
11a6c7445a71
fix m4 quoting in test and improve warning messages for stl_algo.h problem
John W. Eaton <jwe@octave.org>
parents:
17878
diff
changeset
|
454 if test $octave_cv_broken_stl_algo_h = yes; then |
11a6c7445a71
fix m4 quoting in test and improve warning messages for stl_algo.h problem
John W. Eaton <jwe@octave.org>
parents:
17878
diff
changeset
|
455 warn_stl_algo_h="Found nth_element broken in g++ $GXX_VERSION. Attempting to repair by using local patched version of bits/stl_algo.h." |
11a6c7445a71
fix m4 quoting in test and improve warning messages for stl_algo.h problem
John W. Eaton <jwe@octave.org>
parents:
17878
diff
changeset
|
456 OCTAVE_CONFIGURE_WARNING([warn_stl_algo_h]) |
11a6c7445a71
fix m4 quoting in test and improve warning messages for stl_algo.h problem
John W. Eaton <jwe@octave.org>
parents:
17878
diff
changeset
|
457 fi |
11a6c7445a71
fix m4 quoting in test and improve warning messages for stl_algo.h problem
John W. Eaton <jwe@octave.org>
parents:
17878
diff
changeset
|
458 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
459 ### Determine the compiler flag necessary to create dependencies |
3775 | 460 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
461 ## Assume GCC. |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
462 INCLUDE_DEPS=yes |
3775 | 463 DEPEND_FLAGS="-M" |
464 DEPEND_EXTRA_SED_PATTERN="" | |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
465 if test "$GCC" != yes; then |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
466 case $canonical_host_type in |
6087 | 467 sparc-sun-solaris2* | i386-pc-solaris2*) |
3775 | 468 DEPEND_FLAGS="-xM1" |
469 DEPEND_EXTRA_SED_PATTERN="-e '/\/opt\/SUNWspro/d'" | |
6087 | 470 ;; |
7451 | 471 *-*-msdosmsvc) |
472 ;; | |
10123
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
473 *-*-mingw*) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
474 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
|
475 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
|
476 fi |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
477 ;; |
6087 | 478 *) |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
479 INCLUDE_DEPS=no |
6087 | 480 ;; |
481 esac | |
482 fi | |
483 AC_SUBST(INCLUDE_DEPS) | |
3775 | 484 AC_SUBST(DEPEND_FLAGS) |
485 AC_SUBST(DEPEND_EXTRA_SED_PATTERN) | |
486 | |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
487 ### Check for pthread library |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
488 |
10951 | 489 AX_PTHREAD |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
490 ## 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
|
491 ## 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
|
492 LIBS="$PTHREAD_LIBS $LIBS" |
19830
d0c7b5346d55
use XTRA_CFLAGS and XTRA_CXXFLAGS for pthread and openmp flags
John W. Eaton <jwe@octave.org>
parents:
19828
diff
changeset
|
493 XTRA_CFLAGS="$XTRA_CFLAGS $PTHREAD_CFLAGS" |
d0c7b5346d55
use XTRA_CFLAGS and XTRA_CXXFLAGS for pthread and openmp flags
John W. Eaton <jwe@octave.org>
parents:
19828
diff
changeset
|
494 XTRA_CXXFLAGS="$XTRA_CXXFLAGS $PTHREAD_CFLAGS" |
d0c7b5346d55
use XTRA_CFLAGS and XTRA_CXXFLAGS for pthread and openmp flags
John W. Eaton <jwe@octave.org>
parents:
19828
diff
changeset
|
495 ## Set these for any other tests that may require them. They will be |
d0c7b5346d55
use XTRA_CFLAGS and XTRA_CXXFLAGS for pthread and openmp flags
John W. Eaton <jwe@octave.org>
parents:
19828
diff
changeset
|
496 ## reset before output files are generated. |
9970
cc7ea6083774
configure.ac: use pthread flags and libs for tests
John W. Eaton <jwe@octave.org>
parents:
9946
diff
changeset
|
497 CFLAGS="$CFLAGS $PTHREAD_CFLAGS" |
15123
4e0ab3b28418
Eliminate duplicate PTHREAD_CFLAGS inclusion in build process.
Rik <rik@octave.org>
parents:
15071
diff
changeset
|
498 CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS" |
8595
dee5d60257e4
Use Carbon framework to determine ScreenSize on Mac.
Thomas Treichl <Thomas.Treichl@gmx.net>
parents:
8577
diff
changeset
|
499 |
19830
d0c7b5346d55
use XTRA_CFLAGS and XTRA_CXXFLAGS for pthread and openmp flags
John W. Eaton <jwe@octave.org>
parents:
19828
diff
changeset
|
500 ### Test whether the compiler supports OpenMP. This is enabled by default |
d0c7b5346d55
use XTRA_CFLAGS and XTRA_CXXFLAGS for pthread and openmp flags
John W. Eaton <jwe@octave.org>
parents:
19828
diff
changeset
|
501 ### now to allow the option of using OpenMP in loadable modules. |
d0c7b5346d55
use XTRA_CFLAGS and XTRA_CXXFLAGS for pthread and openmp flags
John W. Eaton <jwe@octave.org>
parents:
19828
diff
changeset
|
502 |
21131
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
503 ENABLE_OPENMP=no |
19830
d0c7b5346d55
use XTRA_CFLAGS and XTRA_CXXFLAGS for pthread and openmp flags
John W. Eaton <jwe@octave.org>
parents:
19828
diff
changeset
|
504 check_for_openmp=yes |
d0c7b5346d55
use XTRA_CFLAGS and XTRA_CXXFLAGS for pthread and openmp flags
John W. Eaton <jwe@octave.org>
parents:
19828
diff
changeset
|
505 AC_ARG_ENABLE([openmp], |
d0c7b5346d55
use XTRA_CFLAGS and XTRA_CXXFLAGS for pthread and openmp flags
John W. Eaton <jwe@octave.org>
parents:
19828
diff
changeset
|
506 [AS_HELP_STRING([--disable-openmp], |
d0c7b5346d55
use XTRA_CFLAGS and XTRA_CXXFLAGS for pthread and openmp flags
John W. Eaton <jwe@octave.org>
parents:
19828
diff
changeset
|
507 [disable OpenMP SMP multi-threading])], |
d0c7b5346d55
use XTRA_CFLAGS and XTRA_CXXFLAGS for pthread and openmp flags
John W. Eaton <jwe@octave.org>
parents:
19828
diff
changeset
|
508 [if test "$enableval" = no; then check_for_openmp=no; fi], []) |
d0c7b5346d55
use XTRA_CFLAGS and XTRA_CXXFLAGS for pthread and openmp flags
John W. Eaton <jwe@octave.org>
parents:
19828
diff
changeset
|
509 if test $check_for_openmp = yes; then |
d0c7b5346d55
use XTRA_CFLAGS and XTRA_CXXFLAGS for pthread and openmp flags
John W. Eaton <jwe@octave.org>
parents:
19828
diff
changeset
|
510 AC_LANG_PUSH(C) |
21131
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
511 AX_OPENMP([XTRA_CFLAGS="$XTRA_CFLAGS $OPENMP_CFLAGS"; ENABLE_OPENMP=yes], []) |
19830
d0c7b5346d55
use XTRA_CFLAGS and XTRA_CXXFLAGS for pthread and openmp flags
John W. Eaton <jwe@octave.org>
parents:
19828
diff
changeset
|
512 AC_LANG_POP(C) |
d0c7b5346d55
use XTRA_CFLAGS and XTRA_CXXFLAGS for pthread and openmp flags
John W. Eaton <jwe@octave.org>
parents:
19828
diff
changeset
|
513 AC_LANG_PUSH(C++) |
21131
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
514 AX_OPENMP([XTRA_CXXFLAGS="$XTRA_CXXFLAGS $OPENMP_CXXFLAGS"; ENABLE_OPENMP=yes], []) |
19830
d0c7b5346d55
use XTRA_CFLAGS and XTRA_CXXFLAGS for pthread and openmp flags
John W. Eaton <jwe@octave.org>
parents:
19828
diff
changeset
|
515 AC_LANG_POP(C++) |
d0c7b5346d55
use XTRA_CFLAGS and XTRA_CXXFLAGS for pthread and openmp flags
John W. Eaton <jwe@octave.org>
parents:
19828
diff
changeset
|
516 fi |
21554
9f0088f3f335
call openmp function at initialization (bug #47372)
John W. Eaton <jwe@octave.org>
parents:
21514
diff
changeset
|
517 |
19830
d0c7b5346d55
use XTRA_CFLAGS and XTRA_CXXFLAGS for pthread and openmp flags
John W. Eaton <jwe@octave.org>
parents:
19828
diff
changeset
|
518 ## Set these for any other tests that may require them. They will be |
d0c7b5346d55
use XTRA_CFLAGS and XTRA_CXXFLAGS for pthread and openmp flags
John W. Eaton <jwe@octave.org>
parents:
19828
diff
changeset
|
519 ## reset before output files are generated. |
d0c7b5346d55
use XTRA_CFLAGS and XTRA_CXXFLAGS for pthread and openmp flags
John W. Eaton <jwe@octave.org>
parents:
19828
diff
changeset
|
520 CFLAGS="$CFLAGS $OPENMP_CFLAGS" |
d0c7b5346d55
use XTRA_CFLAGS and XTRA_CXXFLAGS for pthread and openmp flags
John W. Eaton <jwe@octave.org>
parents:
19828
diff
changeset
|
521 CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS" |
d0c7b5346d55
use XTRA_CFLAGS and XTRA_CXXFLAGS for pthread and openmp flags
John W. Eaton <jwe@octave.org>
parents:
19828
diff
changeset
|
522 |
21554
9f0088f3f335
call openmp function at initialization (bug #47372)
John W. Eaton <jwe@octave.org>
parents:
21514
diff
changeset
|
523 dnl Define here since it is skipped if the first argument to |
9f0088f3f335
call openmp function at initialization (bug #47372)
John W. Eaton <jwe@octave.org>
parents:
21514
diff
changeset
|
524 dnl AX_OPENMP is not empty. |
21556 | 525 if test $ENABLE_OPENMP = yes; then |
21554
9f0088f3f335
call openmp function at initialization (bug #47372)
John W. Eaton <jwe@octave.org>
parents:
21514
diff
changeset
|
526 AC_CHECK_HEADERS([omp.h]) |
9f0088f3f335
call openmp function at initialization (bug #47372)
John W. Eaton <jwe@octave.org>
parents:
21514
diff
changeset
|
527 AC_CHECK_FUNCS([omp_get_num_threads]) |
21556 | 528 AC_DEFINE(OCTAVE_ENABLE_OPENMP, 1, [Define if OpenMP is enabled]) |
21554
9f0088f3f335
call openmp function at initialization (bug #47372)
John W. Eaton <jwe@octave.org>
parents:
21514
diff
changeset
|
529 fi |
9f0088f3f335
call openmp function at initialization (bug #47372)
John W. Eaton <jwe@octave.org>
parents:
21514
diff
changeset
|
530 |
9603
8bea4e89326f
implement FLOAT_STORE to allow safer complex comparisons on x87
Jaroslav Hajek <highegg@gmail.com>
parents:
9596
diff
changeset
|
531 ### When compiling math for x87, problems may arise in some code comparing |
17924
82f096e1a805
configure.ac: If not specified, use --enable-float-truncate for MinGW and Cygwin.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
532 ### floating-point intermediate results. The root cause is the extra precision |
82f096e1a805
configure.ac: If not specified, use --enable-float-truncate for MinGW and Cygwin.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
533 ### (~80 bits) of x87 co-processor registers versus the IEEE standard 64 bits. |
82f096e1a805
configure.ac: If not specified, use --enable-float-truncate for MinGW and Cygwin.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
534 ### Generally, storing the result in a local volatile variable forces a |
82f096e1a805
configure.ac: If not specified, use --enable-float-truncate for MinGW and Cygwin.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
535 ### truncation back to 64 bits, but it also degrades performance. |
19965
d20dd211cc89
Enable float truncation by default for octave builds.
Rik <rik@octave.org>
parents:
19964
diff
changeset
|
536 ### However, this performance degradation is very minimal, if indeed measurable. |
d20dd211cc89
Enable float truncation by default for octave builds.
Rik <rik@octave.org>
parents:
19964
diff
changeset
|
537 ### Therefore, it has been enabled for all platforms and compilers. |
d20dd211cc89
Enable float truncation by default for octave builds.
Rik <rik@octave.org>
parents:
19964
diff
changeset
|
538 ### Reported bugs indicate that --enable-float-truncate is required for MinGW |
d20dd211cc89
Enable float truncation by default for octave builds.
Rik <rik@octave.org>
parents:
19964
diff
changeset
|
539 ### and Cygwin platforms and for GCC compilers >= 5.0. It should not be |
d20dd211cc89
Enable float truncation by default for octave builds.
Rik <rik@octave.org>
parents:
19964
diff
changeset
|
540 ### necessary for non-x87 targets or when using modern SSE math. |
21131
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
541 ENABLE_FLOAT_TRUNCATE=yes |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
542 AC_ARG_ENABLE([float-truncate], |
19965
d20dd211cc89
Enable float truncation by default for octave builds.
Rik <rik@octave.org>
parents:
19964
diff
changeset
|
543 [AS_HELP_STRING([--disable-float-truncate], |
18142
d9a9e13826e6
configure.ac: Rephrase help message for --enable-float-truncate.
Rik <rik@octave.org>
parents:
18087
diff
changeset
|
544 [truncate intermediate FP results])], |
21131
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
545 [if test "$enableval" = no; then ENABLE_FLOAT_TRUNCATE=no; fi], []) |
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
546 if test $ENABLE_FLOAT_TRUNCATE = yes; then |
21229
a83e7a384ee0
create and install a subset of config.h in octave-config.h
John W. Eaton <jwe@octave.org>
parents:
21211
diff
changeset
|
547 AC_DEFINE(OCTAVE_ENABLE_FLOAT_TRUNCATE, 1, |
21131
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
548 [Define to 1 if you need to truncate intermediate FP results.]) |
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
549 fi |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
550 |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
551 ### 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
|
552 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
553 ## 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
|
554 ## 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
|
555 ## |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
556 ## On Alpha/OSF systems, we need -mieee. |
869 | 557 |
3126 | 558 ieee_fp_flag= |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
559 case $canonical_host_type in |
3887 | 560 i[[3456789]]86-*-*) |
5076 | 561 if test "$GCC" = yes; then |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
562 OCTAVE_CC_FLAG([-mieee-fp], [ |
5076 | 563 ieee_fp_flag=-mieee-fp |
564 XTRA_CFLAGS="$XTRA_CFLAGS -mieee-fp" | |
5844 | 565 AC_MSG_NOTICE([adding -mieee-fp to XTRA_CFLAGS])]) |
5076 | 566 fi |
567 if test "$GXX" = yes; then | |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
568 OCTAVE_CXX_FLAG([-mieee-fp], [ |
12451 | 569 ieee_fp_flag=-mieee-fp |
570 XTRA_CXXFLAGS="$XTRA_CXXFLAGS -mieee-fp" | |
571 AC_MSG_NOTICE([adding -mieee-fp to XTRA_CXXFLAGS])]) | |
5076 | 572 fi |
324 | 573 ;; |
3127 | 574 alpha*-*-*) |
4284 | 575 if test "$GCC" = yes; then |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
576 OCTAVE_CC_FLAG([-mieee], [ |
12451 | 577 ieee_fp_flag=-mieee |
578 XTRA_CFLAGS="$XTRA_CFLAGS -mieee" | |
579 AC_MSG_NOTICE([adding -mieee to XTRA_CFLAGS])]) | |
5076 | 580 else |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
581 OCTAVE_CC_FLAG([-ieee], [ |
12451 | 582 ieee_fp_flag=-ieee |
583 XTRA_CFLAGS="$XTRA_CFLAGS -ieee" | |
584 AC_MSG_NOTICE([adding -ieee to XTRA_CFLAGS])]) | |
5076 | 585 fi |
586 if test "$GXX" = yes; then | |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
587 OCTAVE_CXX_FLAG([-mieee], [ |
12451 | 588 ieee_fp_flag=-mieee |
589 XTRA_CXXFLAGS="$XTRA_CXXFLAGS -mieee" | |
590 AC_MSG_NOTICE([adding -mieee to XTRA_CXXFLAGS])]) | |
4284 | 591 else |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
592 OCTAVE_CXX_FLAG([-ieee], [ |
12451 | 593 ieee_fp_flag=-ieee |
594 XTRA_CXXFLAGS="$XTRA_CXXFLAGS -ieee" | |
595 AC_MSG_NOTICE([adding -ieee to XTRA_CXXFLAGS])]) | |
4284 | 596 fi |
2020 | 597 ;; |
3176 | 598 *ibm-aix4*) |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
599 OCTAVE_CC_FLAG([-mminimal-toc], [ |
3351 | 600 XTRA_CFLAGS="$XTRA_CFLAGS -mminimal-toc"]) |
3176 | 601 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
602 OCTAVE_CXX_FLAG([-mminimal-toc], [ |
3351 | 603 XTRA_CXXFLAGS="$XTRA_CXXFLAGS -mminimal-toc"]) |
3176 | 604 ;; |
324 | 605 esac |
3126 | 606 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
607 AC_SUBST(XTRA_CFLAGS) |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
608 AC_SUBST(XTRA_CXXFLAGS) |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
609 |
4094 | 610 ### Defaults for cross compiling. BUILD_CC and BUILD_CXX are |
611 ### the compilers that we use for building tools on the build system. | |
4098 | 612 ### For now, we assume that the only cross compiling we can do is |
4298 | 613 ### with gcc on a Unixy system, but the dedicated hacker can override these. |
4094 | 614 |
615 if test "$cross_compiling" = yes; then | |
616 BUILD_CC="gcc" | |
617 BUILD_CFLAGS="-O2 -g" | |
618 BUILD_CXX="g++" | |
619 BUILD_CXXFLAGS="-O2 -g" | |
4298 | 620 BUILD_LDFLAGS="" |
4098 | 621 BUILD_EXEEXT="" |
4094 | 622 else |
21409
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
623 BUILD_CC="${CC}" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
624 BUILD_CFLAGS="${CFLAGS}" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
625 BUILD_CXX="${CXX}" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
626 BUILD_CXXFLAGS="${CXXFLAGS}" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
627 BUILD_LDFLAGS="${LDFLAGS}" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
628 BUILD_EXEEXT="${EXEEXT}" |
4094 | 629 fi |
630 | |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
631 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
|
632 [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
|
633 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
|
634 [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
|
635 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
|
636 [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
|
637 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
|
638 [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
|
639 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
|
640 [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
|
641 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
|
642 [build system executable extension (used if cross compiling)]) |
3222 | 643 |
3232 | 644 |
645 ### Look for math library. If found, this will add -lm to LIBS. | |
646 | |
15875
c18692212b90
configure.ac: Simplify test for math library.
Rik <rik@octave.org>
parents:
15874
diff
changeset
|
647 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
|
648 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
|
649 AC_CHECK_LIB(m, sin) |
3232 | 650 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
651 ### Determine the Fortran compiler and how to invoke it |
3232 | 652 |
19364 | 653 ## Prefer gfortran, but the user's F77 environment variable will override. |
654 AC_PROG_F77([gfortran]) | |
655 if test -z "$F77"; then | |
656 ## No gfortran found, search for any other installed compiler. | |
657 AC_PROG_F77 | |
658 fi | |
659 if test "$F77" = g77; then | |
660 AC_MSG_ERROR([g77 is not a supported Fortran compiler. Select another compiler by setting the environment variable F77 and re-running configure.]) | |
661 fi | |
662 | |
19862
6b851f6acd55
configure.ac: Remove a few more test x"" instances.
Rik <rik@octave.org>
parents:
19860
diff
changeset
|
663 AC_MSG_CHECKING([whether a usable Fortran compiler was found]) |
6b851f6acd55
configure.ac: Remove a few more test x"" instances.
Rik <rik@octave.org>
parents:
19860
diff
changeset
|
664 if test -n "$F77"; then |
6b851f6acd55
configure.ac: Remove a few more test x"" instances.
Rik <rik@octave.org>
parents:
19860
diff
changeset
|
665 AC_MSG_RESULT(yes) |
6b851f6acd55
configure.ac: Remove a few more test x"" instances.
Rik <rik@octave.org>
parents:
19860
diff
changeset
|
666 else |
19860
e8ccfc5d892b
Improved configure error handling when missing Fortran compiler (bug #44367)
Claudius Zingerli <czingerl@gmail.com> (edited by Jordi Gutiérrez Hermoso <jordigh@octave.org>)
parents:
19841
diff
changeset
|
667 AC_MSG_RESULT(no) |
19862
6b851f6acd55
configure.ac: Remove a few more test x"" instances.
Rik <rik@octave.org>
parents:
19860
diff
changeset
|
668 AC_MSG_ERROR([A Fortran compiler is required]) |
19860
e8ccfc5d892b
Improved configure error handling when missing Fortran compiler (bug #44367)
Claudius Zingerli <czingerl@gmail.com> (edited by Jordi Gutiérrez Hermoso <jordigh@octave.org>)
parents:
19841
diff
changeset
|
669 fi |
e8ccfc5d892b
Improved configure error handling when missing Fortran compiler (bug #44367)
Claudius Zingerli <czingerl@gmail.com> (edited by Jordi Gutiérrez Hermoso <jordigh@octave.org>)
parents:
19841
diff
changeset
|
670 |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
671 AC_F77_LIBRARY_LDFLAGS |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
672 AC_F77_DUMMY_MAIN |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
673 AC_F77_WRAPPERS |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
674 |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
675 F77_TOLOWER=yes |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
676 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
|
677 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
|
678 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
679 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
|
680 "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
|
681 esac |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
682 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
|
683 "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
|
684 esac |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
685 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
|
686 "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
|
687 esac |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
688 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
689 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
|
690 i[[3456789]]86-*-*) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
691 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
|
692 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
|
693 fi |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
694 ;; |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
695 alpha*-*-*) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
696 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
|
697 OCTAVE_F77_FLAG([-mieee]) |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
698 else |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
699 OCTAVE_F77_FLAG([-ieee]) |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
700 OCTAVE_F77_FLAG([-fpe1]) |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
701 fi |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
702 ;; |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
703 powerpc-apple-machten*) |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
704 FFLAGS= |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
705 ;; |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
706 esac |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
707 |
22134
a51d5c5c71e6
handle gfortran and f2c calling conventions separately
John W. Eaton <jwe@octave.org>
parents:
22110
diff
changeset
|
708 if test $ac_cv_f77_compiler_gnu = yes; then |
a51d5c5c71e6
handle gfortran and f2c calling conventions separately
John W. Eaton <jwe@octave.org>
parents:
22110
diff
changeset
|
709 FORTRAN_CALLING_CONVENTION=gfortran |
a51d5c5c71e6
handle gfortran and f2c calling conventions separately
John W. Eaton <jwe@octave.org>
parents:
22110
diff
changeset
|
710 else |
a51d5c5c71e6
handle gfortran and f2c calling conventions separately
John W. Eaton <jwe@octave.org>
parents:
22110
diff
changeset
|
711 FORTRAN_CALLING_CONVENTION=unknown |
a51d5c5c71e6
handle gfortran and f2c calling conventions separately
John W. Eaton <jwe@octave.org>
parents:
22110
diff
changeset
|
712 fi |
a51d5c5c71e6
handle gfortran and f2c calling conventions separately
John W. Eaton <jwe@octave.org>
parents:
22110
diff
changeset
|
713 AC_ARG_ENABLE([fortran-calling-convention], |
a51d5c5c71e6
handle gfortran and f2c calling conventions separately
John W. Eaton <jwe@octave.org>
parents:
22110
diff
changeset
|
714 [AS_HELP_STRING([--enable-fortran-calling-convention=OPTION], |
a51d5c5c71e6
handle gfortran and f2c calling conventions separately
John W. Eaton <jwe@octave.org>
parents:
22110
diff
changeset
|
715 [Select C++ to Fortran calling convention. "gfortran" should be detected automatically. Other options are "cray", "visual-fortran", or "f2c".])], |
a51d5c5c71e6
handle gfortran and f2c calling conventions separately
John W. Eaton <jwe@octave.org>
parents:
22110
diff
changeset
|
716 [FORTRAN_CALLING_CONVENTION="$enableval"], []) |
a51d5c5c71e6
handle gfortran and f2c calling conventions separately
John W. Eaton <jwe@octave.org>
parents:
22110
diff
changeset
|
717 |
a51d5c5c71e6
handle gfortran and f2c calling conventions separately
John W. Eaton <jwe@octave.org>
parents:
22110
diff
changeset
|
718 case "$FORTRAN_CALLING_CONVENTION" in |
a51d5c5c71e6
handle gfortran and f2c calling conventions separately
John W. Eaton <jwe@octave.org>
parents:
22110
diff
changeset
|
719 gfortran) |
a51d5c5c71e6
handle gfortran and f2c calling conventions separately
John W. Eaton <jwe@octave.org>
parents:
22110
diff
changeset
|
720 AC_DEFINE(F77_USES_GFORTRAN_CALLING_CONVENTION, 1, [Define to 1 if calling Fortran from C++ should use the gfortran calling convention.]) |
a51d5c5c71e6
handle gfortran and f2c calling conventions separately
John W. Eaton <jwe@octave.org>
parents:
22110
diff
changeset
|
721 ;; |
a51d5c5c71e6
handle gfortran and f2c calling conventions separately
John W. Eaton <jwe@octave.org>
parents:
22110
diff
changeset
|
722 cray) |
a51d5c5c71e6
handle gfortran and f2c calling conventions separately
John W. Eaton <jwe@octave.org>
parents:
22110
diff
changeset
|
723 AC_DEFINE(F77_USES_CRAY_CALLING_CONVENTION, 1, [Define to 1 if calling Fortran from C++ should use the Cray Fortran calling convention.]) |
a51d5c5c71e6
handle gfortran and f2c calling conventions separately
John W. Eaton <jwe@octave.org>
parents:
22110
diff
changeset
|
724 ;; |
a51d5c5c71e6
handle gfortran and f2c calling conventions separately
John W. Eaton <jwe@octave.org>
parents:
22110
diff
changeset
|
725 visual-fortran) |
a51d5c5c71e6
handle gfortran and f2c calling conventions separately
John W. Eaton <jwe@octave.org>
parents:
22110
diff
changeset
|
726 AC_DEFINE(F77_USES_VISUAL_FORTRAN_CALLING_CONVENTION, 1, [Define to 1 if calling Fortran from C++ should use the Visual Fortran calling convention.]) |
a51d5c5c71e6
handle gfortran and f2c calling conventions separately
John W. Eaton <jwe@octave.org>
parents:
22110
diff
changeset
|
727 ;; |
a51d5c5c71e6
handle gfortran and f2c calling conventions separately
John W. Eaton <jwe@octave.org>
parents:
22110
diff
changeset
|
728 f2c) |
a51d5c5c71e6
handle gfortran and f2c calling conventions separately
John W. Eaton <jwe@octave.org>
parents:
22110
diff
changeset
|
729 AC_DEFINE(F77_USES_F2C_CALLING_CONVENTION, 1, [Define to 1 if calling Fortran from C++ should use the f2c calling convention.]) |
a51d5c5c71e6
handle gfortran and f2c calling conventions separately
John W. Eaton <jwe@octave.org>
parents:
22110
diff
changeset
|
730 ;; |
a51d5c5c71e6
handle gfortran and f2c calling conventions separately
John W. Eaton <jwe@octave.org>
parents:
22110
diff
changeset
|
731 *) |
a51d5c5c71e6
handle gfortran and f2c calling conventions separately
John W. Eaton <jwe@octave.org>
parents:
22110
diff
changeset
|
732 AC_MSG_ERROR([to build Octave, the C++ to Fortran calling convention must be known.]) |
a51d5c5c71e6
handle gfortran and f2c calling conventions separately
John W. Eaton <jwe@octave.org>
parents:
22110
diff
changeset
|
733 ;; |
a51d5c5c71e6
handle gfortran and f2c calling conventions separately
John W. Eaton <jwe@octave.org>
parents:
22110
diff
changeset
|
734 esac |
a51d5c5c71e6
handle gfortran and f2c calling conventions separately
John W. Eaton <jwe@octave.org>
parents:
22110
diff
changeset
|
735 |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
736 if test -n "$FFLAGS"; then |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
737 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
|
738 fi |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
739 |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
740 AC_SUBST(F77_TOLOWER) |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
741 AC_SUBST(F77_APPEND_UNDERSCORE) |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
742 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
|
743 |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
744 if test -z "$F77"; then |
22134
a51d5c5c71e6
handle gfortran and f2c calling conventions separately
John W. Eaton <jwe@octave.org>
parents:
22110
diff
changeset
|
745 AC_MSG_ERROR([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
|
746 fi |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
747 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
748 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
|
749 F77_ISNAN_MACRO= |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
750 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
|
751 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
|
752 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
|
753 fi |
14550
bc4c574ab3b6
Add configure check for isnan in fortran.
Carlo de Falco <cdf@users.sourceforge.net>
parents:
14398
diff
changeset
|
754 AC_SUBST(F77_ISNAN_MACRO) |
bc4c574ab3b6
Add configure check for isnan in fortran.
Carlo de Falco <cdf@users.sourceforge.net>
parents:
14398
diff
changeset
|
755 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
756 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
|
757 if test $octave_cv_sizeof_fortran_integer = no; then |
21131
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
758 if test $ENABLE_64 = yes; then |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
759 case $F77 in |
10331
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
760 *gfortran*) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
761 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
|
762 *-fdefault-integer-8*) |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
763 ;; |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
764 *) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
765 case $FFLAGS in |
10331
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
766 *-fdefault-integer-8*) |
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
767 AC_MSG_NOTICE([setting -fdefault-integer-8 in F77_INTEGER_8_FLAG instead of FFLAGS]) |
17661
1978a6c76aa9
Use user-specified SED during build process (bug #40273).
Rik <rik@octave.org>
parents:
17640
diff
changeset
|
768 FFLAGS=`echo $FFLAGS | $SED 's/-fdefault-integer-8//g'` |
10331
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
769 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
|
770 ;; |
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
771 *) |
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
772 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
|
773 F77_INTEGER_8_FLAG="-fdefault-integer-8" |
12451 | 774 ## Invalidate the cache and try again. |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
775 $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
|
776 ;; |
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
777 esac |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
778 ;; |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
779 esac |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
780 ;; |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
781 esac |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
782 if test -z "$octave_cv_sizeof_fortran_integer"; then |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
783 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
|
784 fi |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
785 if test $octave_cv_sizeof_fortran_integer = no; then |
22134
a51d5c5c71e6
handle gfortran and f2c calling conventions separately
John W. Eaton <jwe@octave.org>
parents:
22110
diff
changeset
|
786 AC_MSG_ERROR([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
|
787 fi |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
788 else |
10331
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
789 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
|
790 fi |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
791 fi |
10331
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
792 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
|
793 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
794 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
|
795 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
|
796 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
|
797 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
|
798 ]) |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
799 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
800 ### 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
|
801 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
802 OCTAVE_CHECK_LIB(qhull, QHull, |
19351
2d8728156ba4
configure.ac: Check qhull warning message style to match all other libs.
Rik <rik@octave.org>
parents:
19350
diff
changeset
|
803 [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
|
804 [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
|
805 [qh_qhull], [], [], |
9519
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
806 [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
|
807 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
|
808 OCTAVE_CHECK_LIB_QHULL_OK( |
19355
22289e6e316e
build: Remove unused TEXINFO_LIBNAME definitions from Makefiles.
Rik <rik@octave.org>
parents:
19353
diff
changeset
|
809 [AC_DEFINE(HAVE_QHULL, 1, [Define to 1 if Qhull is available.])], |
19351
2d8728156ba4
configure.ac: Check qhull warning message style to match all other libs.
Rik <rik@octave.org>
parents:
19350
diff
changeset
|
810 [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 | 811 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
812 ### Check for PCRE regex library. |
12464
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
813 |
17821
82c94987abc6
build: Remove REGEX_CPPFLAGS from XTRA_CXXFLAGS.
Rik <rik@octave.org>
parents:
17820
diff
changeset
|
814 PCRE_LIBS= |
12464
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
815 |
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
816 pcre_fail_msg="to build Octave, you must have the PCRE library and header files installed" |
7173 | 817 |
14025
9867be070ee1
use pcre/pcre.h if it is present
John W. Eaton <jwe@octave.org>
parents:
13985
diff
changeset
|
818 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
|
819 |
12464
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
820 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
|
821 [ac_cv_pcre_h_macros_present], |
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
822 [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
|
823 #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
|
824 # 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
|
825 #elif defined (HAVE_PCRE_PCRE_H) |
15523
bf466a60651f
maint: periodic merge of stable to default
Jordi Gutiérrez Hermoso <jordigh@octave.org>
diff
changeset
|
826 # 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
|
827 #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
|
828 #endif |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
829 #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
|
830 && 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
|
831 && 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
|
832 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
|
833 #endif], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
834 ac_cv_pcre_h_macros_present=yes, ac_cv_pcre_h_macros_present=no)]) |
7169 | 835 |
12464
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
836 if test $ac_cv_pcre_h_macros_present = yes; then |
17821
82c94987abc6
build: Remove REGEX_CPPFLAGS from XTRA_CXXFLAGS.
Rik <rik@octave.org>
parents:
17820
diff
changeset
|
837 ## check for pcre-config, and if so, get build variables |
12464
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
838 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
|
839 if test $HAVE_PCRE_CONFIG = yes; then |
17821
82c94987abc6
build: Remove REGEX_CPPFLAGS from XTRA_CXXFLAGS.
Rik <rik@octave.org>
parents:
17820
diff
changeset
|
840 PCRE_CPPFLAGS=`pcre-config --cflags` |
82c94987abc6
build: Remove REGEX_CPPFLAGS from XTRA_CXXFLAGS.
Rik <rik@octave.org>
parents:
17820
diff
changeset
|
841 PCRE_LIBS=`pcre-config --libs` |
7173 | 842 else |
17821
82c94987abc6
build: Remove REGEX_CPPFLAGS from XTRA_CXXFLAGS.
Rik <rik@octave.org>
parents:
17820
diff
changeset
|
843 PCRE_LIBS="-lpcre" |
7173 | 844 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
|
845 save_LIBS="$LIBS" |
17821
82c94987abc6
build: Remove REGEX_CPPFLAGS from XTRA_CXXFLAGS.
Rik <rik@octave.org>
parents:
17820
diff
changeset
|
846 LIBS="$PCRE_LIBS $LIBS" |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
847 AC_CHECK_FUNCS([pcre_compile], |
17821
82c94987abc6
build: Remove REGEX_CPPFLAGS from XTRA_CXXFLAGS.
Rik <rik@octave.org>
parents:
17820
diff
changeset
|
848 [AC_SUBST(PCRE_CPPFLAGS) |
82c94987abc6
build: Remove REGEX_CPPFLAGS from XTRA_CXXFLAGS.
Rik <rik@octave.org>
parents:
17820
diff
changeset
|
849 AC_SUBST(PCRE_LIBS)], |
12464
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
850 [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
|
851 LIBS="$save_LIBS" |
7174 | 852 else |
12464
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
853 AC_MSG_ERROR([$pcre_fail_msg]) |
6133 | 854 fi |
7169 | 855 |
5270 | 856 ### Check for ZLIB library. |
3820 | 857 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
858 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
|
859 [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
|
860 [zlib.h], [gzclearerr]) |
3687 | 861 |
16332
5293cee91891
conditionally define HAVE_FFTW and HAVE_ZLIB in config.h
John W. Eaton <jwe@octave.org>
parents:
16330
diff
changeset
|
862 ### Also define HAVE_ZLIB if libz is found. |
19349
043440fa7006
configure.ac: Respect without-z and without-qrupdate options when config.cache exists.
Rik <rik@octave.org>
parents:
19344
diff
changeset
|
863 if test -z "$warn_z"; then |
16332
5293cee91891
conditionally define HAVE_FFTW and HAVE_ZLIB in config.h
John W. Eaton <jwe@octave.org>
parents:
16330
diff
changeset
|
864 AC_DEFINE(HAVE_ZLIB, 1, [Define to 1 if ZLIB is available.]) |
5293cee91891
conditionally define HAVE_FFTW and HAVE_ZLIB in config.h
John W. Eaton <jwe@octave.org>
parents:
16330
diff
changeset
|
865 fi |
5293cee91891
conditionally define HAVE_FFTW and HAVE_ZLIB in config.h
John W. Eaton <jwe@octave.org>
parents:
16330
diff
changeset
|
866 |
17164 | 867 ### 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
|
868 |
21131
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
869 ENABLE_JIT=no |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
870 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
|
871 [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
|
872 [(EXPERIMENTAL) enable JIT compiler])], |
21131
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
873 [if test "$enableval" = yes; then ENABLE_JIT=yes; fi], []) |
14932
1f914446157d
Locate and link with LLVM properly
Max Brister <max@2bass.com>
parents:
14931
diff
changeset
|
874 |
14990
149d1e2224f0
configure.ac: llvm include goes in CPPFLAGS not CXXFLAGS
Max Brister <max@2bass.com>
parents:
14956
diff
changeset
|
875 LLVM_CXXFLAGS= |
14899 | 876 LLVM_CPPFLAGS= |
877 LLVM_LDFLAGS= | |
878 LLVM_LIBS= | |
879 | |
21131
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
880 if test $ENABLE_JIT = yes; then |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
881 |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
882 ## 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
|
883 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
|
884 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
|
885 |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
886 if test -z "$LLVM_CONFIG"; then |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
887 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
|
888 else |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
889 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
|
890 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
|
891 |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
892 save_CPPFLAGS="$CPPFLAGS" |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
893 save_CXXFLAGS="$CXXFLAGS" |
17387
2b4ed68be0d5
Allow shared libs for LLVM (Bug #38654)
John Donoghue <john.donoghue@ieee.org>
parents:
17376
diff
changeset
|
894 save_LDFLAGS="$LDFLAGS" |
14994
bbc825cb2ea0
Use -I instead of -isystem if -isystem is not avaiable
Max Brister <max@2bass.com>
parents:
14993
diff
changeset
|
895 |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
896 ## 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
|
897 LLVM_INCLUDE_FLAG=-I |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
898 OCTAVE_CC_FLAG([-isystem .], [ |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
899 LLVM_INCLUDE_FLAG=-isystem |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
900 AC_MSG_NOTICE([using -isystem for LLVM headers])]) |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
901 |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
902 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
|
903 LLVM_CPPFLAGS="$LLVM_INCLUDE_FLAG `$LLVM_CONFIG --includedir`" |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
904 LLVM_CXXFLAGS= |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
905 LLVM_LDFLAGS="-L`$LLVM_CONFIG --libdir`" |
17387
2b4ed68be0d5
Allow shared libs for LLVM (Bug #38654)
John Donoghue <john.donoghue@ieee.org>
parents:
17376
diff
changeset
|
906 |
2b4ed68be0d5
Allow shared libs for LLVM (Bug #38654)
John Donoghue <john.donoghue@ieee.org>
parents:
17376
diff
changeset
|
907 |
2b4ed68be0d5
Allow shared libs for LLVM (Bug #38654)
John Donoghue <john.donoghue@ieee.org>
parents:
17376
diff
changeset
|
908 LDFLAGS="$LDFLAGS $LLVM_LDFLAGS" |
2b4ed68be0d5
Allow shared libs for LLVM (Bug #38654)
John Donoghue <john.donoghue@ieee.org>
parents:
17376
diff
changeset
|
909 LLVM_SO=LLVM-`$LLVM_CONFIG --version` |
2b4ed68be0d5
Allow shared libs for LLVM (Bug #38654)
John Donoghue <john.donoghue@ieee.org>
parents:
17376
diff
changeset
|
910 AC_CHECK_LIB([$LLVM_SO], [LLVMBuildAdd], [LLVM_LIBS="-l$LLVM_SO"], [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
|
911 |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
912 dnl |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
913 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
|
914 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
|
915 dnl very helpful. |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
916 dnl |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
917 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
|
918 CXXFLAGS="$LLVM_CXXFLAGS $CXXFLAGS" |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
919 AC_LANG_PUSH(C++) |
17820
3488d987eb50
build: Remove LLVM_(CPPFLAGS|CXXFLAGS) from XTRA_CXXFLAGS.
Rik <rik@octave.org>
parents:
17819
diff
changeset
|
920 AC_CHECK_HEADER([llvm/Support/TargetSelect.h], [warn_llvm=""]) |
17196
bc20614022aa
build: Redo LLVM macros to disable JIT rather than stop build if headers not found.
Rik <rik@octave.org>
parents:
17180
diff
changeset
|
921 |
bc20614022aa
build: Redo LLVM macros to disable JIT rather than stop build if headers not found.
Rik <rik@octave.org>
parents:
17180
diff
changeset
|
922 have_function_h=no |
bc20614022aa
build: Redo LLVM macros to disable JIT rather than stop build if headers not found.
Rik <rik@octave.org>
parents:
17180
diff
changeset
|
923 AC_CHECK_HEADERS([llvm/IR/Function.h llvm/Function.h], |
bc20614022aa
build: Redo LLVM macros to disable JIT rather than stop build if headers not found.
Rik <rik@octave.org>
parents:
17180
diff
changeset
|
924 [have_function_h=yes; break]) |
bc20614022aa
build: Redo LLVM macros to disable JIT rather than stop build if headers not found.
Rik <rik@octave.org>
parents:
17180
diff
changeset
|
925 if test $have_function_h = no; then |
bc20614022aa
build: Redo LLVM macros to disable JIT rather than stop build if headers not found.
Rik <rik@octave.org>
parents:
17180
diff
changeset
|
926 warn_llvm="Missing LLVM file Function.h. JIT compiler is disabled." |
bc20614022aa
build: Redo LLVM macros to disable JIT rather than stop build if headers not found.
Rik <rik@octave.org>
parents:
17180
diff
changeset
|
927 fi |
bc20614022aa
build: Redo LLVM macros to disable JIT rather than stop build if headers not found.
Rik <rik@octave.org>
parents:
17180
diff
changeset
|
928 have_irbuilder_h=no |
bc20614022aa
build: Redo LLVM macros to disable JIT rather than stop build if headers not found.
Rik <rik@octave.org>
parents:
17180
diff
changeset
|
929 AC_CHECK_HEADERS([llvm/Support/IRBuilder.h llvm/IR/IRBuilder.h \ |
bc20614022aa
build: Redo LLVM macros to disable JIT rather than stop build if headers not found.
Rik <rik@octave.org>
parents:
17180
diff
changeset
|
930 llvm/IRBuilder.h], [have_irbuilder_h=yes; break]) |
bc20614022aa
build: Redo LLVM macros to disable JIT rather than stop build if headers not found.
Rik <rik@octave.org>
parents:
17180
diff
changeset
|
931 if test $have_irbuilder_h = no; then |
bc20614022aa
build: Redo LLVM macros to disable JIT rather than stop build if headers not found.
Rik <rik@octave.org>
parents:
17180
diff
changeset
|
932 warn_llvm="Missing LLVM file IRBuilder.h. JIT compiler is disabled." |
bc20614022aa
build: Redo LLVM macros to disable JIT rather than stop build if headers not found.
Rik <rik@octave.org>
parents:
17180
diff
changeset
|
933 fi |
bc20614022aa
build: Redo LLVM macros to disable JIT rather than stop build if headers not found.
Rik <rik@octave.org>
parents:
17180
diff
changeset
|
934 have_llvm_data_h=no |
bc20614022aa
build: Redo LLVM macros to disable JIT rather than stop build if headers not found.
Rik <rik@octave.org>
parents:
17180
diff
changeset
|
935 AC_CHECK_HEADERS([llvm/Target/TargetData.h llvm/IR/DataLayout.h \ |
bc20614022aa
build: Redo LLVM macros to disable JIT rather than stop build if headers not found.
Rik <rik@octave.org>
parents:
17180
diff
changeset
|
936 llvm/DataLayout.h], [have_llvm_data_h=yes; break]) |
bc20614022aa
build: Redo LLVM macros to disable JIT rather than stop build if headers not found.
Rik <rik@octave.org>
parents:
17180
diff
changeset
|
937 if test $have_llvm_data_h = no; then |
bc20614022aa
build: Redo LLVM macros to disable JIT rather than stop build if headers not found.
Rik <rik@octave.org>
parents:
17180
diff
changeset
|
938 warn_llvm="Missing LLVM file TargetData.h. JIT compiler is disabled." |
bc20614022aa
build: Redo LLVM macros to disable JIT rather than stop build if headers not found.
Rik <rik@octave.org>
parents:
17180
diff
changeset
|
939 fi |
bc20614022aa
build: Redo LLVM macros to disable JIT rather than stop build if headers not found.
Rik <rik@octave.org>
parents:
17180
diff
changeset
|
940 |
18831
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18586
diff
changeset
|
941 AC_CHECK_HEADERS([llvm/IR/Verifier.h]) |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18586
diff
changeset
|
942 |
17031
38bcfd413db0
Handle LLVM API incoherence. Octave now works with LLVM 3.0, 3.1, and 3.2
LYH <lyh.kernel@gmail.com>
parents:
16961
diff
changeset
|
943 OCTAVE_LLVM_FUNCTION_ADDATTRIBUTE_API |
38bcfd413db0
Handle LLVM API incoherence. Octave now works with LLVM 3.0, 3.1, and 3.2
LYH <lyh.kernel@gmail.com>
parents:
16961
diff
changeset
|
944 OCTAVE_LLVM_FUNCTION_ADDFNATTR_API |
38bcfd413db0
Handle LLVM API incoherence. Octave now works with LLVM 3.0, 3.1, and 3.2
LYH <lyh.kernel@gmail.com>
parents:
16961
diff
changeset
|
945 OCTAVE_LLVM_CALLINST_ADDATTRIBUTE_API |
18831
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18586
diff
changeset
|
946 OCTAVE_LLVM_RAW_FD_OSTREAM_API |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18586
diff
changeset
|
947 OCTAVE_LLVM_LEGACY_PASSMANAGER_API |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
948 AC_LANG_POP(C++) |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
949 CPPFLAGS="$save_CPPFLAGS" |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
950 CXXFLAGS="$save_CXXFLAGS" |
17387
2b4ed68be0d5
Allow shared libs for LLVM (Bug #38654)
John Donoghue <john.donoghue@ieee.org>
parents:
17376
diff
changeset
|
951 LDFLAGS="$save_LDFLAGS" |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
952 fi |
14993
06f2e9bdade6
configure.ac: Skip compiling JIT if LLVM_CONFIG is not specified
Max Brister <max@2bass.com>
parents:
14990
diff
changeset
|
953 |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
954 if test -z "$warn_llvm"; then |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
955 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
|
956 else |
21131
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
957 ENABLE_JIT=no |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
958 LLVM_CPPFLAGS= |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
959 LLVM_CXXFLAGS= |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
960 LLVM_LDFLAGS= |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
961 LLVM_LIBS= |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
962 OCTAVE_CONFIGURE_WARNING([warn_llvm]) |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
963 fi |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
964 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
|
965 dnl else |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
966 dnl ## JIT build disabled |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
967 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
|
968 dnl OCTAVE_CONFIGURE_WARNING([warn_llvm]) |
14899 | 969 fi |
21131
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
970 if test $ENABLE_JIT; then |
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
971 AC_DEFINE(ENABLE_JIT, 1, [Define to 1 to enable JIT compiler.]) |
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
972 fi |
14899 | 973 |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
974 AC_SUBST(LLVM_CPPFLAGS) |
14990
149d1e2224f0
configure.ac: llvm include goes in CPPFLAGS not CXXFLAGS
Max Brister <max@2bass.com>
parents:
14956
diff
changeset
|
975 AC_SUBST(LLVM_CXXFLAGS) |
14899 | 976 AC_SUBST(LLVM_LDFLAGS) |
977 AC_SUBST(LLVM_LIBS) | |
18338
7a1a71e3f328
configure.ac: Fix broken build with AMCOND_HAVE_LLVM.
Rik <rik@octave.org>
parents:
18328
diff
changeset
|
978 AM_CONDITIONAL([AMCOND_HAVE_LLVM], [test -z "$warn_llvm"]) |
14899 | 979 |
9538
d0239bddf621
use OCTAVE_CHECK_LIB to check for zlib
John W. Eaton <jwe@octave.org>
parents:
9536
diff
changeset
|
980 ### Check for HDF5 library. |
5270 | 981 |
9542
f5ec5dc66824
use OCTAVE_CHECK_LIBRARY to check for HDF5
John W. Eaton <jwe@octave.org>
parents:
9540
diff
changeset
|
982 save_CPPFLAGS="$CPPFLAGS" |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
983 save_LIBS="$LIBS" |
9542
f5ec5dc66824
use OCTAVE_CHECK_LIBRARY to check for HDF5
John W. Eaton <jwe@octave.org>
parents:
9540
diff
changeset
|
984 CPPFLAGS="$Z_CPPFLAGS $CPPFLAGS" |
f5ec5dc66824
use OCTAVE_CHECK_LIBRARY to check for HDF5
John W. Eaton <jwe@octave.org>
parents:
9540
diff
changeset
|
985 LIBS="$Z_LDFLAGS $Z_LIBS $LIBS" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
986 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
|
987 [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
|
988 [hdf5.h], [H5Gget_num_objs], [], [], |
f5ec5dc66824
use OCTAVE_CHECK_LIBRARY to check for HDF5
John W. Eaton <jwe@octave.org>
parents:
9540
diff
changeset
|
989 [warn_hdf5= |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
990 OCTAVE_CHECK_HDF5_HAS_VER_16_API |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
991 AC_DEFINE(HAVE_HDF5, 1, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
992 [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
|
993 if test $have_msvc = yes; then |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
994 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
|
995 fi |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
996 ]) |
9542
f5ec5dc66824
use OCTAVE_CHECK_LIBRARY to check for HDF5
John W. Eaton <jwe@octave.org>
parents:
9540
diff
changeset
|
997 CPPFLAGS="$save_CPPFLAGS" |
f5ec5dc66824
use OCTAVE_CHECK_LIBRARY to check for HDF5
John W. Eaton <jwe@octave.org>
parents:
9540
diff
changeset
|
998 LIBS="$save_LIBS" |
5270 | 999 |
21211
2cf8bc5c7017
use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests
John W. Eaton <jwe@octave.org>
parents:
21187
diff
changeset
|
1000 dnl Should we check for this now, or wait until some version of |
2cf8bc5c7017
use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests
John W. Eaton <jwe@octave.org>
parents:
21187
diff
changeset
|
1001 dnl HDF5 actually supports this feature? |
2cf8bc5c7017
use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests
John W. Eaton <jwe@octave.org>
parents:
21187
diff
changeset
|
1002 have_hdf5_int2float_conversions=no |
21378
172479a97e6c
configure.ac: Remove overquoting in shell variables tests.
Rik <rik@octave.org>
parents:
21374
diff
changeset
|
1003 if test $have_hdf5_int2float_conversions = yes; then |
21211
2cf8bc5c7017
use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests
John W. Eaton <jwe@octave.org>
parents:
21187
diff
changeset
|
1004 AC_DEFINE(HAVE_HDF5_INT2FLOAT_CONVERSIONS, 1, |
2cf8bc5c7017
use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests
John W. Eaton <jwe@octave.org>
parents:
21187
diff
changeset
|
1005 [Define to 1 if/when HDF5 supports automatic conversion between integer and floating-point binary data.]) |
2cf8bc5c7017
use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests
John W. Eaton <jwe@octave.org>
parents:
21187
diff
changeset
|
1006 fi |
2cf8bc5c7017
use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests
John W. Eaton <jwe@octave.org>
parents:
21187
diff
changeset
|
1007 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1008 ### Check for FFTW library. Default to Fortran FFTPACK if it is not available. |
5203 | 1009 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1010 ## Check for FFTW header and library. |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1011 OCTAVE_CHECK_LIB(fftw3, FFTW3, |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1012 [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
|
1013 [fftw3.h], [fftw_plan_dft_1d]) |
3827 | 1014 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1015 OCTAVE_CHECK_LIB(fftw3f, FFTW3F, |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1016 [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
|
1017 [fftw3.h], [fftwf_plan_dft_1d]) |
3827 | 1018 |
19344
88847d5d1a96
configure.ac: Fix handling of --without-fftw3[f] options.
Rik <rik@octave.org>
parents:
18991
diff
changeset
|
1019 ## Check command line for the option to disable multi-threaded FFTW |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1020 build_fftw_threads=yes |
15960
bde7731b2b83
added FFTW multithreaded library support
Andreas Weber <andy.weber.aw@gmail.com>
parents:
15946
diff
changeset
|
1021 AC_ARG_ENABLE([fftw-threads], |
bde7731b2b83
added FFTW multithreaded library support
Andreas Weber <andy.weber.aw@gmail.com>
parents:
15946
diff
changeset
|
1022 [AS_HELP_STRING([--disable-fftw-threads], |
bde7731b2b83
added FFTW multithreaded library support
Andreas Weber <andy.weber.aw@gmail.com>
parents:
15946
diff
changeset
|
1023 [disable Multi-threaded FFTW])], |
bde7731b2b83
added FFTW multithreaded library support
Andreas Weber <andy.weber.aw@gmail.com>
parents:
15946
diff
changeset
|
1024 [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
|
1025 build_fftw_threads=no |
15960
bde7731b2b83
added FFTW multithreaded library support
Andreas Weber <andy.weber.aw@gmail.com>
parents:
15946
diff
changeset
|
1026 fi], |
bde7731b2b83
added FFTW multithreaded library support
Andreas Weber <andy.weber.aw@gmail.com>
parents:
15946
diff
changeset
|
1027 []) |
bde7731b2b83
added FFTW multithreaded library support
Andreas Weber <andy.weber.aw@gmail.com>
parents:
15946
diff
changeset
|
1028 |
19344
88847d5d1a96
configure.ac: Fix handling of --without-fftw3[f] options.
Rik <rik@octave.org>
parents:
18991
diff
changeset
|
1029 ## Octave is currently unable to use FFTW unless |
88847d5d1a96
configure.ac: Fix handling of --without-fftw3[f] options.
Rik <rik@octave.org>
parents:
18991
diff
changeset
|
1030 ## both float and double versions are available. |
16332
5293cee91891
conditionally define HAVE_FFTW and HAVE_ZLIB in config.h
John W. Eaton <jwe@octave.org>
parents:
16330
diff
changeset
|
1031 |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1032 AM_CONDITIONAL([AMCOND_HAVE_FFTW], |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1033 [test -n "$FFTW3_LIBS" && test -n "$FFTW3F_LIBS"]) |
3827 | 1034 |
16332
5293cee91891
conditionally define HAVE_FFTW and HAVE_ZLIB in config.h
John W. Eaton <jwe@octave.org>
parents:
16330
diff
changeset
|
1035 if test -n "$FFTW3_LIBS" && test -n "$FFTW3F_LIBS"; then |
5293cee91891
conditionally define HAVE_FFTW and HAVE_ZLIB in config.h
John W. Eaton <jwe@octave.org>
parents:
16330
diff
changeset
|
1036 AC_DEFINE(HAVE_FFTW, 1, [Define if you have both FFTW3 and FFTW3F libraries.]) |
19344
88847d5d1a96
configure.ac: Fix handling of --without-fftw3[f] options.
Rik <rik@octave.org>
parents:
18991
diff
changeset
|
1037 else |
88847d5d1a96
configure.ac: Fix handling of --without-fftw3[f] options.
Rik <rik@octave.org>
parents:
18991
diff
changeset
|
1038 ## --without-fftw3 given, or one of the FFTW3 libs not installed. |
88847d5d1a96
configure.ac: Fix handling of --without-fftw3[f] options.
Rik <rik@octave.org>
parents:
18991
diff
changeset
|
1039 ## Don't check for FFTW threads as this is now pointless. |
88847d5d1a96
configure.ac: Fix handling of --without-fftw3[f] options.
Rik <rik@octave.org>
parents:
18991
diff
changeset
|
1040 build_fftw_threads=no |
88847d5d1a96
configure.ac: Fix handling of --without-fftw3[f] options.
Rik <rik@octave.org>
parents:
18991
diff
changeset
|
1041 fi |
88847d5d1a96
configure.ac: Fix handling of --without-fftw3[f] options.
Rik <rik@octave.org>
parents:
18991
diff
changeset
|
1042 |
88847d5d1a96
configure.ac: Fix handling of --without-fftw3[f] options.
Rik <rik@octave.org>
parents:
18991
diff
changeset
|
1043 ## Check for the multithreaded FFTW library. |
88847d5d1a96
configure.ac: Fix handling of --without-fftw3[f] options.
Rik <rik@octave.org>
parents:
18991
diff
changeset
|
1044 ## Fallback to singlethreaded if not found or disabled |
88847d5d1a96
configure.ac: Fix handling of --without-fftw3[f] options.
Rik <rik@octave.org>
parents:
18991
diff
changeset
|
1045 if test $build_fftw_threads = yes; then |
88847d5d1a96
configure.ac: Fix handling of --without-fftw3[f] options.
Rik <rik@octave.org>
parents:
18991
diff
changeset
|
1046 OCTAVE_CHECK_FFTW_THREADS(fftw3, fftw_plan_with_nthreads) |
88847d5d1a96
configure.ac: Fix handling of --without-fftw3[f] options.
Rik <rik@octave.org>
parents:
18991
diff
changeset
|
1047 OCTAVE_CHECK_FFTW_THREADS(fftw3f, fftwf_plan_with_nthreads) |
16332
5293cee91891
conditionally define HAVE_FFTW and HAVE_ZLIB in config.h
John W. Eaton <jwe@octave.org>
parents:
16330
diff
changeset
|
1048 fi |
5293cee91891
conditionally define HAVE_FFTW and HAVE_ZLIB in config.h
John W. Eaton <jwe@octave.org>
parents:
16330
diff
changeset
|
1049 |
15271
648dabbb4c6b
build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
15257
diff
changeset
|
1050 ## 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
|
1051 FFT_DIR="fftpack" |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1052 AC_SUBST(FFT_DIR) |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1053 |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1054 ### Check for GLPK library and header. |
5235 | 1055 |
9540
79b5fe2d5646
use Z_LIBS in checks for curl and glpk libraries
John W. Eaton <jwe@octave.org>
parents:
9538
diff
changeset
|
1056 save_CPPFLAGS="$CPPFLAGS" |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1057 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
|
1058 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
|
1059 LIBS="$Z_LDFLAGS $Z_LIBS $LIBS" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1060 OCTAVE_CHECK_LIB(glpk, GLPK, |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1061 [GLPK library not found. The glpk function for solving linear programs will be disabled.], |
17241
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17196
diff
changeset
|
1062 [glpk/glpk.h glpk.h], [glp_simplex], [], [], |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17196
diff
changeset
|
1063 [warn_glpk= |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17196
diff
changeset
|
1064 OCTAVE_CHECK_LIB_GLPK_OK( |
19355
22289e6e316e
build: Remove unused TEXINFO_LIBNAME definitions from Makefiles.
Rik <rik@octave.org>
parents:
19353
diff
changeset
|
1065 [AC_DEFINE(HAVE_GLPK, 1, [Define to 1 if GLPK is available.])], |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1066 [warn_glpk="GLPK library found, but does not seem to work properly; disabling glpk function"])]) |
9540
79b5fe2d5646
use Z_LIBS in checks for curl and glpk libraries
John W. Eaton <jwe@octave.org>
parents:
9538
diff
changeset
|
1067 LIBS="$save_LIBS" |
79b5fe2d5646
use Z_LIBS in checks for curl and glpk libraries
John W. Eaton <jwe@octave.org>
parents:
9538
diff
changeset
|
1068 CPPFLAGS="$save_CPPFLAGS" |
5235 | 1069 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1070 ### Checks for cURL header and library. |
6043 | 1071 |
9540
79b5fe2d5646
use Z_LIBS in checks for curl and glpk libraries
John W. Eaton <jwe@octave.org>
parents:
9538
diff
changeset
|
1072 save_CPPFLAGS="$CPPFLAGS" |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1073 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
|
1074 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
|
1075 LIBS="$Z_LDFLAGS $Z_LIBS $LIBS" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1076 OCTAVE_CHECK_LIB(curl, cURL, |
9880 | 1077 [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
|
1078 [curl/curl.h], [curl_easy_escape]) |
15323
c42bf5cadb60
Add check for CURLOPT_DIRLISTONLY in libcurl
Mike Miller <mtmiller@ieee.org>
parents:
15317
diff
changeset
|
1079 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
|
1080 ## 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
|
1081 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
|
1082 [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
|
1083 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
15323
c42bf5cadb60
Add check for CURLOPT_DIRLISTONLY in libcurl
Mike Miller <mtmiller@ieee.org>
parents:
15317
diff
changeset
|
1084 #include <curl/curl.h> |
c42bf5cadb60
Add check for CURLOPT_DIRLISTONLY in libcurl
Mike Miller <mtmiller@ieee.org>
parents:
15317
diff
changeset
|
1085 ]], [[ |
c42bf5cadb60
Add check for CURLOPT_DIRLISTONLY in libcurl
Mike Miller <mtmiller@ieee.org>
parents:
15317
diff
changeset
|
1086 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
|
1087 ]])], |
16080
c53f8f706c55
Reverse logic of libcurl feature test result
Mike Miller <mtmiller@ieee.org>
parents:
16079
diff
changeset
|
1088 [octave_cv_curl_has_curlopt_dirlistonly=yes], |
c53f8f706c55
Reverse logic of libcurl feature test result
Mike Miller <mtmiller@ieee.org>
parents:
16079
diff
changeset
|
1089 [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
|
1090 ]) |
16080
c53f8f706c55
Reverse logic of libcurl feature test result
Mike Miller <mtmiller@ieee.org>
parents:
16079
diff
changeset
|
1091 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
|
1092 AC_DEFINE(CURLOPT_DIRLISTONLY, CURLOPT_FTPLISTONLY, |
16079
3a90c3f4046d
Fix typo in changeset dc39c1d84c5b
Mike Miller <mtmiller@ieee.org>
parents:
16078
diff
changeset
|
1093 [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
|
1094 fi |
15323
c42bf5cadb60
Add check for CURLOPT_DIRLISTONLY in libcurl
Mike Miller <mtmiller@ieee.org>
parents:
15317
diff
changeset
|
1095 fi |
9540
79b5fe2d5646
use Z_LIBS in checks for curl and glpk libraries
John W. Eaton <jwe@octave.org>
parents:
9538
diff
changeset
|
1096 LIBS="$save_LIBS" |
79b5fe2d5646
use Z_LIBS in checks for curl and glpk libraries
John W. Eaton <jwe@octave.org>
parents:
9538
diff
changeset
|
1097 CPPFLAGS="$save_CPPFLAGS" |
6133 | 1098 |
19464
8fe2780c1491
update configure.ac to build and configure sndfile audio file utilities
Vytautas Jančauskas <unaudio@gmail.com>
parents:
17465
diff
changeset
|
1099 ### Check for sndfile |
8fe2780c1491
update configure.ac to build and configure sndfile audio file utilities
Vytautas Jančauskas <unaudio@gmail.com>
parents:
17465
diff
changeset
|
1100 |
22104
cfc260765ddf
build: use simpler and more consistent checks for portaudio and sndfile
Mike Miller <mtmiller@octave.org>
parents:
22041
diff
changeset
|
1101 OCTAVE_CHECK_LIB(sndfile, sndfile, |
cfc260765ddf
build: use simpler and more consistent checks for portaudio and sndfile
Mike Miller <mtmiller@octave.org>
parents:
22041
diff
changeset
|
1102 [sndfile library not found. The audioinfo, audioread, and audiowrite functions will be disabled.], |
cfc260765ddf
build: use simpler and more consistent checks for portaudio and sndfile
Mike Miller <mtmiller@octave.org>
parents:
22041
diff
changeset
|
1103 [sndfile.h], [sf_open], |
22110
d534a3014fd7
build: restore sndfile check for specific features needed to build
Mike Miller <mtmiller@octave.org>
parents:
22104
diff
changeset
|
1104 [], [don't use sndfile library, disable audio file I/O], |
d534a3014fd7
build: restore sndfile check for specific features needed to build
Mike Miller <mtmiller@octave.org>
parents:
22104
diff
changeset
|
1105 [warn_sndfile= |
d534a3014fd7
build: restore sndfile check for specific features needed to build
Mike Miller <mtmiller@octave.org>
parents:
22104
diff
changeset
|
1106 OCTAVE_CHECK_LIB_SNDFILE_OK( |
d534a3014fd7
build: restore sndfile check for specific features needed to build
Mike Miller <mtmiller@octave.org>
parents:
22104
diff
changeset
|
1107 [AC_DEFINE(HAVE_SNDFILE, 1, [Define to 1 if sndfile is available.])], |
d534a3014fd7
build: restore sndfile check for specific features needed to build
Mike Miller <mtmiller@octave.org>
parents:
22104
diff
changeset
|
1108 [warn_sndfile="sndfile library found, but does not seem to work properly; disabling audio file I/O functions"])]) |
19464
8fe2780c1491
update configure.ac to build and configure sndfile audio file utilities
Vytautas Jančauskas <unaudio@gmail.com>
parents:
17465
diff
changeset
|
1109 |
19470
23833e1bfa2e
check for PortAudio
Vytautas Jančauskas <unaudio@gmail.com>
parents:
19467
diff
changeset
|
1110 ### Check for PortAudio |
23833e1bfa2e
check for PortAudio
Vytautas Jančauskas <unaudio@gmail.com>
parents:
19467
diff
changeset
|
1111 |
22104
cfc260765ddf
build: use simpler and more consistent checks for portaudio and sndfile
Mike Miller <mtmiller@octave.org>
parents:
22041
diff
changeset
|
1112 OCTAVE_CHECK_LIB(portaudio, PortAudio, |
cfc260765ddf
build: use simpler and more consistent checks for portaudio and sndfile
Mike Miller <mtmiller@octave.org>
parents:
22041
diff
changeset
|
1113 [PortAudio library not found. The audioplayer, audiorecorder, and audiodevinfo functions will be disabled.], |
cfc260765ddf
build: use simpler and more consistent checks for portaudio and sndfile
Mike Miller <mtmiller@octave.org>
parents:
22041
diff
changeset
|
1114 [portaudio.h], [Pa_Initialize], |
cfc260765ddf
build: use simpler and more consistent checks for portaudio and sndfile
Mike Miller <mtmiller@octave.org>
parents:
22041
diff
changeset
|
1115 [], [don't use PortAudio library, disable audio playback and recording], |
cfc260765ddf
build: use simpler and more consistent checks for portaudio and sndfile
Mike Miller <mtmiller@octave.org>
parents:
22041
diff
changeset
|
1116 [], [portaudio-2.0]) |
19470
23833e1bfa2e
check for PortAudio
Vytautas Jančauskas <unaudio@gmail.com>
parents:
19467
diff
changeset
|
1117 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1118 ### 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
|
1119 |
21381 | 1120 check_magick=yes |
1121 use_magick=no | |
11216
5036b0ff9597
configure.ac: Properly m4 quote AS_HELP_STRING.
Rik <octave@nomad.inbox5.com>
parents:
11214
diff
changeset
|
1122 AC_ARG_WITH([magick], |
5036b0ff9597
configure.ac: Properly m4 quote AS_HELP_STRING.
Rik <octave@nomad.inbox5.com>
parents:
11214
diff
changeset
|
1123 [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
|
1124 [select library to use for image I/O (options: GraphicsMagick(default) or ImageMagick)])], |
21381 | 1125 [if test x"$withval" = xno; then |
1126 check_magick=no | |
22041
26c0e65e6b77
configure: clean up warning messages when building without GraphicsMagick
Mike Miller <mtmiller@octave.org>
parents:
22027
diff
changeset
|
1127 warn_magick_disabled="--without-magick specified. The imread, imwrite, and imfinfo functions for reading and writing image files will not be fully functional." |
21381 | 1128 OCTAVE_CONFIGURE_WARNING([warn_magick_disabled]) |
1129 else | |
1130 magick="$withval" | |
1131 fi], [magick="GraphicsMagick"]) | |
1132 | |
1133 if test $check_magick = yes; then | |
1134 | |
1135 MAGICK_CPPFLAGS= | |
1136 MAGICK_LDFLAGS= | |
1137 MAGICK_LIBS= | |
1138 | |
1139 PKG_CHECK_EXISTS([$magick++], [ | |
1140 ## Make sure we only get -I, -L, and -l flags. Some Graphics/ImageMagick++ | |
1141 ## packages add extra flags that are useful when building | |
1142 ## Graphics/ImageMagick++ extentions. These extra flags break the | |
1143 ## Octave build. | |
1144 MAGICK_CPPFLAGS=`$PKG_CONFIG --cflags-only-I $magick++` | |
1145 MAGICK_LDFLAGS=`$PKG_CONFIG --libs-only-L $magick++` | |
1146 MAGICK_LIBS=`$PKG_CONFIG --libs-only-l $magick++` | |
1147 | |
22041
26c0e65e6b77
configure: clean up warning messages when building without GraphicsMagick
Mike Miller <mtmiller@octave.org>
parents:
22027
diff
changeset
|
1148 warn_magick="$magick++ library fails tests. The imread, imwrite, and imfinfo functions for reading and writing image files will not be fully functional." |
21381 | 1149 |
1150 save_CPPFLAGS="$CPPFLAGS" | |
1151 save_LIBS="$LIBS" | |
1152 CPPFLAGS="$MAGICK_CPPFLAGS $CPPFLAGS" | |
1153 LIBS="$MAGICK_LDFLAGS $MAGICK_LIBS $LIBS" | |
1154 AC_LANG_PUSH(C++) | |
1155 AC_CHECK_HEADER([Magick++.h], [ | |
1156 AC_CACHE_CHECK([for Magick::ColorRGB in Magick++.h], | |
1157 [octave_cv_func_magick_colorrgb], | |
1158 [AC_PREPROC_IFELSE([AC_LANG_SOURCE([[ | |
1159 #include <Magick++.h> | |
1160 ]], [[ | |
1161 Magick::ColorRGB c; | |
1162 ]])], | |
1163 octave_cv_func_magick_colorrgb=yes, | |
1164 octave_cv_func_magick_colorrgb=no) | |
1165 ]) | |
1166 if test $octave_cv_func_magick_colorrgb = yes; then | |
1167 use_magick=yes | |
1168 warn_magick= | |
1169 fi | |
1170 ]) | |
1171 AC_LANG_POP(C++) | |
1172 CPPFLAGS="$save_CPPFLAGS" | |
1173 LIBS="$save_LIBS" | |
1174 | |
1175 AC_CHECK_FUNCS([setlocale], [], | |
1176 [use_magick=no | |
22041
26c0e65e6b77
configure: clean up warning messages when building without GraphicsMagick
Mike Miller <mtmiller@octave.org>
parents:
22027
diff
changeset
|
1177 warn_magick="$magick++ requires setlocale function. The imread, imwrite, and imfinfo functions for reading and writing image files will not be fully functional."]) |
26c0e65e6b77
configure: clean up warning messages when building without GraphicsMagick
Mike Miller <mtmiller@octave.org>
parents:
22027
diff
changeset
|
1178 ], |
26c0e65e6b77
configure: clean up warning messages when building without GraphicsMagick
Mike Miller <mtmiller@octave.org>
parents:
22027
diff
changeset
|
1179 [use_magick=no |
26c0e65e6b77
configure: clean up warning messages when building without GraphicsMagick
Mike Miller <mtmiller@octave.org>
parents:
22027
diff
changeset
|
1180 warn_magick="$magick++ library not found. The imread, imwrite, and imfinfo functions for reading and writing image files will not be fully functional."]) |
21381 | 1181 fi |
1182 | |
1183 if test $use_magick = 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
|
1184 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
|
1185 [Define to 1 if Graphics/ImageMagick++ is available.]) |
7937
6661387827d6
Allow build without GraphicsMagick installed
David Bateman <dbateman@free.fr>
parents:
7934
diff
changeset
|
1186 else |
21381 | 1187 if test -n "$warn_magick"; then |
1188 OCTAVE_CONFIGURE_WARNING([warn_magick]) | |
1189 fi | |
9575
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
1190 MAGICK_CPPFLAGS= |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
1191 MAGICK_LDFLAGS= |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
1192 MAGICK_LIBS= |
7926
d74f996e005d
__magick_read__.cc: configuration and style fixes
John W. Eaton <jwe@octave.org>
parents:
7921
diff
changeset
|
1193 fi |
9575
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
1194 AC_SUBST(MAGICK_CPPFLAGS) |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
1195 AC_SUBST(MAGICK_LDFLAGS) |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
1196 AC_SUBST(MAGICK_LIBS) |
6043 | 1197 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1198 ### Check for X11 libraries |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1199 |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1200 AC_PATH_X |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1201 if test "$have_x" = yes; then |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1202 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
|
1203 |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1204 if test "$x_includes" != "NONE"; then |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1205 X11_INCFLAGS="$x_includes" |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1206 fi |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1207 AC_SUBST(X11_INCFLAGS) |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1208 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1209 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
|
1210 AC_CHECK_LIB([X11], XrmInitialize, [X11_LIBS="-lX11"], [X11_LIBS=]) |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1211 elif test "$x_libraries" != "NONE"; then |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
1212 AC_CHECK_LIB([X11], XrmInitialize, |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1213 [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
|
1214 fi |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1215 AC_SUBST(X11_LIBS) |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1216 fi |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1217 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1218 ### 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
|
1219 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
|
1220 [[#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
|
1221 [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
|
1222 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
|
1223 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
|
1224 [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
|
1225 CARBON_LIBS="-Wl,-framework -Wl,Carbon" |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1226 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
|
1227 AC_SUBST(CARBON_LIBS) |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1228 fi |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1229 |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1230 ### Check for list of libraries needed for OpenGL graphics renderer. |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1231 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1232 check_opengl=yes |
11208
a44ba1cdfbb5
handle --without-opengl configure option
John W. Eaton <jwe@octave.org>
parents:
11119
diff
changeset
|
1233 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
|
1234 [AS_HELP_STRING([--without-opengl], |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1235 [don't use OpenGL libraries, disable OpenGL graphics])], |
21381 | 1236 [if test x"$withval" = xno; then |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1237 check_opengl=no |
21381 | 1238 warn_opengl_disabled="--without-opengl specified. OpenGL graphics will be disabled." |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1239 OCTAVE_CONFIGURE_WARNING([warn_opengl_disabled]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1240 fi]) |
11208
a44ba1cdfbb5
handle --without-opengl configure option
John W. Eaton <jwe@octave.org>
parents:
11119
diff
changeset
|
1241 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1242 ## 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
|
1243 if test $check_opengl = yes; then |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1244 OCTAVE_CHECK_LIB_OPENGL |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1245 if test -z "$OPENGL_LIBS"; then |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1246 warn_opengl_libs="OpenGL libs (GL and GLU) not found. OpgnGL graphics will be disabled." |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1247 OCTAVE_CONFIGURE_WARNING([warn_opengl_libs]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1248 fi |
11208
a44ba1cdfbb5
handle --without-opengl configure option
John W. Eaton <jwe@octave.org>
parents:
11119
diff
changeset
|
1249 fi |
a44ba1cdfbb5
handle --without-opengl configure option
John W. Eaton <jwe@octave.org>
parents:
11119
diff
changeset
|
1250 |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1251 ## Check for FreeType 2 library |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1252 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1253 warn_freetype="" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1254 PKG_CHECK_MODULES([FT2], [freetype2], [ |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1255 min_ft2_version=9.03 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1256 AC_MSG_CHECKING([for FreeType2 version >= $min_ft2_version]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1257 $PKG_CONFIG freetype2 --atleast-version=$min_ft2_version |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1258 ac_status=$? |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1259 if test "$ac_status" = 0; then |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1260 AC_MSG_RESULT(yes) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1261 AC_DEFINE(HAVE_FREETYPE, 1, [Define to 1 if you have Freetype library.]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1262 save_LIBS="$LIBS" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1263 LIBS="$FT2_LIBS $LIBS" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1264 AC_CHECK_FUNCS([FT_Reference_Face]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1265 LIBS="$save_LIBS" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1266 else |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1267 AC_MSG_RESULT(no) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1268 warn_freetype="FreeType library >= 9.03 not found. OpenGL graphics will not be fully functional." |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1269 fi]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1270 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1271 if test -n "$warn_freetype"; then |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1272 OCTAVE_CONFIGURE_WARNING([warn_freetype]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1273 else |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1274 FT2_CPPFLAGS="$FT2_CFLAGS" |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
1275 ## Alias CPPFLAGS to CFLAGS. This is closer to the true meaning |
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
1276 ## of `pkg-config --cflags` output. |
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
1277 FT2_CPPFLAGS="$FT2_CFLAGS" |
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
1278 AC_SUBST(FT2_CPPFLAGS) |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1279 fi |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1280 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1281 ## Check for Xft library (when using X11) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1282 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1283 warn_xft="" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1284 if test "$have_x" = yes; then |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1285 PKG_CHECK_MODULES(XFT, [xft], |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1286 [AC_DEFINE(HAVE_XFT, 1, [Define to 1 if Xft is present.])], |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1287 [warn_xft="Xft library not found. OpenGL graphics will not be fully functional."]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1288 fi |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1289 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1290 if test -n "$warn_xft"; then |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1291 OCTAVE_CONFIGURE_WARNING([warn_xft]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1292 fi |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1293 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1294 ## Check for fontconfig library |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1295 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1296 warn_fontconfig="" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1297 PKG_CHECK_MODULES(FONTCONFIG, [fontconfig], |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1298 [AC_DEFINE(HAVE_FONTCONFIG, 1, [Define to 1 if fontconfig is present.])], |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1299 [warn_fontconfig="Fontconfig library not found. OpenGL graphics will not be fully functional."]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1300 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1301 if test -n "$warn_fontconfig"; then |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1302 OCTAVE_CONFIGURE_WARNING([warn_fontconfig]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1303 else |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1304 FONTCONFIG_CPPFLAGS="$FONTCONFIG_CFLAGS" |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
1305 ## Alias CPPFLAGS to CFLAGS. This is closer to the true meaning |
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
1306 ## of `pkg-config --cflags` output. |
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
1307 FONTCONFIG_CPPFLAGS="$FONTCONFIG_CFLAGS" |
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
1308 AC_SUBST(FONTCONFIG_CPPFLAGS) |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1309 fi |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1310 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1311 ## Check for OSMesa which is needed for offscreen rendering with OpenGL |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1312 ## FIXME: Check for version >= 9.0.0 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1313 OCTAVE_CHECK_LIB(OSMesa, OSMesa, |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1314 [OSMesa library not found. Offscreen rendering with OpenGL will be disabled.], |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1315 [osmesa.h GL/osmesa.h], [OSMesaCreateContext]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1316 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1317 ## Check for gl2ps which is required for printing with OpenGL graphics |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1318 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1319 AC_CHECK_HEADERS([gl2ps.h], |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1320 [GL2PS_LIBS="-lgl2ps"], |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1321 [warn_gl2ps="gl2ps library not found. Printing of OpenGL graphics will be disabled."]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1322 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1323 if test -n "$warn_gl2ps"; then |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1324 OCTAVE_CONFIGURE_WARNING([warn_gl2ps]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1325 fi |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1326 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1327 AC_SUBST(GL2PS_LIBS) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1328 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1329 ### GUI/Qt related tests. |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1330 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1331 QT_CPPFLAGS= |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1332 QT_LDFLAGS= |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1333 QT_LIBS= |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1334 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1335 check_qt=yes |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1336 build_qt_gui=no |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1337 build_qt_graphics=no |
21381 | 1338 use_qscintilla=no |
1339 win32_terminal=no | |
1340 | |
1341 AC_ARG_WITH([qt], | |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1342 [AS_HELP_STRING([--without-qt], [don't use Qt libraries; disable Qt GUI])], |
21381 | 1343 [if test x"$withval" = xno; then |
1344 check_qt=no; | |
1345 warn_qt_disabled="--without-qt specified. The Qt GUI will be disabled." | |
1346 OCTAVE_CONFIGURE_WARNING([warn_qt_disabled]) | |
1347 fi]) | |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1348 |
21378
172479a97e6c
configure.ac: Remove overquoting in shell variables tests.
Rik <rik@octave.org>
parents:
21374
diff
changeset
|
1349 if test $check_qt = yes; then |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1350 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1351 warn_qt_libraries="" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1352 ## Check for Qt libraries |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1353 QT_MODULES="QtCore QtGui QtNetwork QtOpenGL" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1354 PKG_CHECK_MODULES(QT, [$QT_MODULES], |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1355 [], |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1356 [check_qt=no |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1357 warn_qt_libraries="Qt libraries not found; disabling Qt GUI"]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1358 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1359 if test -n "$warn_qt_libraries"; then |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1360 OCTAVE_CONFIGURE_WARNING([warn_qt_libraries]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1361 fi |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1362 |
21378
172479a97e6c
configure.ac: Remove overquoting in shell variables tests.
Rik <rik@octave.org>
parents:
21374
diff
changeset
|
1363 if test $check_qt = yes; then |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1364 ## Retrieve Qt compilation and linker flags |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1365 QT_CPPFLAGS="`$PKG_CONFIG --cflags-only-I $QT_MODULES`" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1366 QT_LDFLAGS="`$PKG_CONFIG --libs-only-L $QT_MODULES`" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1367 QT_LIBS="`$PKG_CONFIG --libs-only-l $QT_MODULES`" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1368 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1369 case $host_os in |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1370 *darwin*) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1371 ## Qt might be installed in framework |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1372 if test -z "$QT_LIBS"; then |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1373 QT_LDFLAGS="`$PKG_CONFIG --libs-only-other $QT_MODULES | tr ' ' '\n' | $GREP -e '-F' | uniq | tr '\n' ' '`" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1374 QT_LIBS="`$PKG_CONFIG --libs-only-other $QT_MODULES | tr ' ' '\n' | $GREP -v -e '-F' | uniq | tr '\n' ' '`" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1375 ## Enabling link_all_deps works around libtool's imperfect handling |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1376 ## of the -F flag |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1377 AM_CONDITIONAL([AMCOND_LINK_ALL_DEPS], |
21378
172479a97e6c
configure.ac: Remove overquoting in shell variables tests.
Rik <rik@octave.org>
parents:
21374
diff
changeset
|
1378 [test $link_all_deps = yes || test -n "$QT_LDFLAGS"]) |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1379 fi |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1380 ;; |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1381 esac |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1382 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1383 ## Check for Qt4 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1384 if ! `$PKG_CONFIG --atleast-version=4.0.0 QtCore`; then |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1385 check_qt=no |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1386 warn_qt_version="Qt >= 4.0.0 not found; disabling Qt GUI" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1387 OCTAVE_CONFIGURE_WARNING([warn_qt_version]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1388 fi |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1389 fi |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1390 |
21378
172479a97e6c
configure.ac: Remove overquoting in shell variables tests.
Rik <rik@octave.org>
parents:
21374
diff
changeset
|
1391 if test $check_qt = yes; then |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1392 warn_qt_tools="" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1393 AC_CHECK_TOOLS(MOC, [moc-qt4 moc]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1394 AC_CHECK_TOOLS(UIC, [uic-qt4 uic]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1395 AC_CHECK_TOOLS(RCC, [rcc-qt4 rcc]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1396 AC_CHECK_TOOLS(LRELEASE, [lrelease-qt4 lrelease]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1397 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1398 if test -n "$MOC" && test -n "$UIC" && test -n "$RCC" && test -n "$LRELEASE"; then |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1399 AC_DEFINE(HAVE_QT, 1, |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1400 [Define to 1 if Qt is available (libraries, developer header files, utility programs (moc, uic, rcc, and lrelease))]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1401 else |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1402 warn_qt_tools="Qt utility programs moc, uic, rcc, and lrelease not found; disabling Qt GUI" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1403 check_qt=no |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1404 OCTAVE_CONFIGURE_WARNING([warn_qt_tools]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1405 fi |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1406 fi |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1407 |
21378
172479a97e6c
configure.ac: Remove overquoting in shell variables tests.
Rik <rik@octave.org>
parents:
21374
diff
changeset
|
1408 if test $check_qt = yes; then |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1409 warn_qt_setlocale="" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1410 AC_CHECK_FUNCS([setlocale], [], |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1411 [check_qt=no |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1412 warn_qt_setlocale="setlocale not found; disabling Qt GUI"]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1413 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1414 if test -n "$warn_qt_setlocale"; then |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1415 OCTAVE_CONFIGURE_WARNING([warn_qt_setlocale]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1416 fi |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1417 fi |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1418 |
21378
172479a97e6c
configure.ac: Remove overquoting in shell variables tests.
Rik <rik@octave.org>
parents:
21374
diff
changeset
|
1419 if test $check_qt = yes; then |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1420 warn_qt_setvbuf="" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1421 warn_qt_lib_fcns="" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1422 case $host_os in |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1423 mingw* | msdosmsvc*) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1424 AC_CHECK_FUNCS([setvbuf], [win32_terminal=yes], |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1425 [check_qt=no |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1426 warn_qt_setvbuf="setvbuf not found; disabling Qt GUI"]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1427 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1428 if test -n "$warn_qt_setvbuf"; then |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1429 OCTAVE_CONFIGURE_WARNING([warn_qt_setvbuf]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1430 fi |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1431 ;; |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1432 *) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1433 AC_CHECK_HEADERS([pty.h libutil.h util.h]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1434 AC_SEARCH_LIBS([openpty], [util], |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1435 [AC_DEFINE(HAVE_OPENPTY, [], [Define whether openpty exists])]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1436 AC_CHECK_FUNCS([chmod chown ftruncate mmap munmap], [], |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1437 [check_qt=no |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1438 warn_qt_lib_fcns="At least one of chmod, chown, ftruncate, mmap, and munmap not found; disabling Qt GUI"]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1439 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1440 if test -n "$warn_qt_lib_fcns"; then |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1441 OCTAVE_CONFIGURE_WARNING([warn_qt_lib_fcns]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1442 fi |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1443 ;; |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1444 esac |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1445 fi |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1446 |
21378
172479a97e6c
configure.ac: Remove overquoting in shell variables tests.
Rik <rik@octave.org>
parents:
21374
diff
changeset
|
1447 if test $check_qt = yes; then |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1448 OCTAVE_CHECK_FUNC_QABSTRACTITEMMODEL_BEGINRESETMODEL |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1449 |
21378
172479a97e6c
configure.ac: Remove overquoting in shell variables tests.
Rik <rik@octave.org>
parents:
21374
diff
changeset
|
1450 if test $octave_cv_func_qabstractitemmodel_beginresetmodel = no; then |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1451 check_qt=no |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1452 warn_qt_abstract_item_model="QAbstractItemModel::beginResetModel not found; disabling Qt GUI" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1453 OCTAVE_CONFIGURE_WARNING([warn_qt_abstract_item_model]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1454 fi |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1455 fi |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1456 |
21378
172479a97e6c
configure.ac: Remove overquoting in shell variables tests.
Rik <rik@octave.org>
parents:
21374
diff
changeset
|
1457 if test $check_qt = yes; then |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1458 ## We have what we need to build the Qt GUI. The remaining |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1459 ## checks below are for optional features related to the Qt GUI. |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1460 build_qt_gui=yes |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1461 fi |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1462 |
21378
172479a97e6c
configure.ac: Remove overquoting in shell variables tests.
Rik <rik@octave.org>
parents:
21374
diff
changeset
|
1463 if test $check_qt = yes; then |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1464 OCTAVE_CHECK_QFONT_MONOSPACE |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1465 OCTAVE_CHECK_QFONT_FORCE_INTEGER_METRICS |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1466 OCTAVE_CHECK_FUNC_QTABWIDGET_SETMOVABLE |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1467 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1468 if test -n "$OPENGL_LIBS"; then |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1469 OCTAVE_CHECK_QT_OPENGL_OK([build_qt_graphics=yes], |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1470 [warn_qt_opengl="Qt does not work with the OpenGL libs (GL and GLU); disabling OpenGL graphics with Qt GUI"]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1471 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1472 if test -n "$warn_qt_opengl"; then |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1473 OCTAVE_CONFIGURE_WARNING([warn_qt_opengl]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1474 fi |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1475 |
21378
172479a97e6c
configure.ac: Remove overquoting in shell variables tests.
Rik <rik@octave.org>
parents:
21374
diff
changeset
|
1476 if test $build_qt_graphics = yes; then |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1477 AC_DEFINE(HAVE_QT_GRAPHICS, 1, [Define to 1 if Qt works with OpenGL libs (GL and GLU)]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1478 fi |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1479 fi |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1480 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1481 ## Check for Qscintilla library which is used in the Qt GUI editor. |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1482 AC_CACHE_CHECK([whether Qscintilla library is installed], |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1483 [octave_cv_lib_qscintilla], |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1484 [save_CPPFLAGS="$CPPFLAGS" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1485 save_LDFLAGS="$LDFLAGS" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1486 save_LIBS="$LIBS" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1487 CPPFLAGS="$QT_CPPFLAGS $CPPFLAGS" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1488 LDFLAGS="$QT_LDFLAGS $LDFLAGS" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1489 LIBS="$QT_LIBS -lqscintilla2" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1490 AC_LANG_PUSH(C++) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1491 AC_LINK_IFELSE([AC_LANG_PROGRAM([[ |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1492 #include <Qsci/qscilexersql.h> |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1493 ]], [[ |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1494 QsciLexerSQL sqlLexer(0); |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1495 ]])], |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1496 octave_cv_lib_qscintilla=yes, |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1497 octave_cv_lib_qscintilla=no) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1498 CPPFLAGS="$save_CPPFLAGS" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1499 LDFLAGS="$save_LDFLAGS" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1500 LIBS="$save_LIBS" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1501 AC_LANG_POP([C++]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1502 ]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1503 |
21378
172479a97e6c
configure.ac: Remove overquoting in shell variables tests.
Rik <rik@octave.org>
parents:
21374
diff
changeset
|
1504 if test $octave_cv_lib_qscintilla = no; then |
21908
74d60f5e37be
* configure.ac: Fix typo in name of $warn_qscintilla variable.
Mike Miller <mtmiller@octave.org>
parents:
21907
diff
changeset
|
1505 warn_qscintilla="Qscintilla library not found; disabling built-in Qt GUI editor" |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1506 OCTAVE_CONFIGURE_WARNING([warn_qscintilla]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1507 else |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1508 ## Let's assume Qscintilla library is at the same location as |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1509 ## other regular Qt libraries. |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1510 QT_LIBS="$QT_LIBS -lqscintilla2" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1511 OCTAVE_CHECK_VERSION_2_6_0 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1512 AC_DEFINE(HAVE_QSCINTILLA, 1, |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1513 [Define to 1 if the QScintilla library and header files are available]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1514 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1515 save_CPPFLAGS="$CPPFLAGS" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1516 CPPFLAGS="$QT_CPPFLAGS $CPPFLAGS" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1517 AC_LANG_PUSH(C++) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1518 AC_CHECK_HEADERS([Qsci/qscilexeroctave.h Qsci/qscilexermatlab.h]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1519 AC_LANG_POP(C++) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1520 CPPFLAGS="$save_CPPFLAGS" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1521 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1522 OCTAVE_CHECK_FUNC_SETPLACEHOLDERTEXT |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1523 OCTAVE_CHECK_FUNC_QSCI_FINDSELECTION |
21381 | 1524 use_qscintilla=yes |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1525 fi |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1526 fi |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1527 fi |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1528 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1529 AC_SUBST(QT_CPPFLAGS) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1530 AC_SUBST(QT_LDFLAGS) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1531 AC_SUBST(QT_LIBS) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1532 |
21378
172479a97e6c
configure.ac: Remove overquoting in shell variables tests.
Rik <rik@octave.org>
parents:
21374
diff
changeset
|
1533 AM_CONDITIONAL([AMCOND_BUILD_QT_GUI], [test $build_qt_gui = yes]) |
172479a97e6c
configure.ac: Remove overquoting in shell variables tests.
Rik <rik@octave.org>
parents:
21374
diff
changeset
|
1534 AM_CONDITIONAL([AMCOND_BUILD_QT_GRAPHICS], [test $build_qt_graphics = yes]) |
21381 | 1535 AM_CONDITIONAL([AMCOND_HAVE_QSCINTILLA], [test $use_qscintilla = yes]) |
21378
172479a97e6c
configure.ac: Remove overquoting in shell variables tests.
Rik <rik@octave.org>
parents:
21374
diff
changeset
|
1536 AM_CONDITIONAL([WIN32_TERMINAL], [test $win32_terminal = yes]) |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1537 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1538 ## Check for FLTK (www.fltk.org) library |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1539 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1540 check_fltk=yes |
21512
79aa496c6d47
maint: Fix configure warning messages on missing OpenGL graphics support
Mike Miller <mtmiller@octave.org>
parents:
21480
diff
changeset
|
1541 build_fltk_graphics=no |
79aa496c6d47
maint: Fix configure warning messages on missing OpenGL graphics support
Mike Miller <mtmiller@octave.org>
parents:
21480
diff
changeset
|
1542 |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1543 AC_ARG_WITH([fltk], |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1544 [AS_HELP_STRING([--without-fltk], |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1545 [don't use FLTK libraries, disable OpenGL graphics with FLTK widgets])], |
21381 | 1546 [if test x"$withval" = xno; then |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1547 check_fltk=no |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1548 warn_fltk="--without-fltk specified. FLTK widgets will be disabled." |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1549 OCTAVE_CONFIGURE_WARNING([warn_fltk]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1550 fi]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1551 |
19733
08033d583435
more consistently use _CPPFLAGS and _LDFLAGS variables
John W. Eaton <jwe@octave.org>
parents:
19732
diff
changeset
|
1552 FLTK_CPPFLAGS= |
08033d583435
more consistently use _CPPFLAGS and _LDFLAGS variables
John W. Eaton <jwe@octave.org>
parents:
19732
diff
changeset
|
1553 FLTK_LDFLAGS= |
19732
bf25e9f7c22a
use FLTK_CFLAGS and FLTK_LIBS instead of GRAPHICS_CFLAGS and GRAPHICS_LIBS
John W. Eaton <jwe@octave.org>
parents:
19703
diff
changeset
|
1554 FLTK_LIBS= |
10571
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1555 |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1556 if test $check_fltk = yes; then |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1557 AC_ARG_WITH([fltk-prefix], |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1558 [AS_HELP_STRING([--with-fltk-prefix=PFX], |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1559 [prefix where FLTK is installed (optional)])], |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1560 [fltk_prefix="$withval"], |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1561 [fltk_prefix=""]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1562 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1563 AC_ARG_WITH([fltk-exec-prefix], |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1564 [AS_HELP_STRING([--with-fltk-exec-prefix=PFX], |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1565 [exec prefix where FLTK is installed (optional)])], |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1566 [fltk_exec_prefix="$withval"], |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1567 [fltk_exec_prefix=""]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1568 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1569 if test "x$fltk_exec_prefix" != x; then |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1570 fltk_args="$fltk_args --exec-prefix=$fltk_exec_prefix" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1571 if test "x${FLTK_CONFIG+set}" != xset ; then |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1572 FLTK_CONFIG="$fltk_exec_prefix/bin/fltk-config" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1573 fi |
18025
7c0f59b688fc
configure.ac: Check for Xft library before building native graphics.
Rik <rik@octave.org>
parents:
17989
diff
changeset
|
1574 fi |
7c0f59b688fc
configure.ac: Check for Xft library before building native graphics.
Rik <rik@octave.org>
parents:
17989
diff
changeset
|
1575 |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1576 if test "x$fltk_prefix" != x; then |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1577 fltk_args="$fltk_args --prefix=$fltk_prefix" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1578 if test x${FLTK_CONFIG+set} != xset ; then |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1579 FLTK_CONFIG="$fltk_prefix/bin/fltk-config" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1580 fi |
18025
7c0f59b688fc
configure.ac: Check for Xft library before building native graphics.
Rik <rik@octave.org>
parents:
17989
diff
changeset
|
1581 fi |
7c0f59b688fc
configure.ac: Check for Xft library before building native graphics.
Rik <rik@octave.org>
parents:
17989
diff
changeset
|
1582 |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1583 AC_PATH_PROG([FLTK_CONFIG], [fltk-config], [no]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1584 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1585 warn_fltk_config="" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1586 warn_fltk_opengl="" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1587 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1588 if test "$FLTK_CONFIG" = no; then |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1589 warn_fltk_config="FLTK config script not found. Native graphics will be disabled." |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1590 OCTAVE_CONFIGURE_WARNING([warn_fltk_config]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1591 else |
21984
6187b9ce8477
build: Only include -I preprocessor options in FLTK_CPPFLAGS (bug #48302)
Mike Miller <mtmiller@octave.org>
parents:
21949
diff
changeset
|
1592 ## Only include -I options in FLTK_CPPFLAGS |
6187b9ce8477
build: Only include -I preprocessor options in FLTK_CPPFLAGS (bug #48302)
Mike Miller <mtmiller@octave.org>
parents:
21949
diff
changeset
|
1593 fltk_cflags=`$FLTK_CONFIG $fltkconf_args --use-gl --cflags` |
6187b9ce8477
build: Only include -I preprocessor options in FLTK_CPPFLAGS (bug #48302)
Mike Miller <mtmiller@octave.org>
parents:
21949
diff
changeset
|
1594 for fltk_option in $fltk_cflags; do |
6187b9ce8477
build: Only include -I preprocessor options in FLTK_CPPFLAGS (bug #48302)
Mike Miller <mtmiller@octave.org>
parents:
21949
diff
changeset
|
1595 case $fltk_option in |
6187b9ce8477
build: Only include -I preprocessor options in FLTK_CPPFLAGS (bug #48302)
Mike Miller <mtmiller@octave.org>
parents:
21949
diff
changeset
|
1596 -I*) |
6187b9ce8477
build: Only include -I preprocessor options in FLTK_CPPFLAGS (bug #48302)
Mike Miller <mtmiller@octave.org>
parents:
21949
diff
changeset
|
1597 FLTK_CPPFLAGS="$FLTK_CPPFLAGS $fltk_option" |
19582
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1598 ;; |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1599 esac |
21984
6187b9ce8477
build: Only include -I preprocessor options in FLTK_CPPFLAGS (bug #48302)
Mike Miller <mtmiller@octave.org>
parents:
21949
diff
changeset
|
1600 done |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1601 FLTK_LDFLAGS=`$FLTK_CONFIG $fltkconf_args --use-gl --ldflags` |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1602 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1603 case $host_os in |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1604 mingw*) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1605 FLTK_LDFLAGS=`echo $FLTK_LDFLAGS | $SED -e 's/-mwindows//g'` |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1606 ;; |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1607 esac |
21802
66972e1679df
configure.ac: Fix check for OpenGL support in FLTK
Andreas Weber <andy.weber.aw@gmail.com>
parents:
21724
diff
changeset
|
1608 AC_LANG_PUSH(C++) |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1609 AC_CACHE_CHECK([for OpenGL support in FLTK], |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1610 [octave_cv_fltk_opengl_support], |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1611 [save_CPPFLAGS="$CPPFLAGS" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1612 CPPFLAGS="$CFLAGS $FLTK_CPPFLAGS" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1613 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1614 #include <FL/gl.h> |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1615 ]], [[ |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1616 int nothing = 0; |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1617 ]])], |
21802
66972e1679df
configure.ac: Fix check for OpenGL support in FLTK
Andreas Weber <andy.weber.aw@gmail.com>
parents:
21724
diff
changeset
|
1618 octave_cv_fltk_opengl_support=yes, |
66972e1679df
configure.ac: Fix check for OpenGL support in FLTK
Andreas Weber <andy.weber.aw@gmail.com>
parents:
21724
diff
changeset
|
1619 octave_cv_fltk_opengl_support=no) |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1620 CPPFLAGS="$save_CPPFLAGS" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1621 ]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1622 if test $octave_cv_fltk_opengl_support = no; then |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1623 warn_fltk_opengl="FLTK does not have OpenGL support. OpenGL graphics with FLTK widgets will be disabled." |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1624 else |
21512
79aa496c6d47
maint: Fix configure warning messages on missing OpenGL graphics support
Mike Miller <mtmiller@octave.org>
parents:
21480
diff
changeset
|
1625 build_fltk_graphics=yes |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1626 AC_DEFINE(HAVE_FLTK, 1, [Define to 1 if FLTK is available.]) |
10571
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1627 fi |
21802
66972e1679df
configure.ac: Fix check for OpenGL support in FLTK
Andreas Weber <andy.weber.aw@gmail.com>
parents:
21724
diff
changeset
|
1628 AC_LANG_POP(C++) |
19582
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1629 |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1630 if test -n "$warn_fltk_opengl"; then |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1631 OCTAVE_CONFIGURE_WARNING([warn_fltk_opengl]) |
10571
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1632 fi |
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1633 fi |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1634 fi |
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1635 |
19733
08033d583435
more consistently use _CPPFLAGS and _LDFLAGS variables
John W. Eaton <jwe@octave.org>
parents:
19732
diff
changeset
|
1636 AC_SUBST(FLTK_CPPFLAGS) |
08033d583435
more consistently use _CPPFLAGS and _LDFLAGS variables
John W. Eaton <jwe@octave.org>
parents:
19732
diff
changeset
|
1637 AC_SUBST(FLTK_LDFLAGS) |
19732
bf25e9f7c22a
use FLTK_CFLAGS and FLTK_LIBS instead of GRAPHICS_CFLAGS and GRAPHICS_LIBS
John W. Eaton <jwe@octave.org>
parents:
19703
diff
changeset
|
1638 AC_SUBST(FLTK_LIBS) |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1639 |
21512
79aa496c6d47
maint: Fix configure warning messages on missing OpenGL graphics support
Mike Miller <mtmiller@octave.org>
parents:
21480
diff
changeset
|
1640 if test $build_qt_graphics = no && test $build_fltk_graphics = no; then |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1641 opengl_graphics=no |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1642 else |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1643 opengl_graphics=yes |
19732
bf25e9f7c22a
use FLTK_CFLAGS and FLTK_LIBS instead of GRAPHICS_CFLAGS and GRAPHICS_LIBS
John W. Eaton <jwe@octave.org>
parents:
19703
diff
changeset
|
1644 fi |
19703
a81177f4bfe6
Add __osmesa_print__.cc for offscreen rendering with OpenGL
Andreas Weber <andy.weber.aw@gmail.com>
parents:
19697
diff
changeset
|
1645 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1646 ### Start determination of shared vs. static libraries |
3827 | 1647 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1648 ## 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
|
1649 case $canonical_host_type in |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1650 alpha*-dec-osf1.3) |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1651 LD_STATIC_FLAG=-static |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1652 ;; |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1653 esac |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1654 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
|
1655 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
|
1656 fi |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1657 AC_SUBST(LD_STATIC_FLAG) |
3827 | 1658 |
3130 | 1659 OCTAVE_PROG_AR |
3012 | 1660 |
9801
13868ea67c71
configure.ac: fail if LT_INIT is not defined
John W. Eaton <jwe@octave.org>
parents:
9799
diff
changeset
|
1661 ifdef([LT_INIT], [], [ |
13868ea67c71
configure.ac: fail if LT_INIT is not defined
John W. Eaton <jwe@octave.org>
parents:
9799
diff
changeset
|
1662 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
|
1663 ]) |
13868ea67c71
configure.ac: fail if LT_INIT is not defined
John W. Eaton <jwe@octave.org>
parents:
9799
diff
changeset
|
1664 m4exit([1])]) |
13868ea67c71
configure.ac: fail if LT_INIT is not defined
John W. Eaton <jwe@octave.org>
parents:
9799
diff
changeset
|
1665 |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1666 LT_PREREQ([2.2.2]) |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1667 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
|
1668 |
19862
6b851f6acd55
configure.ac: Remove a few more test x"" instances.
Rik <rik@octave.org>
parents:
19860
diff
changeset
|
1669 if test $enable_shared = yes; then |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1670 SHARED_LIBS=yes |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1671 else |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1672 SHARED_LIBS=no |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1673 fi |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
1674 AC_SUBST(SHARED_LIBS) |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1675 |
19862
6b851f6acd55
configure.ac: Remove a few more test x"" instances.
Rik <rik@octave.org>
parents:
19860
diff
changeset
|
1676 if test $enable_static = yes; then |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1677 STATIC_LIBS=yes |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1678 else |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1679 STATIC_LIBS=no |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1680 fi |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
1681 AC_SUBST(STATIC_LIBS) |
3012 | 1682 |
6137 | 1683 XTRA_CRUFT_SH_LDFLAGS= |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1684 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
|
1685 FLIBS="$FLIBS -lkernel32" |
17932
87db35b69cfd
* configure.ac (XTRA_CRUFT_SH_LDFLAGS): Remove "-def" for MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
17924
diff
changeset
|
1686 XTRA_CRUFT_SH_LDFLAGS="-Wl,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
|
1687 fi |
6137 | 1688 AC_SUBST(XTRA_CRUFT_SH_LDFLAGS) |
6102 | 1689 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1690 ### 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
|
1691 |
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1692 ## 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
|
1693 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
|
1694 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
|
1695 |
17976
437e51a0c25d
Assume yes for ax_blas_f77_func_ok when cross-compiling.
Rik <rik@octave.org>
parents:
17964
diff
changeset
|
1696 AX_BLAS_WITH_F77_FUNC([:], [:], |
17989
4465699450c2
configure.ac: Don't use internal macro variable ax_blas_f77_func_ok.
Rik <rik@octave.org>
parents:
17976
diff
changeset
|
1697 [ax_blas_ok=yes |
4465699450c2
configure.ac: Don't use internal macro variable ax_blas_f77_func_ok.
Rik <rik@octave.org>
parents:
17976
diff
changeset
|
1698 AC_MSG_CHECKING([BLAS can be called from Fortran]) |
4465699450c2
configure.ac: Don't use internal macro variable ax_blas_f77_func_ok.
Rik <rik@octave.org>
parents:
17976
diff
changeset
|
1699 AC_MSG_RESULT([yes assumed for cross compilation])]) |
10951 | 1700 AX_LAPACK([:], [:]) |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1701 |
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
|
1702 ## 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
|
1703 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
|
1704 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1705 ## If necessary, try again with -ff2c in FFLAGS |
17989
4465699450c2
configure.ac: Don't use internal macro variable ax_blas_f77_func_ok.
Rik <rik@octave.org>
parents:
17976
diff
changeset
|
1706 if test $ax_blas_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
|
1707 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
|
1708 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
|
1709 |
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
|
1710 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
|
1711 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
|
1712 |
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
|
1713 ## 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
|
1714 |
17989
4465699450c2
configure.ac: Don't use internal macro variable ax_blas_f77_func_ok.
Rik <rik@octave.org>
parents:
17976
diff
changeset
|
1715 if test $ax_blas_ok = yes; then |
4465699450c2
configure.ac: Don't use internal macro variable ax_blas_f77_func_ok.
Rik <rik@octave.org>
parents:
17976
diff
changeset
|
1716 FFLAGS="-ff2c $save_FFLAGS" |
4465699450c2
configure.ac: Don't use internal macro variable ax_blas_f77_func_ok.
Rik <rik@octave.org>
parents:
17976
diff
changeset
|
1717 else |
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
|
1718 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
|
1719 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
|
1720 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
|
1721 |
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
|
1722 ## On OSX, try again with a wrapper library (without -ff2c!) |
17989
4465699450c2
configure.ac: Don't use internal macro variable ax_blas_f77_func_ok.
Rik <rik@octave.org>
parents:
17976
diff
changeset
|
1723 if test $ax_blas_ok = no; then |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
1724 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
1725 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
|
1726 ## 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
|
1727 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
|
1728 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
|
1729 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
|
1730 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
|
1731 #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
|
1732 ]])], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1733 [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
|
1734 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
|
1735 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
|
1736 |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1737 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
|
1738 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
|
1739 |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1740 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
|
1741 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
|
1742 |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1743 ## Restore FFLAGS. |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1744 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
|
1745 |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1746 ## 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
|
1747 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
|
1748 [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
|
1749 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
|
1750 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
|
1751 |
17989
4465699450c2
configure.ac: Don't use internal macro variable ax_blas_f77_func_ok.
Rik <rik@octave.org>
parents:
17976
diff
changeset
|
1752 if test $ax_blas_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
|
1753 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
|
1754 else |
15271
648dabbb4c6b
build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
15257
diff
changeset
|
1755 ## wrapper in cruft, remove from BLAS_LIBS |
17661
1978a6c76aa9
Use user-specified SED during build process (bug #40273).
Rik <rik@octave.org>
parents:
17640
diff
changeset
|
1756 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
|
1757 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
|
1758 [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
|
1759 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
|
1760 ;; |
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
|
1761 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
|
1762 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
|
1763 |
17989
4465699450c2
configure.ac: Don't use internal macro variable ax_blas_f77_func_ok.
Rik <rik@octave.org>
parents:
17976
diff
changeset
|
1764 if test $ax_blas_ok = no; then |
21378
172479a97e6c
configure.ac: Remove overquoting in shell variables tests.
Rik <rik@octave.org>
parents:
21374
diff
changeset
|
1765 if test $ENABLE_64 = 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
|
1766 ## Attempt to be more informative. |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1767 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
|
1768 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
|
1769 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
|
1770 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
|
1771 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
|
1772 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1773 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
|
1774 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
|
1775 fi |
3690 | 1776 |
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
|
1777 ### Check for the qrupdate library |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1778 |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
1779 ## No need to adjust FFLAGS because only link is attempted. |
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
|
1780 ## 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
|
1781 save_LIBS="$LIBS" |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1782 LIBS="$LAPACK_LIBS $BLAS_LIBS $FLIBS $LIBS" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1783 OCTAVE_CHECK_LIB(qrupdate, qrupdate, |
9571
263a8ed419b0
configure.in: style fixes for messages
John W. Eaton <jwe@octave.org>
parents:
9570
diff
changeset
|
1784 [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
|
1785 [], |
9707
6f5c4c82c5fc
avoid ugly F77 names in configure
Jaroslav Hajek <highegg@gmail.com>
parents:
9648
diff
changeset
|
1786 [sqr1up], |
6f5c4c82c5fc
avoid ugly F77 names in configure
Jaroslav Hajek <highegg@gmail.com>
parents:
9648
diff
changeset
|
1787 [Fortran 77], [don't use qrupdate, disable QR & Cholesky updating functions]) |
9708 | 1788 |
19349
043440fa7006
configure.ac: Respect without-z and without-qrupdate options when config.cache exists.
Rik <rik@octave.org>
parents:
19344
diff
changeset
|
1789 ## Additional check to see if qrupdate lib found supports LU updates |
043440fa7006
configure.ac: Respect without-z and without-qrupdate options when config.cache exists.
Rik <rik@octave.org>
parents:
19344
diff
changeset
|
1790 if test -z "$warn_qrupdate"; then |
15361
01c4f5d8a656
configure.ac: Cache results for QRUPDATE_LUU autoconf test.
Rik <rik@octave.org>
parents:
15350
diff
changeset
|
1791 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
|
1792 [octave_cv_func_slup1up], |
01c4f5d8a656
configure.ac: Cache results for QRUPDATE_LUU autoconf test.
Rik <rik@octave.org>
parents:
15350
diff
changeset
|
1793 [LIBS="$LIBS $QRUPDATE_LIBS" |
01c4f5d8a656
configure.ac: Cache results for QRUPDATE_LUU autoconf test.
Rik <rik@octave.org>
parents:
15350
diff
changeset
|
1794 AC_LANG_PUSH([Fortran 77]) |
01c4f5d8a656
configure.ac: Cache results for QRUPDATE_LUU autoconf test.
Rik <rik@octave.org>
parents:
15350
diff
changeset
|
1795 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
|
1796 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
|
1797 AC_LANG_POP([Fortran 77]) |
01c4f5d8a656
configure.ac: Cache results for QRUPDATE_LUU autoconf test.
Rik <rik@octave.org>
parents:
15350
diff
changeset
|
1798 ]) |
01c4f5d8a656
configure.ac: Cache results for QRUPDATE_LUU autoconf test.
Rik <rik@octave.org>
parents:
15350
diff
changeset
|
1799 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
|
1800 AC_DEFINE(HAVE_QRUPDATE_LUU, 1, [Define to 1 if qrupdate supports LU updates.]) |
9708 | 1801 fi |
1802 fi | |
9570
1ab56c73ec7c
use OCTAVE_CHECK_LIBRARY to check for qrupdate library
John W. Eaton <jwe@octave.org>
parents:
9568
diff
changeset
|
1803 LIBS="$save_LIBS" |
8547
d66c9b6e506a
imported patch qrupdate.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8417
diff
changeset
|
1804 |
21131
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
1805 if test $ENABLE_64 = yes; then |
16318
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
1806 CHOLMOD_TAG="_l_" |
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
1807 CXSPARSE_TAG="_dl_" |
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
1808 UMFPACK_TAG="_zl_" |
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
1809 else |
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
1810 CHOLMOD_TAG="_" |
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
1811 CXSPARSE_TAG="_di_" |
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
1812 UMFPACK_TAG="_zi_" |
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
1813 fi |
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
1814 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1815 ### Check for AMD library |
7619 | 1816 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1817 OCTAVE_CHECK_LIB(amd, AMD, |
9571
263a8ed419b0
configure.in: style fixes for messages
John W. Eaton <jwe@octave.org>
parents:
9570
diff
changeset
|
1818 [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
|
1819 [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
|
1820 [amd_postorder], |
10003
2ea3110e15ed
Use M4 quoting for arguments to autoconf macros containing variables
Rik <rdrider0-list@yahoo.com>
parents:
9989
diff
changeset
|
1821 [], [don't use AMD library, disable some sparse matrix functionality]) |
5451 | 1822 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1823 ### Check for CAMD library |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1824 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1825 OCTAVE_CHECK_LIB(camd, CAMD, |
9571
263a8ed419b0
configure.in: style fixes for messages
John W. Eaton <jwe@octave.org>
parents:
9570
diff
changeset
|
1826 [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
|
1827 [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
|
1828 [camd_postorder], |
10003
2ea3110e15ed
Use M4 quoting for arguments to autoconf macros containing variables
Rik <rdrider0-list@yahoo.com>
parents:
9989
diff
changeset
|
1829 [], [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
|
1830 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1831 ### Check for COLAMD library |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1832 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1833 OCTAVE_CHECK_LIB(colamd, COLAMD, |
9571
263a8ed419b0
configure.in: style fixes for messages
John W. Eaton <jwe@octave.org>
parents:
9570
diff
changeset
|
1834 [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
|
1835 [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
|
1836 [colamd], |
10003
2ea3110e15ed
Use M4 quoting for arguments to autoconf macros containing variables
Rik <rdrider0-list@yahoo.com>
parents:
9989
diff
changeset
|
1837 [], [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
|
1838 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1839 ### Check for CCOLAMD library |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1840 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1841 OCTAVE_CHECK_LIB(ccolamd, CCOLAMD, |
9571
263a8ed419b0
configure.in: style fixes for messages
John W. Eaton <jwe@octave.org>
parents:
9570
diff
changeset
|
1842 [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
|
1843 [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
|
1844 [ccolamd], |
10003
2ea3110e15ed
Use M4 quoting for arguments to autoconf macros containing variables
Rik <rdrider0-list@yahoo.com>
parents:
9989
diff
changeset
|
1845 [], [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
|
1846 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1847 ### Check for CHOLMOD library. |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1848 ### 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
|
1849 ### configure with --with-cholmod="-lcholmod -lcblas". |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1850 |
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1851 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
|
1852 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
|
1853 OCTAVE_CHECK_LIB(cholmod, CHOLMOD, |
9571
263a8ed419b0
configure.in: style fixes for messages
John W. Eaton <jwe@octave.org>
parents:
9570
diff
changeset
|
1854 [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
|
1855 [suitesparse/cholmod.h ufsparse/cholmod.h cholmod/cholmod.h cholmod.h], |
16318
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
1856 [cholmod${CHOLMOD_TAG}start], |
10003
2ea3110e15ed
Use M4 quoting for arguments to autoconf macros containing variables
Rik <rdrider0-list@yahoo.com>
parents:
9989
diff
changeset
|
1857 [], [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
|
1858 LIBS="$save_LIBS" |
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1859 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1860 ### Check for CXSparse library |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1861 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1862 OCTAVE_CHECK_LIB(cxsparse, CXSparse, |
9571
263a8ed419b0
configure.in: style fixes for messages
John W. Eaton <jwe@octave.org>
parents:
9570
diff
changeset
|
1863 [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
|
1864 [suitesparse/cs.h ufsparse/cs.h cxsparse/cs.h cs.h], |
16318
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
1865 [cs${CXSPARSE_TAG}sqr], |
10003
2ea3110e15ed
Use M4 quoting for arguments to autoconf macros containing variables
Rik <rdrider0-list@yahoo.com>
parents:
9989
diff
changeset
|
1866 [C++], [don't use CXSparse library, disable some sparse matrix functionality]) |
6024 | 1867 |
21174
a223cce1daa4
strip trailing space from source files we maintain
John W. Eaton <jwe@octave.org>
parents:
21160
diff
changeset
|
1868 ## Additional check for CXSparse version >= 2.2 |
21160
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
1869 if test $octave_cv_lib_cxsparse = yes; then |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
1870 OCTAVE_CHECK_CXSPARSE_VERSION_OK |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
1871 if test $octave_cv_cxsparse_version_ok = no; then |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
1872 AC_MSG_ERROR([CXSparse library is too old (< version 2.2). Upgrade CXSparse (SuiteSparse) or configure Octave with --disable-cxsparse"]) |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
1873 fi |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
1874 fi |
21174
a223cce1daa4
strip trailing space from source files we maintain
John W. Eaton <jwe@octave.org>
parents:
21160
diff
changeset
|
1875 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1876 ### Check for UMFPACK library. |
5226 | 1877 |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1878 save_LIBS="$LIBS" |
9787
cc5bb7b5679f
use AMD_CPPFLAGS when checking for UMFPACK
David Grundberg <davidg@cs.umu.se>
parents:
9763
diff
changeset
|
1879 save_CPPFLAGS="$CPPFLAGS" |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1880 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
|
1881 CPPFLAGS="$AMD_CPPFLAGS $CPPFLAGS" |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1882 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
|
1883 [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
|
1884 [suitesparse/umfpack.h ufsparse/umfpack.h umfpack/umfpack.h umfpack.h], |
16318
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
1885 [umfpack${UMFPACK_TAG}get_determinant], |
10003
2ea3110e15ed
Use M4 quoting for arguments to autoconf macros containing variables
Rik <rdrider0-list@yahoo.com>
parents:
9989
diff
changeset
|
1886 [], [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
|
1887 CPPFLAGS="$save_CPPFLAGS" |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1888 LIBS="$save_LIBS" |
5512 | 1889 |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1890 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
|
1891 ## Invalidate the cache and try again with -lcblas. |
16318
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
1892 $as_unset ac_cv_lib_umfpack_umfpack${UMFPACK_TAG}get_determinant |
15350
6a0c0d3d60b6
build: Implement some caching for OCTAVE_CHECK_LIB macro.
Rik <rik@octave.org>
parents:
15349
diff
changeset
|
1893 $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
|
1894 save_LIBS="$LIBS" |
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1895 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
|
1896 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
|
1897 [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
|
1898 [suitesparse/umfpack.h ufsparse/umfpack.h umfpack/umfpack.h umfpack.h], |
16318
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
1899 [umfpack${UMFPACK_TAG}get_determinant], |
10003
2ea3110e15ed
Use M4 quoting for arguments to autoconf macros containing variables
Rik <rdrider0-list@yahoo.com>
parents:
9989
diff
changeset
|
1900 [], [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
|
1901 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
|
1902 UMFPACK_LIBS="$UMFPACK_LIBS -lcblas" |
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1903 fi |
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1904 LIBS="$save_LIBS" |
6133 | 1905 fi |
5513 | 1906 |
15329
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1907 ## 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
|
1908 |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1909 if test -n "$UMFPACK_LIBS"; then |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1910 ## SuiteSparse >= 4.0 needs additional link library for SuiteSparse_time |
18266
975480e1be4b
configure.ac: Add AMD_CPPFLAGS to UMFPACK tests (bug #41209).
Kyle Guinn <elyk03@gmail.com>
parents:
18264
diff
changeset
|
1911 save_CPPFLAGS="$CPPFLAGS" |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1912 save_LIBS="$LIBS"; |
18266
975480e1be4b
configure.ac: Add AMD_CPPFLAGS to UMFPACK tests (bug #41209).
Kyle Guinn <elyk03@gmail.com>
parents:
18264
diff
changeset
|
1913 CPPFLAGS="$UMFPACK_CPPFLAGS $AMD_CPPFLAGS $CPPFLAGS" |
15349
90c2b2d777bf
configure.ac: Fix building of Octave with ancient versions of SuiteSparse (3.2.X)
Rik <rik@octave.org>
parents:
15346
diff
changeset
|
1914 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
|
1915 xtra_libs= |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1916 OCTAVE_UMFPACK_NEED_SUITESPARSE_TIME |
22007
0e31c85c3969
* configure.ac: Check for suitesparse config lib if --enable-static.
John W. Eaton <jwe@octave.org>
parents:
21984
diff
changeset
|
1917 if test $STATIC_LIBS = yes || 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
|
1918 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
|
1919 ## 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
|
1920 ## 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
|
1921 AC_SEARCH_LIBS([SuiteSparse_time], |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1922 [suitesparseconfig SuiteSparse], |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1923 [], [], [$xtra_libs]) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1924 case $ac_cv_search_SuiteSparse_time in |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
1925 -l*) |
15329
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1926 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
|
1927 ;; |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1928 no) |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1929 UMFPACK_LIBS= |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1930 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
|
1931 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
|
1932 ;; |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1933 esac |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1934 fi |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1935 LIBS="$save_LIBS" |
18266
975480e1be4b
configure.ac: Add AMD_CPPFLAGS to UMFPACK tests (bug #41209).
Kyle Guinn <elyk03@gmail.com>
parents:
18264
diff
changeset
|
1936 CPPFLAGS="$save_CPPFLAGS" |
15329
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1937 |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1938 ## 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
|
1939 if test -n "$UMFPACK_LIBS"; then |
18266
975480e1be4b
configure.ac: Add AMD_CPPFLAGS to UMFPACK tests (bug #41209).
Kyle Guinn <elyk03@gmail.com>
parents:
18264
diff
changeset
|
1940 save_CPPFLAGS="$CPPFLAGS" |
15329
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1941 save_LIBS="$LIBS"; |
18266
975480e1be4b
configure.ac: Add AMD_CPPFLAGS to UMFPACK tests (bug #41209).
Kyle Guinn <elyk03@gmail.com>
parents:
18264
diff
changeset
|
1942 CPPFLAGS="$UMFPACK_CPPFLAGS $AMD_CPPFLAGS $CPPFLAGS" |
15349
90c2b2d777bf
configure.ac: Fix building of Octave with ancient versions of SuiteSparse (3.2.X)
Rik <rik@octave.org>
parents:
15346
diff
changeset
|
1943 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
|
1944 OCTAVE_UMFPACK_SEPARATE_SPLIT |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1945 LIBS="$save_LIBS" |
18266
975480e1be4b
configure.ac: Add AMD_CPPFLAGS to UMFPACK tests (bug #41209).
Kyle Guinn <elyk03@gmail.com>
parents:
18264
diff
changeset
|
1946 CPPFLAGS="$save_CPPFLAGS" |
15329
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1947 fi |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1948 fi |
5226 | 1949 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1950 ### Check for ARPACK library. |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1951 |
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
|
1952 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
|
1953 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
|
1954 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
|
1955 [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
|
1956 [], |
834df9f10963
remove ARPACK files from sources and restore configure checks for external ARPACK library
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
1957 [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
|
1958 [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
|
1959 [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
|
1960 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
|
1961 [AC_DEFINE(HAVE_ARPACK, 1, [Define to 1 if ARPACK is available.])], |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1962 [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
|
1963 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
|
1964 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1965 ### Check for readline library. |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1966 |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1967 OCTAVE_ENABLE_READLINE |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1968 |
4128 | 1969 ### Enable dynamic linking. --enable-shared implies this, so |
1970 ### --enable-dl is only need if you are only building static libraries | |
1971 ### and want to try dynamic linking too (works on some systems, for | |
1972 ### example, OS X and Windows). | |
1973 | |
11216
5036b0ff9597
configure.ac: Properly m4 quote AS_HELP_STRING.
Rik <octave@nomad.inbox5.com>
parents:
11214
diff
changeset
|
1974 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
|
1975 [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
|
1976 [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
|
1977 [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
|
1978 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
|
1979 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
|
1980 *) 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
|
1981 esac], |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1982 [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
|
1983 |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1984 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
|
1985 AC_MSG_ERROR([You can't disable building both static AND shared libraries!]) |
3034 | 1986 fi |
1987 | |
2813 | 1988 CPICFLAG=-fPIC |
1989 CXXPICFLAG=-fPIC | |
1990 FPICFLAG=-fPIC | |
21409
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
1991 SH_LD="${CXX}" |
2813 | 1992 SH_LDFLAGS=-shared |
21409
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
1993 DL_LD="${SH_LD}" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
1994 DL_LDFLAGS="${SH_LDFLAGS}" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
1995 MKOCTFILE_DL_LDFLAGS="${DL_LDFLAGS}" |
4199 | 1996 NO_OCT_FILE_STRIP=false |
21409
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
1997 TEMPLATE_AR="${AR}" |
3775 | 1998 TEMPLATE_ARFLAGS="$ARFLAGS" |
6137 | 1999 CRUFT_DLL_DEFS= |
2000 OCTAVE_DLL_DEFS= | |
2001 OCTINTERP_DLL_DEFS= | |
15257
7ee62f559a73
Fix compilation under Windows with GUI and LLVM enabled.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15238
diff
changeset
|
2002 OCTGUI_DLL_DEFS= |
7825
13871b7de124
Import sources for OpenGL-based renderer.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7789
diff
changeset
|
2003 OCTGRAPHICS_DLL_DEFS= |
4104 | 2004 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
|
2005 ldpreloadsep=" " |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
2006 case $canonical_host_type in |
6668 | 2007 *-*-386bsd* | *-*-netbsd*) |
2813 | 2008 SH_LD=ld |
2009 SH_LDFLAGS=-Bshareable | |
2010 ;; | |
6668 | 2011 *-*-openbsd*) |
21420
29e8d4a922b5
expand MKOCTFILE variables in configure script
John W. Eaton <jwe@octave.org>
parents:
21413
diff
changeset
|
2012 SH_LDFLAGS="-shared -fPIC" |
6668 | 2013 ;; |
4323 | 2014 *-*-freebsd*) |
5508 | 2015 SH_LDFLAGS="-shared -Wl,-x" |
4323 | 2016 ;; |
3127 | 2017 alpha*-dec-osf*) |
2813 | 2018 CPICFLAG= |
2019 CXXPICFLAG= | |
2020 FPICFLAG= | |
4283 | 2021 SH_LDFLAGS="-shared -Wl,-expect_unresolved -Wl,'*'" |
2813 | 2022 ;; |
3956 | 2023 *-*-darwin*) |
21925
a53f46577e39
Fix variable expansion in dynamic linking flags for macOS (bug #48215)
Mike Miller <mtmiller@octave.org>
parents:
21908
diff
changeset
|
2024 DL_LDFLAGS="-bundle -bundle_loader ${ac_top_build_prefix}libinterp/octave ${LDFLAGS}" |
a53f46577e39
Fix variable expansion in dynamic linking flags for macOS (bug #48215)
Mike Miller <mtmiller@octave.org>
parents:
21908
diff
changeset
|
2025 ## Contains variables that are defined and undefined at this point, so use |
a53f46577e39
Fix variable expansion in dynamic linking flags for macOS (bug #48215)
Mike Miller <mtmiller@octave.org>
parents:
21908
diff
changeset
|
2026 ## appropriate quoting to defer expansion of ${bindir} and ${version}. |
a53f46577e39
Fix variable expansion in dynamic linking flags for macOS (bug #48215)
Mike Miller <mtmiller@octave.org>
parents:
21908
diff
changeset
|
2027 MKOCTFILE_DL_LDFLAGS='-bundle -bundle_loader ${bindir}/octave-${version}'"${EXEEXT}" |
21420
29e8d4a922b5
expand MKOCTFILE variables in configure script
John W. Eaton <jwe@octave.org>
parents:
21413
diff
changeset
|
2028 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
|
2029 case $canonical_host_type in |
7266 | 2030 powerpc-*) |
2031 CXXPICFLAG= | |
2032 CPICFLAG= | |
2033 FPICFLAG= | |
2034 ;; | |
2035 esac | |
4199 | 2036 NO_OCT_FILE_STRIP=true |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
2037 library_path_var=DYLD_LIBRARY_PATH |
3956 | 2038 ;; |
8675
43c6012bd4c2
configure.in: separate cases for cygwin and mingw
Benjamin Lindner <lindnerben@gmx.net>
parents:
8659
diff
changeset
|
2039 *-*-cygwin*) |
9054
0735e427c6c0
configure fixes for cygwin
Marco Atzeri <marco_atzeri@yahoo.it>
parents:
9049
diff
changeset
|
2040 CPICFLAG= |
0735e427c6c0
configure fixes for cygwin
Marco Atzeri <marco_atzeri@yahoo.it>
parents:
9049
diff
changeset
|
2041 CXXPICFLAG= |
0735e427c6c0
configure fixes for cygwin
Marco Atzeri <marco_atzeri@yahoo.it>
parents:
9049
diff
changeset
|
2042 FPICFLAG= |
5451 | 2043 DL_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc" |
5414 | 2044 SH_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-auto-image-base" |
9613
16907d1153d1
attempt to fix LD_PRELOAD for Cygwin
John W. Eaton <jwe@octave.org>
parents:
9610
diff
changeset
|
2045 ldpreloadsep=":" |
4102 | 2046 ;; |
8675
43c6012bd4c2
configure.in: separate cases for cygwin and mingw
Benjamin Lindner <lindnerben@gmx.net>
parents:
8659
diff
changeset
|
2047 *-*-mingw*) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
2048 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
|
2049 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
|
2050 CPICFLAG= |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
2051 CXXPICFLAG= |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
2052 FPICFLAG= |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
2053 SH_LDFLAGS="-shared" |
17661
1978a6c76aa9
Use user-specified SED during build process (bug #40273).
Rik <rik@octave.org>
parents:
17640
diff
changeset
|
2054 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
|
2055 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
|
2056 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
|
2057 fi |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
2058 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
|
2059 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
|
2060 ## 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
|
2061 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
|
2062 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
|
2063 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
|
2064 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
|
2065 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
|
2066 else |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
2067 CPICFLAG= |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
2068 CXXPICFLAG= |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
2069 FPICFLAG= |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
2070 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
|
2071 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
|
2072 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
|
2073 fi |
8675
43c6012bd4c2
configure.in: separate cases for cygwin and mingw
Benjamin Lindner <lindnerben@gmx.net>
parents:
8659
diff
changeset
|
2074 ;; |
8618
f8b3ece45bda
use separate prefix for shllib and shlbin files
John W. Eaton <jwe@octave.org>
parents:
8607
diff
changeset
|
2075 |
6089 | 2076 *-*-msdosmsvc) |
6794 | 2077 DL_LDFLAGS="-shared" |
6051 | 2078 CPICFLAG= |
2079 CXXPICFLAG= | |
2080 FPICFLAG= | |
6794 | 2081 SH_LDFLAGS="-shared" |
17661
1978a6c76aa9
Use user-specified SED during build process (bug #40273).
Rik <rik@octave.org>
parents:
17640
diff
changeset
|
2082 if test -n "`echo $CFLAGS | $GREP -e '-g'`" || test -n "`echo $CXXFLAGS | $GREP -e '-g'`"; then |
6794 | 2083 DL_LDFLAGS="$DL_LDFLAGS -g" |
2084 SH_LDFLAGS="$SH_LDFLAGS -g" | |
2085 fi | |
6255 | 2086 NO_OCT_FILE_STRIP=true |
6100 | 2087 library_path_var=PATH |
6087 | 2088 ## Extra compilation flags. |
6137 | 2089 CRUFT_DLL_DEFS="-DCRUFT_DLL" |
2090 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
|
2091 OCTGUI_DLL_DEFS="-DOCTGUI_DLL" |
7825
13871b7de124
Import sources for OpenGL-based renderer.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7789
diff
changeset
|
2092 OCTGRAPHICS_DLL_DEFS="-DOCTGRAPHICS_DLL" |
6051 | 2093 ;; |
3740 | 2094 *-*-linux* | *-*-gnu*) |
4906 | 2095 MKOCTFILE_DL_LDFLAGS="-shared -Wl,-Bsymbolic" |
2813 | 2096 ;; |
3887 | 2097 i[[3456]]86-*-sco3.2v5*) |
3160 | 2098 SH_LDFLAGS=-G |
2099 ;; | |
2813 | 2100 rs6000-ibm-aix* | powerpc-ibm-aix*) |
2101 CPICFLAG= | |
2102 CXXPICFLAG= | |
2103 FPICFLAG= | |
9172
cd68431b395a
configure.in: shared library fixes for AIX and HPUX
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9171
diff
changeset
|
2104 library_path_var=LIBPATH |
2813 | 2105 ;; |
2106 hppa*-hp-hpux*) | |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
2107 if test $ac_cv_f77_compiler_gnu = yes; then |
2813 | 2108 FPICFLAG=-fPIC |
2109 else | |
2110 FPICFLAG=+Z | |
2111 fi | |
2112 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
|
2113 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
|
2114 ;; |
cd68431b395a
configure.in: shared library fixes for AIX and HPUX
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9171
diff
changeset
|
2115 ia64*-hp-hpux*) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
2116 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
|
2117 FPICFLAG=-fPIC |
cd68431b395a
configure.in: shared library fixes for AIX and HPUX
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9171
diff
changeset
|
2118 else |
cd68431b395a
configure.in: shared library fixes for AIX and HPUX
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9171
diff
changeset
|
2119 FPICFLAG=+Z |
cd68431b395a
configure.in: shared library fixes for AIX and HPUX
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9171
diff
changeset
|
2120 fi |
cd68431b395a
configure.in: shared library fixes for AIX and HPUX
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9171
diff
changeset
|
2121 SH_LDFLAGS="-shared -fPIC" |
2813 | 2122 ;; |
2123 *-sgi-*) | |
2124 CPICFLAG= | |
2125 CXXPICFLAG= | |
2126 FPICFLAG= | |
2127 ;; | |
2128 sparc-sun-sunos4*) | |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
2129 if test $ac_cv_f77_compiler_gnu = yes; then |
2813 | 2130 FPICFLAG=-fPIC |
2131 else | |
2132 FPICFLAG=-PIC | |
2133 fi | |
3059 | 2134 SH_LD=ld |
2135 SH_LDFLAGS="-assert nodefinitions" | |
2813 | 2136 ;; |
3606 | 2137 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
|
2138 if test $ac_cv_f77_compiler_gnu = yes; then |
2813 | 2139 FPICFLAG=-fPIC |
2140 else | |
3775 | 2141 FPICFLAG=-KPIC |
2142 fi | |
2143 if test "$GCC" = yes; then | |
2144 CPICFLAG=-fPIC | |
2145 else | |
2146 CPICFLAG=-KPIC | |
2813 | 2147 fi |
3775 | 2148 if test "$GXX" = yes; then |
2149 CXXPICFLAG=-fPIC | |
2150 SH_LDFLAGS=-shared | |
2151 else | |
2152 CXXPICFLAG=-KPIC | |
2153 SH_LDFLAGS=-G | |
2154 fi | |
6087 | 2155 ## 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
|
2156 if test "$GXX" != yes; then |
21409
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
2157 TEMPLATE_AR="${CXX}" |
3775 | 2158 TEMPLATE_ARFLAGS="-xar -o" |
2159 fi | |
2813 | 2160 ;; |
2161 esac | |
2162 | |
5844 | 2163 AC_MSG_NOTICE([defining FPICFLAG to be $FPICFLAG]) |
2164 AC_MSG_NOTICE([defining CPICFLAG to be $CPICFLAG]) | |
2165 AC_MSG_NOTICE([defining CXXPICFLAG to be $CXXPICFLAG]) | |
2166 AC_MSG_NOTICE([defining SH_LD to be $SH_LD]) | |
2167 AC_MSG_NOTICE([defining SH_LDFLAGS to be $SH_LDFLAGS]) | |
2168 AC_MSG_NOTICE([defining DL_LD to be $DL_LD]) | |
2169 AC_MSG_NOTICE([defining DL_LDFLAGS to be $DL_LDFLAGS]) | |
2170 AC_MSG_NOTICE([defining MKOCTFILE_DL_LDFLAGS to be $MKOCTFILE_DL_LDFLAGS]) | |
2171 AC_MSG_NOTICE([defining NO_OCT_FILE_STRIP to be $NO_OCT_FILE_STRIP]) | |
2172 AC_MSG_NOTICE([defining TEMPLATE_AR to be $TEMPLATE_AR]) | |
2173 AC_MSG_NOTICE([defining TEMPLATE_ARFLAGS to be $TEMPLATE_ARFLAGS]) | |
6137 | 2174 AC_MSG_NOTICE([defining CRUFT_DLL_DEFS to be $CRUFT_DLL_DEFS]) |
2175 AC_MSG_NOTICE([defining OCTAVE_DLL_DEFS to be $OCTAVE_DLL_DEFS]) | |
2176 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
|
2177 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
|
2178 AC_MSG_NOTICE([defining OCTGRAPHICS_DLL_DEFS to be $OCTGRAPHICS_DLL_DEFS]) |
5844 | 2179 AC_MSG_NOTICE([defining library_path_var to be $library_path_var]) |
2813 | 2180 AC_SUBST(FPICFLAG) |
2181 AC_SUBST(CPICFLAG) | |
2182 AC_SUBST(CXXPICFLAG) | |
2183 AC_SUBST(SH_LD) | |
2184 AC_SUBST(SH_LDFLAGS) | |
4759 | 2185 AC_SUBST(DL_LD) |
2186 AC_SUBST(DL_LDFLAGS) | |
2187 AC_SUBST(MKOCTFILE_DL_LDFLAGS) | |
4199 | 2188 AC_SUBST(NO_OCT_FILE_STRIP) |
3775 | 2189 AC_SUBST(TEMPLATE_AR) |
2190 AC_SUBST(TEMPLATE_ARFLAGS) | |
6141 | 2191 AC_SUBST(CRUFT_DLL_DEFS) |
2192 AC_SUBST(OCTAVE_DLL_DEFS) | |
2193 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
|
2194 AC_SUBST(OCTGUI_DLL_DEFS) |
7825
13871b7de124
Import sources for OpenGL-based renderer.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7789
diff
changeset
|
2195 AC_SUBST(OCTGRAPHICS_DLL_DEFS) |
4104 | 2196 AC_SUBST(library_path_var) |
9613
16907d1153d1
attempt to fix LD_PRELOAD for Cygwin
John W. Eaton <jwe@octave.org>
parents:
9610
diff
changeset
|
2197 AC_SUBST(ldpreloadsep) |
21392
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
2198 AM_SUBST_NOTMAKE(ldpreloadsep) |
4102 | 2199 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2200 ### More configure argument checking related to linking |
13024
f3c53fea9fb5
maint: more linking tweaks
John W. Eaton <jwe@octave.org>
parents:
13016
diff
changeset
|
2201 |
f3c53fea9fb5
maint: more linking tweaks
John W. Eaton <jwe@octave.org>
parents:
13016
diff
changeset
|
2202 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
|
2203 [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
|
2204 [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
|
2205 [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
|
2206 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
|
2207 no) NO_UNDEFINED_LDFLAG="" ;; |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
2208 *) 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
|
2209 esac], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2210 [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
|
2211 AC_SUBST(NO_UNDEFINED_LDFLAG) |
4388 | 2212 |
13024
f3c53fea9fb5
maint: more linking tweaks
John W. Eaton <jwe@octave.org>
parents:
13016
diff
changeset
|
2213 AC_ARG_ENABLE([link-all-dependencies], |
f3c53fea9fb5
maint: more linking tweaks
John W. Eaton <jwe@octave.org>
parents:
13016
diff
changeset
|
2214 [AS_HELP_STRING([--enable-link-all-dependencies], |
f3c53fea9fb5
maint: more linking tweaks
John W. Eaton <jwe@octave.org>
parents:
13016
diff
changeset
|
2215 [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
|
2216 [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
|
2217 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
|
2218 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
|
2219 *) 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
|
2220 ;; |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2221 esac], |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2222 [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
|
2223 AM_CONDITIONAL([AMCOND_LINK_ALL_DEPS], [test $link_all_deps = yes]) |
3249 | 2224 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2225 ## 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
|
2226 ## 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
|
2227 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
2228 ## 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
|
2229 ## 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
|
2230 |
21409
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
2231 LD_CXX="${CXX}" |
3232 | 2232 RDYNAMIC_FLAG= |
4110 | 2233 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
|
2234 dlopen_api=no |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2235 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
|
2236 loadlibrary_api=no |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2237 dyld_api=no |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2238 |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2239 if test $SHARED_LIBS = yes || test $ENABLE_DYNAMIC_LINKING = yes; then |
4163 | 2240 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
2241 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
|
2242 dlopen) |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2243 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
|
2244 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
|
2245 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
|
2246 [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
|
2247 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
|
2248 ;; |
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
2249 shl_load) |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2250 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
|
2251 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
|
2252 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
|
2253 [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
|
2254 ;; |
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
2255 LoadLibrary) |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2256 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
|
2257 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
|
2258 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
|
2259 [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
|
2260 ;; |
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
2261 dyld) |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2262 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
|
2263 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
|
2264 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
|
2265 [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
|
2266 ;; |
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
2267 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
|
2268 |
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
2269 DL_LIBS="$lt_cv_dlopen_libs" |
9515 | 2270 AC_SUBST(DL_LIBS) |
4110 | 2271 |
13010
edc5ec6e949b
maint: allow --enable-static --disable-dl to work again
John W. Eaton <jwe@octave.org>
parents:
12772
diff
changeset
|
2272 ## 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
|
2273 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
|
2274 || 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
|
2275 || 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
|
2276 || 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
|
2277 # 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
|
2278 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
|
2279 else |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2280 ENABLE_DYNAMIC_LINKING=no |
1978 | 2281 fi |
4163 | 2282 fi |
2283 | |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2284 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
|
2285 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
|
2286 fi |
edc5ec6e949b
maint: allow --enable-static --disable-dl to work again
John W. Eaton <jwe@octave.org>
parents:
12772
diff
changeset
|
2287 |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2288 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
|
2289 [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
|
2290 |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2291 if test $SHARED_LIBS = yes; then |
21450
2868abbc88eb
eliminate unused configuration variable SHLLINKEXT
John W. Eaton <jwe@octave.org>
parents:
21433
diff
changeset
|
2292 LIBOCTINTERP="-loctinterp" |
2868abbc88eb
eliminate unused configuration variable SHLLINKEXT
John W. Eaton <jwe@octave.org>
parents:
21433
diff
changeset
|
2293 LIBOCTAVE="-loctave" |
1978 | 2294 else |
21907
98f5dd2ff29a
Drop old unused build-system library naming variables LIBPRE, LIBEXT, etc
Mike Miller <mtmiller@octave.org>
parents:
21818
diff
changeset
|
2295 LIBOCTINTERP="${top_builddir}/libinterp/liboctinterp.a" |
98f5dd2ff29a
Drop old unused build-system library naming variables LIBPRE, LIBEXT, etc
Mike Miller <mtmiller@octave.org>
parents:
21818
diff
changeset
|
2296 LIBOCTAVE="${top_builddir}/liboctave/liboctave.a" |
1664 | 2297 fi |
4163 | 2298 |
4110 | 2299 AC_SUBST(LD_CXX) |
3232 | 2300 AC_SUBST(RDYNAMIC_FLAG) |
4128 | 2301 AC_SUBST(ENABLE_DYNAMIC_LINKING) |
4110 | 2302 AC_SUBST(LIBOCTINTERP) |
2303 AC_SUBST(LIBOCTAVE) | |
1901 | 2304 |
8998
a48fba01e4ac
optimize isnan/isinf/isfinite mappers
Jaroslav Hajek <highegg@gmail.com>
parents:
8940
diff
changeset
|
2305 |
15932
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
2306 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
|
2307 CROSS_TOOL_PREFIX="$ac_tool_prefix" |
21420
29e8d4a922b5
expand MKOCTFILE variables in configure script
John W. Eaton <jwe@octave.org>
parents:
21413
diff
changeset
|
2308 MKOCTFILE_AR=`echo "$AR" | $SED "s,$CROSS_TOOL_PREFIX,,"` |
29e8d4a922b5
expand MKOCTFILE variables in configure script
John W. Eaton <jwe@octave.org>
parents:
21413
diff
changeset
|
2309 MKOCTFILE_CC=`echo "$CC" | $SED "s,$CROSS_TOOL_PREFIX,,"` |
29e8d4a922b5
expand MKOCTFILE variables in configure script
John W. Eaton <jwe@octave.org>
parents:
21413
diff
changeset
|
2310 MKOCTFILE_CXX=`echo "$CXX" | $SED "s,$CROSS_TOOL_PREFIX,,"` |
29e8d4a922b5
expand MKOCTFILE variables in configure script
John W. Eaton <jwe@octave.org>
parents:
21413
diff
changeset
|
2311 MKOCTFILE_DL_LD=`echo "$DL_LD" | $SED "s,$CROSS_TOOL_PREFIX,,"` |
29e8d4a922b5
expand MKOCTFILE variables in configure script
John W. Eaton <jwe@octave.org>
parents:
21413
diff
changeset
|
2312 MKOCTFILE_F77=`echo "$F77" | $SED "s,$CROSS_TOOL_PREFIX,,"` |
29e8d4a922b5
expand MKOCTFILE variables in configure script
John W. Eaton <jwe@octave.org>
parents:
21413
diff
changeset
|
2313 MKOCTFILE_LD_CXX=`echo "$LD_CXX" | $SED "s,$CROSS_TOOL_PREFIX,,"` |
29e8d4a922b5
expand MKOCTFILE variables in configure script
John W. Eaton <jwe@octave.org>
parents:
21413
diff
changeset
|
2314 MKOCTFILE_RANLIB=`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
|
2315 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
|
2316 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
|
2317 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
|
2318 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
|
2319 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
|
2320 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
|
2321 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
|
2322 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
|
2323 fi |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
2324 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
|
2325 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
|
2326 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
|
2327 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
|
2328 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
|
2329 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
|
2330 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
|
2331 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
|
2332 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
|
2333 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
|
2334 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
|
2335 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
|
2336 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
|
2337 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
|
2338 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
|
2339 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
|
2340 |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
2341 ### 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
|
2342 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2343 ## 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
|
2344 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2345 mingw*) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
2346 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
|
2347 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
|
2348 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
|
2349 else |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
2350 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
|
2351 fi |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2352 LIBS="$LIBS -lgdi32 -lws2_32 -luser32 -lkernel32" |
956 | 2353 ;; |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2354 msdosmsvc) |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2355 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
|
2356 LIBS="$LIBS -ladvapi32 -lgdi32 -lws2_32 -luser32 -lkernel32" |
956 | 2357 ;; |
2358 esac | |
2359 | |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2360 ## Find a termlib to use. |
15302
a8cfbc1911e4
build: Set TERM_LIBS before checking for READLINE.
Rik <rik@octave.org>
parents:
15298
diff
changeset
|
2361 OCTAVE_CHECK_LIB_TERMLIB |
8185
69c5cce38c29
implement 64-bit arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents:
8169
diff
changeset
|
2362 |
869 | 2363 ### Checks for header files. |
2364 | |
832 | 2365 AC_HEADER_DIRENT |
1377 | 2366 AC_HEADER_SYS_WAIT |
2097 | 2367 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2368 ## C headers |
4051 | 2369 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2370 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
|
2371 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
|
2372 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
|
2373 AC_CHECK_HEADERS([poll.h pthread.h pwd.h sunmath.h sys/ioctl.h]) |
17196
bc20614022aa
build: Redo LLVM macros to disable JIT rather than stop build if headers not found.
Rik <rik@octave.org>
parents:
17180
diff
changeset
|
2374 AC_CHECK_HEADERS([sys/param.h sys/poll.h sys/resource.h]) |
20640
375cea8d4135
build: Add check for sys/stropts.h system header file
Mike Miller <mtmiller@octave.org>
parents:
20234
diff
changeset
|
2375 AC_CHECK_HEADERS([sys/select.h sys/stropts.h termcap.h]) |
3887 | 2376 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2377 ## C++ headers |
4051 | 2378 |
2379 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
|
2380 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2381 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
|
2382 |
4051 | 2383 AC_LANG_POP(C++) |
2384 | |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2385 ## Find a termio header to include. |
1901 | 2386 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
2387 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
|
2388 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
|
2389 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
|
2390 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
|
2391 AC_CHECK_HEADERS([conio.h], have_conio_h=yes, have_conio_h=no) |
3249 | 2392 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
2393 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
|
2394 && test $have_termio_h != yes \ |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
2395 && test $have_sgtty_h != yes; then |
4064 | 2396 AC_MSG_WARN([I couldn't find termios.h, termio.h, or sgtty.h!]) |
832 | 2397 fi |
869 | 2398 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2399 ## 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
|
2400 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
|
2401 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
|
2402 fi |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2403 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2404 ### Determine types and size of types. |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2405 |
15172
c7d466a02065
configure.ac: Add checks for a few missing types.
Rik <rik@octave.org>
parents:
15170
diff
changeset
|
2406 AC_TYPE_INT64_T |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2407 AC_TYPE_MODE_T |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2408 AC_TYPE_OFF_T |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2409 AC_TYPE_PID_T |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2410 AC_TYPE_SIZE_T |
15172
c7d466a02065
configure.ac: Add checks for a few missing types.
Rik <rik@octave.org>
parents:
15170
diff
changeset
|
2411 AC_TYPE_SSIZE_T |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2412 AC_TYPE_UID_T |
15172
c7d466a02065
configure.ac: Add checks for a few missing types.
Rik <rik@octave.org>
parents:
15170
diff
changeset
|
2413 AC_TYPE_UINT64_T |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2414 AC_CHECK_TYPES([dev_t, ino_t]) |
15172
c7d466a02065
configure.ac: Add checks for a few missing types.
Rik <rik@octave.org>
parents:
15170
diff
changeset
|
2415 AC_CHECK_TYPES([ptrdiff_t]) |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2416 |
21354
06d15e4e611a
move public data type macros to octave-config.h
John W. Eaton <jwe@octave.org>
parents:
21306
diff
changeset
|
2417 AC_CHECK_TYPES([long long int]) |
21378
172479a97e6c
configure.ac: Remove overquoting in shell variables tests.
Rik <rik@octave.org>
parents:
21374
diff
changeset
|
2418 if test $ac_cv_type_long_long_int = yes; then |
21354
06d15e4e611a
move public data type macros to octave-config.h
John W. Eaton <jwe@octave.org>
parents:
21306
diff
changeset
|
2419 AC_DEFINE(OCTAVE_HAVE_LONG_LONG_INT, 1, |
06d15e4e611a
move public data type macros to octave-config.h
John W. Eaton <jwe@octave.org>
parents:
21306
diff
changeset
|
2420 [Define to 1 if the system has the type 'long long int'.]) |
06d15e4e611a
move public data type macros to octave-config.h
John W. Eaton <jwe@octave.org>
parents:
21306
diff
changeset
|
2421 fi |
06d15e4e611a
move public data type macros to octave-config.h
John W. Eaton <jwe@octave.org>
parents:
21306
diff
changeset
|
2422 |
06d15e4e611a
move public data type macros to octave-config.h
John W. Eaton <jwe@octave.org>
parents:
21306
diff
changeset
|
2423 AC_CHECK_TYPES([unsigned long long int]) |
21378
172479a97e6c
configure.ac: Remove overquoting in shell variables tests.
Rik <rik@octave.org>
parents:
21374
diff
changeset
|
2424 if test $ac_cv_type_unsigned_long_long_int = yes; then |
21354
06d15e4e611a
move public data type macros to octave-config.h
John W. Eaton <jwe@octave.org>
parents:
21306
diff
changeset
|
2425 AC_DEFINE(OCTAVE_HAVE_UNSIGNED_LONG_LONG_INT, 1, |
06d15e4e611a
move public data type macros to octave-config.h
John W. Eaton <jwe@octave.org>
parents:
21306
diff
changeset
|
2426 [Define to 1 if the system has the type 'unsigned long long int'.]) |
06d15e4e611a
move public data type macros to octave-config.h
John W. Eaton <jwe@octave.org>
parents:
21306
diff
changeset
|
2427 fi |
06d15e4e611a
move public data type macros to octave-config.h
John W. Eaton <jwe@octave.org>
parents:
21306
diff
changeset
|
2428 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2429 ## 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
|
2430 ## 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
|
2431 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2432 AC_CHECK_SIZEOF([short]) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2433 AC_CHECK_SIZEOF([int]) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2434 AC_CHECK_SIZEOF([long]) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2435 AC_CHECK_SIZEOF([long long]) |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2436 ## 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
|
2437 AC_CHECK_SIZEOF([long double]) |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2438 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2439 ### 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
|
2440 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2441 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
|
2442 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
|
2443 AC_CHECK_MEMBERS([struct group.gr_passwd]) |
3887 | 2444 |
1186 | 2445 AC_STRUCT_TIMEZONE |
8998
a48fba01e4ac
optimize isnan/isinf/isfinite mappers
Jaroslav Hajek <highegg@gmail.com>
parents:
8940
diff
changeset
|
2446 |
21235
b48d65c5df5b
Disable char/int8_t function overloads where not permitted (bug #45411)
Mike Miller <mtmiller@octave.org>
parents:
21105
diff
changeset
|
2447 ## Check if C++ compiler allows overload of char, int8_t, and uint8_t. |
b48d65c5df5b
Disable char/int8_t function overloads where not permitted (bug #45411)
Mike Miller <mtmiller@octave.org>
parents:
21105
diff
changeset
|
2448 AC_CACHE_CHECK([whether ${CXX-g++} allows overload of char, int8_t, and uint8_t], |
b48d65c5df5b
Disable char/int8_t function overloads where not permitted (bug #45411)
Mike Miller <mtmiller@octave.org>
parents:
21105
diff
changeset
|
2449 [octave_cv_overload_char_int8_t], |
b48d65c5df5b
Disable char/int8_t function overloads where not permitted (bug #45411)
Mike Miller <mtmiller@octave.org>
parents:
21105
diff
changeset
|
2450 [AC_LANG_PUSH(C++) |
b48d65c5df5b
Disable char/int8_t function overloads where not permitted (bug #45411)
Mike Miller <mtmiller@octave.org>
parents:
21105
diff
changeset
|
2451 AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ |
b48d65c5df5b
Disable char/int8_t function overloads where not permitted (bug #45411)
Mike Miller <mtmiller@octave.org>
parents:
21105
diff
changeset
|
2452 #include <stdint.h> |
b48d65c5df5b
Disable char/int8_t function overloads where not permitted (bug #45411)
Mike Miller <mtmiller@octave.org>
parents:
21105
diff
changeset
|
2453 void somefunc(char x) {}; |
b48d65c5df5b
Disable char/int8_t function overloads where not permitted (bug #45411)
Mike Miller <mtmiller@octave.org>
parents:
21105
diff
changeset
|
2454 void somefunc(int8_t x) {}; |
b48d65c5df5b
Disable char/int8_t function overloads where not permitted (bug #45411)
Mike Miller <mtmiller@octave.org>
parents:
21105
diff
changeset
|
2455 void somefunc(uint8_t x) {}; |
b48d65c5df5b
Disable char/int8_t function overloads where not permitted (bug #45411)
Mike Miller <mtmiller@octave.org>
parents:
21105
diff
changeset
|
2456 ]])], |
b48d65c5df5b
Disable char/int8_t function overloads where not permitted (bug #45411)
Mike Miller <mtmiller@octave.org>
parents:
21105
diff
changeset
|
2457 octave_cv_overload_char_int8_t=yes, |
b48d65c5df5b
Disable char/int8_t function overloads where not permitted (bug #45411)
Mike Miller <mtmiller@octave.org>
parents:
21105
diff
changeset
|
2458 octave_cv_overload_char_int8_t=no) |
b48d65c5df5b
Disable char/int8_t function overloads where not permitted (bug #45411)
Mike Miller <mtmiller@octave.org>
parents:
21105
diff
changeset
|
2459 AC_LANG_POP(C++) |
b48d65c5df5b
Disable char/int8_t function overloads where not permitted (bug #45411)
Mike Miller <mtmiller@octave.org>
parents:
21105
diff
changeset
|
2460 ]) |
b48d65c5df5b
Disable char/int8_t function overloads where not permitted (bug #45411)
Mike Miller <mtmiller@octave.org>
parents:
21105
diff
changeset
|
2461 if test $octave_cv_overload_char_int8_t = yes; then |
21354
06d15e4e611a
move public data type macros to octave-config.h
John W. Eaton <jwe@octave.org>
parents:
21306
diff
changeset
|
2462 AC_DEFINE(OCTAVE_HAVE_OVERLOAD_CHAR_INT8_TYPES, 1, |
21235
b48d65c5df5b
Disable char/int8_t function overloads where not permitted (bug #45411)
Mike Miller <mtmiller@octave.org>
parents:
21105
diff
changeset
|
2463 [Define to 1 if C++ allows overload of char, int8_t, and uint8_t types.]) |
b48d65c5df5b
Disable char/int8_t function overloads where not permitted (bug #45411)
Mike Miller <mtmiller@octave.org>
parents:
21105
diff
changeset
|
2464 fi |
b48d65c5df5b
Disable char/int8_t function overloads where not permitted (bug #45411)
Mike Miller <mtmiller@octave.org>
parents:
21105
diff
changeset
|
2465 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2466 ### Check compiler characteristics. |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2467 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2468 ## 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
|
2469 OCTAVE_CXX_DYNAMIC_AUTO_ARRAYS |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2470 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2471 ## 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
|
2472 OCTAVE_IEEE754_DATA_FORMAT |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2473 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2474 ## 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
|
2475 OCTAVE_CXX_BITWISE_OP_TEMPLATES |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2476 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2477 ## Can complex class set components independently? |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2478 OCTAVE_CXX_COMPLEX_SETTERS |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2479 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2480 ## 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
|
2481 OCTAVE_CXX_COMPLEX_REFERENCE_ACCESSORS |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2482 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2483 ## 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
|
2484 OCTAVE_FAST_INT_OPS |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2485 |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
2486 ## Does the C compiler handle alloca and const correctly? |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2487 AC_FUNC_ALLOCA |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2488 |
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
|
2489 ## Does the C compiler support Automake subdir-objects option? |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
2490 AM_PROG_CC_C_O |
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
|
2491 |
15142
f4684192158e
configure.ac: Split gnulib initialization into 2 parts to match recommended usage.
Rik <rik@octave.org>
parents:
15141
diff
changeset
|
2492 ### 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
|
2493 ### 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
|
2494 ### 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
|
2495 |
f4684192158e
configure.ac: Split gnulib initialization into 2 parts to match recommended usage.
Rik <rik@octave.org>
parents:
15141
diff
changeset
|
2496 gl_INIT |
f4684192158e
configure.ac: Split gnulib initialization into 2 parts to match recommended usage.
Rik <rik@octave.org>
parents:
15141
diff
changeset
|
2497 |
1788 | 2498 ### Checks for functions and variables. |
869 | 2499 |
15452
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2500 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
|
2501 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
|
2502 dnl Use multiple AC_CHECKs to avoid line continuations '\' in list |
18066
9f6c9f3f1b62
Use gnulib version of canonicalize_file_name across all systems.
Rik <rik@octave.org>
parents:
18051
diff
changeset
|
2503 AC_CHECK_FUNCS([ctermid dup2]) |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2504 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
|
2505 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
|
2506 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
|
2507 AC_CHECK_FUNCS([isascii kill]) |
ffd1a99733bd
build: Check for isascii() before using it.
Rik <rik@octave.org>
parents:
15846
diff
changeset
|
2508 AC_CHECK_FUNCS([lgamma lgammaf lgamma_r lgammaf_r]) |
21619
9860b8183202
configure.ac: Remove AC_CHECK_FUNC for pipe now that gnulib::pipe used.
Rik <rik@octave.org>
parents:
21554
diff
changeset
|
2509 AC_CHECK_FUNCS([log1p log1pf]) |
15452
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2510 AC_CHECK_FUNCS([realpath resolvepath roundl]) |
21949
baeffde5c87d
fix build for Windows systems
John W. Eaton <jwe@octave.org>
parents:
21945
diff
changeset
|
2511 AC_CHECK_FUNCS([select setgrent setpwent setsid siglongjmp strsignal]) |
18523
c936beeda029
delete unused files
Lasse Schuirmann <lasse@schuirmann.net>
parents:
18515
diff
changeset
|
2512 AC_CHECK_FUNCS([tcgetattr tcsetattr tgammaf toascii]) |
17946 | 2513 AC_CHECK_FUNCS([umask waitpid]) |
20786
a8ee668e7fd7
Fix kbhit and pause on Windows systems.
Rik <rik@octave.org>
parents:
20640
diff
changeset
|
2514 AC_CHECK_FUNCS([_getch _kbhit]) |
15452
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2515 |
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2516 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
|
2517 AC_CHECK_FUNCS([modf pow sqrt sqrtf], [], |
15452
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2518 [AC_MSG_ERROR([Missing function required to build Octave])]) |
1300 | 2519 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2520 ## 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
|
2521 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
|
2522 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
|
2523 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
|
2524 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
|
2525 #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
|
2526 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
|
2527 #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
|
2528 #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
|
2529 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
|
2530 #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
|
2531 #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
|
2532 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
|
2533 #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
|
2534 #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
|
2535 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
|
2536 #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
|
2537 #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
|
2538 } |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2539 #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
|
2540 ]) |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2541 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
|
2542 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2543 ## Look in <cmath> for the IEEE functions isnan, isinf, isfinite that we need. |
4163 | 2544 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2545 OCTAVE_CHECK_FUNC_CMATH(isnan) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2546 OCTAVE_CHECK_FUNC_CMATH(isinf) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2547 OCTAVE_CHECK_FUNC_CMATH(isfinite) |
18540
89bd70fae066
fix initialization problem for Inf, NaN, and NA values (bug #41667)
John W. Eaton <jwe@octave.org>
parents:
18536
diff
changeset
|
2548 OCTAVE_CHECK_FUNC_CMATH(signbit) |
4110 | 2549 |
15874
11d5a7276b6d
configure.ac: Remove some no longer accurate comments.
Rik <rik@octave.org>
parents:
15873
diff
changeset
|
2550 ## Check for Inf and NaN functions |
956 | 2551 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
2552 case $canonical_host_type in |
1384 | 2553 m68k-hp-hpux*) |
15874
11d5a7276b6d
configure.ac: Remove some no longer accurate comments.
Rik <rik@octave.org>
parents:
15873
diff
changeset
|
2554 ## I am told that Inf and NaN don't work on m68k HP sytems. |
956 | 2555 ;; |
2556 *) | |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2557 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
|
2558 AC_CHECK_FUNCS([_finite _isnan]) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2559 AC_CHECK_DECLS([signbit], , , [#include <math.h>]) |
6103 | 2560 ;; |
2561 esac | |
2562 | |
21945
e9765b62d4e8
Use C++11 standard complex trig functions when available (bug #44310, bug #45507)
Mike Miller <mtmiller@octave.org>
parents:
21925
diff
changeset
|
2563 ## Look in <complex> for C++ variants of math functions that we need. |
e9765b62d4e8
Use C++11 standard complex trig functions when available (bug #44310, bug #45507)
Mike Miller <mtmiller@octave.org>
parents:
21925
diff
changeset
|
2564 |
e9765b62d4e8
Use C++11 standard complex trig functions when available (bug #44310, bug #45507)
Mike Miller <mtmiller@octave.org>
parents:
21925
diff
changeset
|
2565 OCTAVE_CHECK_FUNC_COMPLEX(acos) |
e9765b62d4e8
Use C++11 standard complex trig functions when available (bug #44310, bug #45507)
Mike Miller <mtmiller@octave.org>
parents:
21925
diff
changeset
|
2566 OCTAVE_CHECK_FUNC_COMPLEX(acosh) |
e9765b62d4e8
Use C++11 standard complex trig functions when available (bug #44310, bug #45507)
Mike Miller <mtmiller@octave.org>
parents:
21925
diff
changeset
|
2567 OCTAVE_CHECK_FUNC_COMPLEX(asin) |
e9765b62d4e8
Use C++11 standard complex trig functions when available (bug #44310, bug #45507)
Mike Miller <mtmiller@octave.org>
parents:
21925
diff
changeset
|
2568 OCTAVE_CHECK_FUNC_COMPLEX(asinh) |
e9765b62d4e8
Use C++11 standard complex trig functions when available (bug #44310, bug #45507)
Mike Miller <mtmiller@octave.org>
parents:
21925
diff
changeset
|
2569 OCTAVE_CHECK_FUNC_COMPLEX(atan) |
e9765b62d4e8
Use C++11 standard complex trig functions when available (bug #44310, bug #45507)
Mike Miller <mtmiller@octave.org>
parents:
21925
diff
changeset
|
2570 OCTAVE_CHECK_FUNC_COMPLEX(atanh) |
e9765b62d4e8
Use C++11 standard complex trig functions when available (bug #44310, bug #45507)
Mike Miller <mtmiller@octave.org>
parents:
21925
diff
changeset
|
2571 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2572 ## Check for nonstandard, but common math functions, that we need. |
1076 | 2573 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2574 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
|
2575 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
|
2576 AC_CHECK_FUNCS([erf erff erfc erfcf exp2f hypotf _hypotf log2 log2f]) |
1076 | 2577 |
15852
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2578 ## 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
|
2579 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
|
2580 [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
|
2581 [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
|
2582 #include <math.h> |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2583 ]], [[ |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2584 double x = M_LN2;]])], |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2585 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
|
2586 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
|
2587 ]) |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2588 |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2589 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
|
2590 ## 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
|
2591 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
|
2592 [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
|
2593 [save_CPPFLAGS="$CPPFLAGS" |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2594 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
|
2595 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
|
2596 #include <math.h> |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2597 ]], [[ |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2598 double x = M_LN2;]])], |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2599 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
|
2600 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
|
2601 CPPFLAGS="$save_CPPFLAGS" |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2602 ]) |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2603 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
|
2604 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
|
2605 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
|
2606 [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
|
2607 CPPFLAGS="$CPPFLAGS -D_USE_MATH_DEFINES" |
1978 | 2608 fi |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
2609 fi |
15852
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2610 |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2611 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
|
2612 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
|
2613 [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
|
2614 else |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2615 AC_MSG_ERROR([MATH DEFINES in math.h such as M_PI are required to build Octave]) |
4163 | 2616 fi |
2617 | |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2618 ## 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
|
2619 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2620 msdosmsvc | mingw*) |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2621 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
|
2622 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
|
2623 #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
|
2624 #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
|
2625 #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
|
2626 #endif |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2627 ]], [])], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2628 [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
|
2629 [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
|
2630 [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
|
2631 AC_MSG_RESULT([0x0403])]) |
956 | 2632 ;; |
2633 esac | |
2634 | |
15452
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2635 ## Windows-specific use of functions |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2636 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2637 msdosmsvc | mingw*) |
15452
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2638 AC_CHECK_FUNCS([setvbuf], [], |
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2639 [AC_MSG_ERROR([Missing function required to build Octave])]) |
18352
c460566106f0
configure.ac: Find Qt libs in framework option for Macs (bug #41236)
Michael C. Grant <mcg@cvxr.com>
parents:
18342
diff
changeset
|
2640 ;; |
15452
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2641 esac |
3130 | 2642 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2643 ## Cygwin kluge for getrusage. |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2644 AC_CHECK_FUNCS([getrusage]) |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2645 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2646 cygwin*) |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2647 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
|
2648 [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
|
2649 ;; |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2650 esac |
869 | 2651 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2652 ## 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
|
2653 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
|
2654 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
|
2655 fi |
3887 | 2656 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2657 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
|
2658 |
1388 | 2659 AC_FUNC_CLOSEDIR_VOID |
1225 | 2660 |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
2661 ## Check return type of matherr |
15143
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2662 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
|
2663 [octave_cv_func_matherr_type], |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2664 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2665 #include <math.h> |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2666 ]], [[ |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2667 struct exception *x; |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2668 x->type; |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2669 x->name; |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2670 ]])], |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2671 octave_cv_func_matherr_type=yes, |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2672 octave_cv_func_matherr_type=no) |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2673 ]) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
2674 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
|
2675 AC_DEFINE(EXCEPTION_IN_MATH, 1, |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
2676 [Define to 1 if math.h declares struct exception for matherr.]) |
2488 | 2677 fi |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
2678 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2679 ## Signal stuff. |
869 | 2680 |
5844 | 2681 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
|
2682 [[#include <signal.h> |
5844 | 2683 /* NetBSD declares sys_siglist in unistd.h. */ |
2684 #if HAVE_UNISTD_H | |
2685 # include <unistd.h> | |
2686 #endif | |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2687 ]]) |
2633 | 2688 |
16012
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2689 ### 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
|
2690 ### 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
|
2691 ### disabled with a configure option. |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2692 |
20307
c3c1fb44f9b5
eliminate recursive make invocations in doc directory tree
John W. Eaton <jwe@octave.org>
parents:
20306
diff
changeset
|
2693 if test $ENABLE_DOCS = yes; then |
21378
172479a97e6c
configure.ac: Remove overquoting in shell variables tests.
Rik <rik@octave.org>
parents:
21374
diff
changeset
|
2694 if test $opengl_graphics = no || test -n "$warn_OSMesa"; then |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
2695 if test -n "$warn_gnuplot"; then |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
2696 ENABLE_DOCS=no |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
2697 warn_docs_graphics="building documentation disabled because no suitable graphics toolkit is available; make dist will fail" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
2698 OCTAVE_CONFIGURE_WARNING([warn_docs_graphics]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
2699 fi |
16012
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2700 fi |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2701 if test -n "$warn_makeinfo"; then |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
2702 ENABLE_DOCS=no |
16012
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2703 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
|
2704 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
|
2705 fi |
14579
4dc85c4f151b
Disable building documentation if gnuplot not found
Mike Miller <mtmiller@ieee.org>
parents:
14561
diff
changeset
|
2706 fi |
21131
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
2707 if test $ENABLE_DOCS = yes; then |
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
2708 AC_DEFINE(ENABLE_DOCS, 1, |
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
2709 [Define to 1 to build Octave documentation files.]) |
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
2710 fi |
20307
c3c1fb44f9b5
eliminate recursive make invocations in doc directory tree
John W. Eaton <jwe@octave.org>
parents:
20306
diff
changeset
|
2711 AM_CONDITIONAL([AMCOND_BUILD_DOCS], [test $ENABLE_DOCS = yes]) |
2032 | 2712 |
4645 | 2713 ### Maybe add -Wall, -W, and -Wshadow to compiler flags now that we're |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
2714 ### done feature testing. |
869 | 2715 |
11514
a1386fab2a02
configure.ac: eliminate some code duplication when checking for extra compiler flags
John W. Eaton <jwe@octave.org>
parents:
11513
diff
changeset
|
2716 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
|
2717 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
|
2718 |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2719 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
|
2720 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2721 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
|
2722 [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
|
2723 [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
|
2724 [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
|
2725 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
|
2726 fi], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2727 []) |
8938
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2728 |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2729 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
|
2730 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
|
2731 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
|
2732 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
|
2733 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
|
2734 done |
a1386fab2a02
configure.ac: eliminate some code duplication when checking for extra compiler flags
John W. Eaton <jwe@octave.org>
parents:
11513
diff
changeset
|
2735 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
|
2736 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
|
2737 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
|
2738 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
|
2739 done |
405 | 2740 fi |
869 | 2741 |
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
|
2742 GCC_STRICT_FLAGS="-Wconversion" |
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
|
2743 GXX_STRICT_FLAGS="-Wconversion -Weffc++" |
8938
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2744 |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2745 try_strict_warning_flags=no |
8938
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2746 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2747 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
|
2748 [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
|
2749 [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
|
2750 [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
|
2751 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
|
2752 fi], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2753 []) |
2813 | 2754 |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2755 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
|
2756 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
|
2757 OCTAVE_CC_FLAG([$flag], [ |
8938
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2758 WARN_CFLAGS="$WARN_CFLAGS $flag"; |
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2759 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
|
2760 done |
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2761 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
|
2762 OCTAVE_CXX_FLAG([$flag], [ |
8938
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2763 WARN_CXXFLAGS="$WARN_CXXFLAGS $flag"; |
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2764 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
|
2765 done |
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2766 fi |
2813 | 2767 |
20712
4a25c398ffa2
configure option to build with address sanitizer (bugg #46449)
John W. Eaton <jwe@octave.org>
parents:
20677
diff
changeset
|
2768 GCC_ADDRESS_SANITIZER_FLAGS="-fsanitize=address -fno-omit-frame-pointer" |
4a25c398ffa2
configure option to build with address sanitizer (bugg #46449)
John W. Eaton <jwe@octave.org>
parents:
20677
diff
changeset
|
2769 GXX_ADDRESS_SANITIZER_FLAGS="-fsanitize=address -fno-omit-frame-pointer" |
4a25c398ffa2
configure option to build with address sanitizer (bugg #46449)
John W. Eaton <jwe@octave.org>
parents:
20677
diff
changeset
|
2770 LD_ADDRESS_SANITIZER_FLAGS="-fsanitize=address" |
4a25c398ffa2
configure option to build with address sanitizer (bugg #46449)
John W. Eaton <jwe@octave.org>
parents:
20677
diff
changeset
|
2771 |
4a25c398ffa2
configure option to build with address sanitizer (bugg #46449)
John W. Eaton <jwe@octave.org>
parents:
20677
diff
changeset
|
2772 try_address_sanitizer_flags=no |
4a25c398ffa2
configure option to build with address sanitizer (bugg #46449)
John W. Eaton <jwe@octave.org>
parents:
20677
diff
changeset
|
2773 |
4a25c398ffa2
configure option to build with address sanitizer (bugg #46449)
John W. Eaton <jwe@octave.org>
parents:
20677
diff
changeset
|
2774 AC_ARG_ENABLE([address-sanitizer-flags], |
4a25c398ffa2
configure option to build with address sanitizer (bugg #46449)
John W. Eaton <jwe@octave.org>
parents:
20677
diff
changeset
|
2775 [AS_HELP_STRING([--enable-address-sanitizer-flags], |
4a25c398ffa2
configure option to build with address sanitizer (bugg #46449)
John W. Eaton <jwe@octave.org>
parents:
20677
diff
changeset
|
2776 [add extra -fsanitize=address and -fno-omit-frame-pointer options to CFLAGS, CXXFLAGS, and LDFLAGS])], |
4a25c398ffa2
configure option to build with address sanitizer (bugg #46449)
John W. Eaton <jwe@octave.org>
parents:
20677
diff
changeset
|
2777 [if test "$enableval" = yes; then |
4a25c398ffa2
configure option to build with address sanitizer (bugg #46449)
John W. Eaton <jwe@octave.org>
parents:
20677
diff
changeset
|
2778 try_address_sanitizer_flags=yes |
4a25c398ffa2
configure option to build with address sanitizer (bugg #46449)
John W. Eaton <jwe@octave.org>
parents:
20677
diff
changeset
|
2779 fi], |
4a25c398ffa2
configure option to build with address sanitizer (bugg #46449)
John W. Eaton <jwe@octave.org>
parents:
20677
diff
changeset
|
2780 []) |
4a25c398ffa2
configure option to build with address sanitizer (bugg #46449)
John W. Eaton <jwe@octave.org>
parents:
20677
diff
changeset
|
2781 |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
2782 if test $try_address_sanitizer_flags = yes; then |
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
2783 ADDRESS_SANITIZER_OPTIONS="symbolize=1" |
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
2784 AC_SUBST(ADDRESS_SANITIZER_OPTIONS) |
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
2785 fi |
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
2786 |
20712
4a25c398ffa2
configure option to build with address sanitizer (bugg #46449)
John W. Eaton <jwe@octave.org>
parents:
20677
diff
changeset
|
2787 AM_CONDITIONAL([AMCOND_ADDRESS_SANITIZER_ENABLED], |
4a25c398ffa2
configure option to build with address sanitizer (bugg #46449)
John W. Eaton <jwe@octave.org>
parents:
20677
diff
changeset
|
2788 [test $try_address_sanitizer_flags = yes]) |
4a25c398ffa2
configure option to build with address sanitizer (bugg #46449)
John W. Eaton <jwe@octave.org>
parents:
20677
diff
changeset
|
2789 |
4a25c398ffa2
configure option to build with address sanitizer (bugg #46449)
John W. Eaton <jwe@octave.org>
parents:
20677
diff
changeset
|
2790 if test $try_address_sanitizer_flags = yes; then |
4a25c398ffa2
configure option to build with address sanitizer (bugg #46449)
John W. Eaton <jwe@octave.org>
parents:
20677
diff
changeset
|
2791 for flag in $GCC_ADDRESS_SANITIZER_FLAGS; do |
4a25c398ffa2
configure option to build with address sanitizer (bugg #46449)
John W. Eaton <jwe@octave.org>
parents:
20677
diff
changeset
|
2792 OCTAVE_CC_FLAG([$flag], [ |
4a25c398ffa2
configure option to build with address sanitizer (bugg #46449)
John W. Eaton <jwe@octave.org>
parents:
20677
diff
changeset
|
2793 WARN_CFLAGS="$WARN_CFLAGS $flag"; |
4a25c398ffa2
configure option to build with address sanitizer (bugg #46449)
John W. Eaton <jwe@octave.org>
parents:
20677
diff
changeset
|
2794 AC_MSG_RESULT([adding $flag to WARN_CFLAGS])]) |
4a25c398ffa2
configure option to build with address sanitizer (bugg #46449)
John W. Eaton <jwe@octave.org>
parents:
20677
diff
changeset
|
2795 done |
4a25c398ffa2
configure option to build with address sanitizer (bugg #46449)
John W. Eaton <jwe@octave.org>
parents:
20677
diff
changeset
|
2796 for flag in $GXX_ADDRESS_SANITIZER_FLAGS; do |
4a25c398ffa2
configure option to build with address sanitizer (bugg #46449)
John W. Eaton <jwe@octave.org>
parents:
20677
diff
changeset
|
2797 OCTAVE_CXX_FLAG([$flag], [ |
4a25c398ffa2
configure option to build with address sanitizer (bugg #46449)
John W. Eaton <jwe@octave.org>
parents:
20677
diff
changeset
|
2798 WARN_CXXFLAGS="$WARN_CXXFLAGS $flag"; |
4a25c398ffa2
configure option to build with address sanitizer (bugg #46449)
John W. Eaton <jwe@octave.org>
parents:
20677
diff
changeset
|
2799 AC_MSG_RESULT([adding $flag to WARN_CXXFLAGS])]) |
4a25c398ffa2
configure option to build with address sanitizer (bugg #46449)
John W. Eaton <jwe@octave.org>
parents:
20677
diff
changeset
|
2800 done |
4a25c398ffa2
configure option to build with address sanitizer (bugg #46449)
John W. Eaton <jwe@octave.org>
parents:
20677
diff
changeset
|
2801 dnl FIXME: do we really need an LD-specific test, or is this good enough? |
4a25c398ffa2
configure option to build with address sanitizer (bugg #46449)
John W. Eaton <jwe@octave.org>
parents:
20677
diff
changeset
|
2802 for flag in $LD_ADDRESS_SANITIZER_FLAGS; do |
4a25c398ffa2
configure option to build with address sanitizer (bugg #46449)
John W. Eaton <jwe@octave.org>
parents:
20677
diff
changeset
|
2803 OCTAVE_CC_FLAG([$flag], [ |
4a25c398ffa2
configure option to build with address sanitizer (bugg #46449)
John W. Eaton <jwe@octave.org>
parents:
20677
diff
changeset
|
2804 WARN_LDFLAGS="$WARN_LDFLAGS $flag"; |
4a25c398ffa2
configure option to build with address sanitizer (bugg #46449)
John W. Eaton <jwe@octave.org>
parents:
20677
diff
changeset
|
2805 AC_MSG_RESULT([adding $flag to WARN_LDFLAGS])]) |
4a25c398ffa2
configure option to build with address sanitizer (bugg #46449)
John W. Eaton <jwe@octave.org>
parents:
20677
diff
changeset
|
2806 done |
4a25c398ffa2
configure option to build with address sanitizer (bugg #46449)
John W. Eaton <jwe@octave.org>
parents:
20677
diff
changeset
|
2807 fi |
4a25c398ffa2
configure option to build with address sanitizer (bugg #46449)
John W. Eaton <jwe@octave.org>
parents:
20677
diff
changeset
|
2808 |
4626 | 2809 AC_SUBST(WARN_CFLAGS) |
2810 AC_SUBST(WARN_CXXFLAGS) | |
20712
4a25c398ffa2
configure option to build with address sanitizer (bugg #46449)
John W. Eaton <jwe@octave.org>
parents:
20677
diff
changeset
|
2811 AC_SUBST(WARN_LDFLAGS) |
4626 | 2812 |
21023
ec532a439c6f
rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
20842
diff
changeset
|
2813 ## Also check for the GCC-specific pragmas for controlling warnings. |
ec532a439c6f
rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
20842
diff
changeset
|
2814 |
ec532a439c6f
rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
20842
diff
changeset
|
2815 AC_CACHE_CHECK([for @%:@pragma GCC diagnostic push/pop/ignore], |
ec532a439c6f
rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
20842
diff
changeset
|
2816 [octave_cv_gcc_has_pragma_GCC_diagnostic], |
ec532a439c6f
rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
20842
diff
changeset
|
2817 [AC_LANG_PUSH(C++) |
ec532a439c6f
rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
20842
diff
changeset
|
2818 AC_TRY_COMPILE([], [ |
ec532a439c6f
rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
20842
diff
changeset
|
2819 #pragma GCC diagnostic push |
ec532a439c6f
rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
20842
diff
changeset
|
2820 #pragma GCC diagnostic ignore "-Wold-style-cast" |
ec532a439c6f
rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
20842
diff
changeset
|
2821 int three = (int) 3.1415926; |
ec532a439c6f
rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
20842
diff
changeset
|
2822 #pragma GCC diagnostic pop |
ec532a439c6f
rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
20842
diff
changeset
|
2823 ], |
ec532a439c6f
rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
20842
diff
changeset
|
2824 [octave_cv_gcc_has_pragma_GCC_diagnostic=yes], |
ec532a439c6f
rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
20842
diff
changeset
|
2825 [octave_cv_gcc_has_pragma_GCC_diagnostic=no]) |
ec532a439c6f
rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
20842
diff
changeset
|
2826 AC_LANG_POP(C++)], |
ec532a439c6f
rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
20842
diff
changeset
|
2827 ]) |
ec532a439c6f
rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
20842
diff
changeset
|
2828 |
ec532a439c6f
rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
20842
diff
changeset
|
2829 if test $octave_cv_gcc_has_pragma_GCC_diagnostic = yes; then |
ec532a439c6f
rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
20842
diff
changeset
|
2830 AC_DEFINE(HAVE_PRAGMA_GCC_DIAGNOSTIC, 1, |
ec532a439c6f
rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
20842
diff
changeset
|
2831 [define if GCC supports @%:@pragma GCC diagnostic ...]) |
ec532a439c6f
rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
20842
diff
changeset
|
2832 fi |
4626 | 2833 |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2834 ### Check for Java. |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2835 |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2836 build_java=yes |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2837 AC_ARG_ENABLE([java], |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2838 [AS_HELP_STRING([--disable-java], |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2839 [disable Java interface])], |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2840 [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
|
2841 build_java=no |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2842 fi], |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2843 []) |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2844 |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2845 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
|
2846 [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
|
2847 [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
|
2848 [JAVA_HOMEDIR="$withval"]) |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2849 |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2850 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
|
2851 [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
|
2852 [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
|
2853 [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
|
2854 |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2855 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
|
2856 [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
|
2857 [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
|
2858 [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
|
2859 |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2860 ## 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
|
2861 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
|
2862 ## 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
|
2863 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
|
2864 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
|
2865 fi |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2866 JAVA= |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2867 JAVAC= |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2868 JAR= |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2869 JAVA_LIBS= |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2870 |
15780
f25101b1e37f
configure.ac: Use build_java as internal script variable rather than HAVE_JAVA.
Rik <rik@octave.org>
parents:
15779
diff
changeset
|
2871 ## Fake loop so that "break" can be used to skip code blocks. |
17844
e88a8fa25125
configure.ac: add warnings on checking for JAVA to the final summary.
Carnë Draug <carandraug@octave.org>
parents:
17836
diff
changeset
|
2872 warn_java="" |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2873 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
|
2874 do |
15780
f25101b1e37f
configure.ac: Use build_java as internal script variable rather than HAVE_JAVA.
Rik <rik@octave.org>
parents:
15779
diff
changeset
|
2875 ## 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
|
2876 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
|
2877 |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2878 ## 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
|
2879 if test -z "$JAVA_HOME"; then |
17964
abe592ef40b5
configure.ac: Use two spaces for sentence breaks in warning messages.
Rik <rik@octave.org>
parents:
17946
diff
changeset
|
2880 warn_java_home="JAVA_HOME environment variable not initialized. Auto-detection will proceed but is unreliable." |
17844
e88a8fa25125
configure.ac: add warnings on checking for JAVA to the final summary.
Carnë Draug <carandraug@octave.org>
parents:
17836
diff
changeset
|
2881 OCTAVE_CONFIGURE_WARNING([warn_java_home]) |
15761
9f3656ada658
configure.ac: Add warning message if JAVA_HOME variable is not set.
Rik <rik@octave.org>
parents:
15756
diff
changeset
|
2882 fi |
9f3656ada658
configure.ac: Add warning message if JAVA_HOME variable is not set.
Rik <rik@octave.org>
parents:
15756
diff
changeset
|
2883 |
15780
f25101b1e37f
configure.ac: Use build_java as internal script variable rather than HAVE_JAVA.
Rik <rik@octave.org>
parents:
15779
diff
changeset
|
2884 ## 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
|
2885 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
|
2886 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
|
2887 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
|
2888 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
|
2889 fi |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2890 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
|
2891 |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2892 if test -z "$JAVA"; then |
17844
e88a8fa25125
configure.ac: add warnings on checking for JAVA to the final summary.
Carnë Draug <carandraug@octave.org>
parents:
17836
diff
changeset
|
2893 warn_java="No Java executable 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
|
2894 break |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2895 fi |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2896 |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2897 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
|
2898 ## 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
|
2899 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
|
2900 ## Strip directory back to top-level installation dir (JAVA_HOME for JDK). |
17661
1978a6c76aa9
Use user-specified SED during build process (bug #40273).
Rik <rik@octave.org>
parents:
17640
diff
changeset
|
2901 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
|
2902 fi |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2903 |
18030
f0427ca399cc
configure.ac: Remove unused JAVA_HOME_NATIVE variable.
Rik <rik@octave.org>
parents:
18025
diff
changeset
|
2904 case $build_os in |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2905 mingw* | msdosmsvc) |
15846
605488d19cb3
configure.ac: Avoid non-portable sh technique of double-quoted, backtick expressions.
Rik <rik@octave.org>
parents:
15839
diff
changeset
|
2906 ## 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
|
2907 ## 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
|
2908 ## 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
|
2909 ## (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
|
2910 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
|
2911 JAVA_HOME=`cd "$JAVA_HOME" && pwd` |
15836
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2912 fi |
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2913 ;; |
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2914 esac |
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2915 |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2916 ## 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
|
2917 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
|
2918 JAVA_PATH="$PATH" |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2919 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
|
2920 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
|
2921 fi |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2922 |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2923 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
|
2924 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
|
2925 |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2926 if test -z "$JAVAC" || test -z "$JAR"; then |
18057
37a5e93d6cfd
configure.ac: add warning about disabling java to the final summary.
Carnë Draug <carandraug@octave.org>
parents:
18056
diff
changeset
|
2927 warn_java="No javac compiler or jar executable 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
|
2928 break |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2929 fi |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2930 |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2931 ## 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
|
2932 AC_MSG_CHECKING([for Java version]) |
17661
1978a6c76aa9
Use user-specified SED during build process (bug #40273).
Rik <rik@octave.org>
parents:
17640
diff
changeset
|
2933 java_version=[`"$JAVA" -version 2>&1 | $SED -n -e 's/^[^ ]* 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
|
2934 AC_MSG_RESULT([$java_version]) |
17661
1978a6c76aa9
Use user-specified SED during build process (bug #40273).
Rik <rik@octave.org>
parents:
17640
diff
changeset
|
2935 java_major=[`echo $java_version | $SED -e 's/^\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*$/\1/'`] |
1978a6c76aa9
Use user-specified SED during build process (bug #40273).
Rik <rik@octave.org>
parents:
17640
diff
changeset
|
2936 java_minor=[`echo $java_version | $SED -e 's/^\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*$/\2/'`] |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2937 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
|
2938 : # 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
|
2939 else |
17844
e88a8fa25125
configure.ac: add warnings on checking for JAVA to the final summary.
Carnë Draug <carandraug@octave.org>
parents:
17836
diff
changeset
|
2940 warn_java="Java version is too old (< 1.5). 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
|
2941 break |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2942 fi |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2943 |
17819
af924e6572cb
build: Don't search path at compile time for jvm on Win32 platforms.
Rik <rik@octave.org>
parents:
17816
diff
changeset
|
2944 ## At this point Win32 systems have enough configuration data. |
af924e6572cb
build: Don't search path at compile time for jvm on Win32 platforms.
Rik <rik@octave.org>
parents:
17816
diff
changeset
|
2945 ## We assume that all appropriate variables (e.g. INCLUDE and LIB) already |
af924e6572cb
build: Don't search path at compile time for jvm on Win32 platforms.
Rik <rik@octave.org>
parents:
17816
diff
changeset
|
2946 ## contain 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
|
2947 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2948 msdosmsvc) |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2949 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
|
2950 JAVA_LIBS=-ladvapi32 |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2951 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
|
2952 [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
|
2953 break |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2954 ;; |
17819
af924e6572cb
build: Don't search path at compile time for jvm on Win32 platforms.
Rik <rik@octave.org>
parents:
17816
diff
changeset
|
2955 mingw* | cygwin*) |
af924e6572cb
build: Don't search path at compile time for jvm on Win32 platforms.
Rik <rik@octave.org>
parents:
17816
diff
changeset
|
2956 build_java=yes |
af924e6572cb
build: Don't search path at compile time for jvm on Win32 platforms.
Rik <rik@octave.org>
parents:
17816
diff
changeset
|
2957 JAVA_LIBS=-ladvapi32 |
af924e6572cb
build: Don't search path at compile time for jvm on Win32 platforms.
Rik <rik@octave.org>
parents:
17816
diff
changeset
|
2958 if test $have_msvc = no; then |
af924e6572cb
build: Don't search path at compile time for jvm on Win32 platforms.
Rik <rik@octave.org>
parents:
17816
diff
changeset
|
2959 if test -n "$JAVA_CPPFLAGS"; then |
18276
508f67c72854
Fix native MinGW builds with spaces in JAVA_HOME (bug #41024).
Rik <rik@octave.org>
parents:
18273
diff
changeset
|
2960 JAVA_CPPFLAGS="-I\"${JAVA_CPPFLAGS}\" -I\"${JAVA_CPPFLAGS}/win32\"" |
17819
af924e6572cb
build: Don't search path at compile time for jvm on Win32 platforms.
Rik <rik@octave.org>
parents:
17816
diff
changeset
|
2961 else |
18276
508f67c72854
Fix native MinGW builds with spaces in JAVA_HOME (bug #41024).
Rik <rik@octave.org>
parents:
18273
diff
changeset
|
2962 JAVA_CPPFLAGS="-I\"${JAVA_HOME}/include\" -I\"${JAVA_HOME}/include/win32\"" |
17819
af924e6572cb
build: Don't search path at compile time for jvm on Win32 platforms.
Rik <rik@octave.org>
parents:
17816
diff
changeset
|
2963 fi |
af924e6572cb
build: Don't search path at compile time for jvm on Win32 platforms.
Rik <rik@octave.org>
parents:
17816
diff
changeset
|
2964 LDFLAGS="$LDFLAGS -Wl,--export-all-symbols" |
15836
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2965 fi |
17819
af924e6572cb
build: Don't search path at compile time for jvm on Win32 platforms.
Rik <rik@octave.org>
parents:
17816
diff
changeset
|
2966 AC_DEFINE(HAVE_JAVA, 1, |
af924e6572cb
build: Don't search path at compile time for jvm on Win32 platforms.
Rik <rik@octave.org>
parents:
17816
diff
changeset
|
2967 [Define to 1 if Java is available and is at least version 1.5]) |
af924e6572cb
build: Don't search path at compile time for jvm on Win32 platforms.
Rik <rik@octave.org>
parents:
17816
diff
changeset
|
2968 break |
15836
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2969 ;; |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2970 esac |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2971 |
20713
2469d78a1d8b
Consistently use 'filename' rather than 'file name' throughout code base.
Rik <rik@octave.org>
parents:
20712
diff
changeset
|
2972 ## Determine which library filename to search for. |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2973 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2974 darwin*) |
15777
b8bcb2c7f3e8
configure.ac: Search for jvm.dll on MingW/Cygwin platforms for Java.
Rik <rik@octave.org>
parents:
15769
diff
changeset
|
2975 jvmlib=libjvm.dylib |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2976 ;; |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2977 *) |
15777
b8bcb2c7f3e8
configure.ac: Search for jvm.dll on MingW/Cygwin platforms for Java.
Rik <rik@octave.org>
parents:
15769
diff
changeset
|
2978 jvmlib=libjvm.so |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2979 ;; |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2980 esac |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2981 |
15777
b8bcb2c7f3e8
configure.ac: Search for jvm.dll on MingW/Cygwin platforms for Java.
Rik <rik@octave.org>
parents:
15769
diff
changeset
|
2982 AC_MSG_CHECKING([for $jvmlib]) |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2983 |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2984 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
|
2985 ## 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
|
2986 JAVA_TMP_LDPATH=`$JAVA -classpath ${srcdir}/build-aux OctJavaQry JAVA_LDPATH` |
17661
1978a6c76aa9
Use user-specified SED during build process (bug #40273).
Rik <rik@octave.org>
parents:
17640
diff
changeset
|
2987 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
|
2988 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
|
2989 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
|
2990 JAVA_LDPATH=$dir |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2991 break |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2992 fi |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2993 done |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2994 fi |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2995 |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2996 if test -z "$JAVA_LDPATH"; then |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
2997 ## Nothing found. Try Java again using bootpath argument. |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2998 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
|
2999 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
|
3000 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
|
3001 if test -f "$dir/$jvmlib"; then |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
3002 JAVA_LDPATH=$dir |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
3003 break |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
3004 fi |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
3005 done |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
3006 fi |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
3007 |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
3008 if test -z "$JAVA_LDPATH"; then |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
3009 ## 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
|
3010 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
|
3011 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
|
3012 ## 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
|
3013 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
|
3014 ## 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
|
3015 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
|
3016 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
|
3017 if test -f "$dir/$jvmlib"; then |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
3018 JAVA_LDPATH=$dir |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
3019 break |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
3020 fi |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
3021 done |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
3022 fi |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
3023 |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
3024 ## 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
|
3025 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
|
3026 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
|
3027 : # libjvm found |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
3028 else |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
3029 JAVA_LDPATH="" |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
3030 fi |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
3031 fi |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
3032 |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
3033 if test -z "$JAVA_LDPATH"; then |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
3034 AC_MSG_RESULT([not found]) |
17844
e88a8fa25125
configure.ac: add warnings on checking for JAVA to the final summary.
Carnë Draug <carandraug@octave.org>
parents:
17836
diff
changeset
|
3035 warn_java="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
|
3036 break |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
3037 else |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
3038 AC_MSG_RESULT([$JAVA_LDPATH]) |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
3039 fi |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
3040 |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
3041 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
|
3042 |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
3043 ## 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
|
3044 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
3045 darwin*) |
15918
18d1bd2596bf
Sneak the MacOS X "-framework JavaVM" into mkoctfile via LDFLAGS
Ben Abbott <bpabbott@mac.com>
parents:
15905
diff
changeset
|
3046 ## 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
|
3047 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
|
3048 ## 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
|
3049 ## one must explicitly set the include path. |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
3050 ## 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
|
3051 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
|
3052 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
|
3053 else |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
3054 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
|
3055 fi |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
3056 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
|
3057 ;; |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
3058 *) |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
3059 if test -n "$JAVA_CPPFLAGS"; then |
18273
ec975e826728
configure.ac: Respect --with-java-includedir argument (bug #41230)
Rik <rik@octave.org>
parents:
18272
diff
changeset
|
3060 JAVA_CPPFLAGS="-I${JAVA_CPPFLAGS} -I${JAVA_CPPFLAGS}/linux" |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
3061 else |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
3062 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
|
3063 fi |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
3064 ;; |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
3065 esac |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
3066 |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
3067 ## Verify jni.h include file exists. |
17661
1978a6c76aa9
Use user-specified SED during build process (bug #40273).
Rik <rik@octave.org>
parents:
17640
diff
changeset
|
3068 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
|
3069 have_jni=no |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
3070 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
|
3071 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
|
3072 done |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
3073 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
|
3074 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
|
3075 else |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
3076 AC_MSG_RESULT([not found]) |
17844
e88a8fa25125
configure.ac: add warnings on checking for JAVA to the final summary.
Carnë Draug <carandraug@octave.org>
parents:
17836
diff
changeset
|
3077 warn_java="Include file <jni.h> 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
|
3078 break |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
3079 fi |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
3080 |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
3081 ## 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
|
3082 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
|
3083 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
|
3084 [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
|
3085 break |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
3086 done |
17844
e88a8fa25125
configure.ac: add warnings on checking for JAVA to the final summary.
Carnë Draug <carandraug@octave.org>
parents:
17836
diff
changeset
|
3087 if test -n "$warn_java"; then |
e88a8fa25125
configure.ac: add warnings on checking for JAVA to the final summary.
Carnë Draug <carandraug@octave.org>
parents:
17836
diff
changeset
|
3088 OCTAVE_CONFIGURE_WARNING([warn_java]) |
e88a8fa25125
configure.ac: add warnings on checking for JAVA to the final summary.
Carnë Draug <carandraug@octave.org>
parents:
17836
diff
changeset
|
3089 fi |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
3090 |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
3091 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
|
3092 AC_SUBST(JAVA) |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
3093 AC_SUBST(JAVAC) |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
3094 AC_SUBST(JAR) |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
3095 AC_SUBST(JAVA_CPPFLAGS) |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
3096 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
|
3097 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
|
3098 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
|
3099 |
21412
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3100 ## Collections of flags. These are here instead of just in the |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3101 ## Makefile.am file because we substitute some of them into other |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3102 ## source files like mkoctfile. |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3103 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3104 ## Order matters, at least on some systems (Cygwin, for example). |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3105 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3106 FFTW_XCPPFLAGS="$FFTW3_CPPFLAGS $FFTW3F_CPPFLAGS" |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3107 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3108 FFTW_XLDFLAGS="$FFTW3_LDFLAGS $FFTW3F_LDFLAGS" |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3109 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3110 FFTW_XLIBS="$FFTW3_LIBS $FFTW3F_LIBS" |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3111 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3112 SPARSE_XCPPFLAGS="$CHOLMOD_CPPFLAGS $UMFPACK_CPPFLAGS $AMD_CPPFLAGS $CAMD_CPPFLAGS $COLAMD_CPPFLAGS $CCOLAMD_CPPFLAGS $CXSPARSE_CPPFLAGS" |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3113 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3114 SPARSE_XLDFLAGS="$CHOLMOD_LDFLAGS $UMFPACK_LDFLAGS $AMD_LDFLAGS $CAMD_LDFLAGS $COLAMD_LDFLAGS $CCOLAMD_LDFLAGS $CXSPARSE_LDFLAGS" |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3115 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3116 SPARSE_XLIBS="$CHOLMOD_LIBS $UMFPACK_LIBS $AMD_LIBS $CAMD_LIBS $COLAMD_LIBS $CCOLAMD_LIBS $CXSPARSE_LIBS" |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3117 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3118 AC_SUBST(FFTW_XCPPFLAGS) |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3119 AC_SUBST(FFTW_XLDFLAGS) |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3120 AC_SUBST(FFTW_XLIBS) |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3121 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3122 AC_SUBST(SPARSE_XCPPFLAGS) |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3123 AC_SUBST(SPARSE_XLDFLAGS) |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3124 AC_SUBST(SPARSE_XLIBS) |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3125 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3126 GNULIB_LINK_DEPS="$COPYSIGNF_LIBM $COPYSIGN_LIBM $FLOORF_LIBM $FLOOR_LIBM $GETHOSTNAME_LIB $LIBSOCKET $LIB_NANOSLEEP $LIB_SELECT $LTLIBINTL $ROUNDF_LIBM $ROUND_LIBM $TRUNCF_LIBM $TRUNC_LIBM" |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3127 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3128 AC_SUBST(GNULIB_LINK_DEPS) |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3129 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3130 LIBOCTAVE_LINK_DEPS="$GNULIB_LINK_DEPS $CURL_LIBS $SPARSE_XLIBS $ARPACK_LIBS $QRUPDATE_LIBS $FFTW_XLIBS $LAPACK_LIBS $BLAS_LIBS $READLINE_LIBS $TERM_LIBS $LIBGLOB $PCRE_LIBS $DL_LIBS $PTHREAD_LIBS $FLIBS $LIBS" |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3131 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3132 LIBOCTAVE_LINK_OPTS="$CURL_LDFLAGS $SPARSE_XLDFLAGS $ARPACK_LDFLAGS $QRUPDATE_LDFLAGS $FFTW_XLDFLAGS" |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3133 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3134 AC_SUBST(LIBOCTAVE_LINK_DEPS) |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3135 AC_SUBST(LIBOCTAVE_LINK_OPTS) |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3136 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3137 if test $ENABLE_DYNAMIC_LINKING = yes; then |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3138 LIBOCTINTERP_LINK_DEPS="" |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3139 else |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3140 LIBOCTINTERP_LINK_DEPS="$DLDFCN_LIBS" |
19588
722ff3e45bea
build: Don't build GUI when OpenGL is disabled or not found (bug #44017)
Mike Miller <mtmiller@ieee.org>
parents:
19366
diff
changeset
|
3141 fi |
722ff3e45bea
build: Don't build GUI when OpenGL is disabled or not found (bug #44017)
Mike Miller <mtmiller@ieee.org>
parents:
19366
diff
changeset
|
3142 |
21678
6586202b3a87
make __magick_read__ a built-in function (bug #41699)
John W. Eaton <jwe@octave.org>
parents:
21640
diff
changeset
|
3143 LIBOCTINTERP_LINK_DEPS="$LIBOCTINTERP_LINK_DEPS $FT2_LIBS $HDF5_LIBS $MAGICK_LIBS $Z_LIBS $FFTW_XLIBS $OPENGL_LIBS $FONTCONFIG_LIBS $FREETYPE_LIBS $X11_LIBS $CARBON_LIBS $GL2PS_LIBS $LLVM_LIBS $JAVA_LIBS $LAPACK_LIBS" |
6586202b3a87
make __magick_read__ a built-in function (bug #41699)
John W. Eaton <jwe@octave.org>
parents:
21640
diff
changeset
|
3144 |
6586202b3a87
make __magick_read__ a built-in function (bug #41699)
John W. Eaton <jwe@octave.org>
parents:
21640
diff
changeset
|
3145 LIBOCTINTERP_LINK_OPTS="$FT2_LDFLAGS $HDF5_LDFLAGS $MAGICK_LDFLAGS $Z_LDFLAGS $FFTW_XLDFLAGS $LLVM_LDFLAGS" |
21412
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3146 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3147 OCTAVE_LINK_DEPS="" |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3148 OCTAVE_LINK_OPTS="" |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3149 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3150 OCT_LINK_DEPS="" |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3151 OCT_LINK_OPTS="$LDFLAGS" |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3152 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3153 if test $link_all_deps = yes || test -n "$QT_LDFLAGS"; then |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3154 LIBOCTINTERP_LINK_DEPS="$LIBOCTINTERP_LINK_DEPS $LIBOCTAVE_LINK_DEPS" |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3155 LIBOCTINTERP_LINK_OPTS="$LIBOCTINTERP_LINK_OPTS $LIBOCTAVE_LINK_OPTS" |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3156 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3157 OCTAVE_LINK_DEPS="$LIBOCTINTERP_LINK_DEPS" |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3158 OCTAVE_LINK_OPTS="$LIBOCTINTERP_LINK_OPTS" |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3159 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3160 OCT_LINK_DEPS="$OCT_LINK_DEPS $LIBOCTINTERP_LINK_DEPS" |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3161 OCT_LINK_OPTS="$OCT_LINK_OPTS $LIBOCTINTERP_LINK_OPTS" |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3162 fi |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3163 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3164 AC_SUBST(LIBOCTINTERP_LINK_DEPS) |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3165 AC_SUBST(LIBOCTINTERP_LINK_OPTS) |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3166 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3167 AC_SUBST(OCTAVE_LINK_DEPS) |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3168 AC_SUBST(OCTAVE_LINK_OPTS) |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3169 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3170 AC_SUBST(OCT_LINK_DEPS) |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3171 AC_SUBST(OCT_LINK_OPTS) |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3172 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3173 LIBOCTGUI_LINK_DEPS="" |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3174 LIBOCTGUI_LINK_OPTS="" |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3175 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3176 OCTAVE_GUI_LINK_DEPS="" |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3177 OCTAVE_GUI_LINK_OPTS="" |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3178 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3179 if test $build_qt_gui = yes; then |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3180 if test $ENABLE_DYNAMIC_LINKING = yes; then |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3181 LIBOCTGUI_LINK_DEPS="" |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3182 else |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3183 LIBOCTGUI_LINK_DEPS="$DLDFCN_LIBS" |
15873
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
3184 fi |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
3185 |
21412
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3186 LIBOCTGUI_LINK_DEPS="$LIBOCTGUI_LINK_DEPS $QT_LIBS $OPENGL_LIBS" |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3187 LIBOCTGUI_LINK_OPTS="$QT_LDFLAGS" |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3188 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3189 if test $link_all_deps = yes || test -n "$QT_LDFLAGS"; then |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3190 LIBOCTGUI_LINK_DEPS="$LIBOCTGUI_LINK_DEPS $LIBOCTINTERP_LINK_DEPS" |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3191 LIBOCTGUI_LINK_OPTS="$LIBOCTGUI_LINK_OPTS $LIBOCTINTERP_LINK_OPTS" |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3192 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3193 OCTAVE_GUI_LINK_DEPS="$OCTAVE_GUI_LINK_DEPS $LIBOCTGUI_LINK_DEPS" |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3194 OCTAVE_GUI_LINK_OPTS="$OCTAVE_GUI_LINK_OPTS $LIBOCTGUI_LINK_OPTS" |
17836
b1610bf6d9a8
configure.ac: add warnings about disabling GUI to the final summary.
Carnë Draug <carandraug@octave.org>
parents:
17821
diff
changeset
|
3195 fi |
15873
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
3196 fi |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
3197 |
21412
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3198 AC_SUBST(LIBOCTGUI_LINK_DEPS) |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3199 AC_SUBST(LIBOCTGUI_LINK_OPTS) |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3200 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3201 AC_SUBST(OCTAVE_GUI_LINK_DEPS) |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3202 AC_SUBST(OCTAVE_GUI_LINK_OPTS) |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3203 |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
3204 ### Do we want to create cross-mkoctfile etc ? |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
3205 |
19971
28a9e59d0714
cross-tools: Add ability to build cross built octave-config
John Donoghue
parents:
19965
diff
changeset
|
3206 cross_tools=no |
28a9e59d0714
cross-tools: Add ability to build cross built octave-config
John Donoghue
parents:
19965
diff
changeset
|
3207 AC_ARG_ENABLE([cross-tools], |
28a9e59d0714
cross-tools: Add ability to build cross built octave-config
John Donoghue
parents:
19965
diff
changeset
|
3208 [AS_HELP_STRING([--enable-cross-tools], |
28a9e59d0714
cross-tools: Add ability to build cross built octave-config
John Donoghue
parents:
19965
diff
changeset
|
3209 [build cross tools (mkoctfile, octave-config) if cross compiling])], |
28a9e59d0714
cross-tools: Add ability to build cross built octave-config
John Donoghue
parents:
19965
diff
changeset
|
3210 [if test "$enableval" = yes; then cross_tools=yes; fi]) |
28a9e59d0714
cross-tools: Add ability to build cross built octave-config
John Donoghue
parents:
19965
diff
changeset
|
3211 |
28a9e59d0714
cross-tools: Add ability to build cross built octave-config
John Donoghue
parents:
19965
diff
changeset
|
3212 if test "$cross_tools" = yes; then |
19963 | 3213 if test "$cross_compiling" = no; then |
19971
28a9e59d0714
cross-tools: Add ability to build cross built octave-config
John Donoghue
parents:
19965
diff
changeset
|
3214 AC_MSG_WARN([ignoring --enable-cross-tools when not cross compiling]) |
28a9e59d0714
cross-tools: Add ability to build cross built octave-config
John Donoghue
parents:
19965
diff
changeset
|
3215 cross_tools=no |
19963 | 3216 fi |
3217 fi | |
19971
28a9e59d0714
cross-tools: Add ability to build cross built octave-config
John Donoghue
parents:
19965
diff
changeset
|
3218 AM_CONDITIONAL([AMCOND_CROSS_TOOLS], [test $cross_tools = yes]) |
19963 | 3219 |
19841
07b970d6cdfe
Only install config.log in $octetc if user requested (bug #43087)
Mike Miller <mtmiller@ieee.org>
parents:
19840
diff
changeset
|
3220 ### Decide whether or not to install build logs with Octave. |
07b970d6cdfe
Only install config.log in $octetc if user requested (bug #43087)
Mike Miller <mtmiller@ieee.org>
parents:
19840
diff
changeset
|
3221 |
07b970d6cdfe
Only install config.log in $octetc if user requested (bug #43087)
Mike Miller <mtmiller@ieee.org>
parents:
19840
diff
changeset
|
3222 install_build_logs=no |
07b970d6cdfe
Only install config.log in $octetc if user requested (bug #43087)
Mike Miller <mtmiller@ieee.org>
parents:
19840
diff
changeset
|
3223 AC_ARG_ENABLE([install-build-logs], |
07b970d6cdfe
Only install config.log in $octetc if user requested (bug #43087)
Mike Miller <mtmiller@ieee.org>
parents:
19840
diff
changeset
|
3224 [AS_HELP_STRING([--enable-install-build-logs], |
21681
894b440027fa
fix help string about installing build logs
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
21678
diff
changeset
|
3225 [install build logs (i.e. config.log) with Octave])], |
19841
07b970d6cdfe
Only install config.log in $octetc if user requested (bug #43087)
Mike Miller <mtmiller@ieee.org>
parents:
19840
diff
changeset
|
3226 [if test "$enableval" = yes; then install_build_logs=yes; fi]) |
07b970d6cdfe
Only install config.log in $octetc if user requested (bug #43087)
Mike Miller <mtmiller@ieee.org>
parents:
19840
diff
changeset
|
3227 AM_CONDITIONAL([AMCOND_INSTALL_BUILD_LOGS], [test $install_build_logs = yes]) |
07b970d6cdfe
Only install config.log in $octetc if user requested (bug #43087)
Mike Miller <mtmiller@ieee.org>
parents:
19840
diff
changeset
|
3228 |
19839
d3dcc62512d7
do a better job of saving and restoring compiler flags (bug #44353)
John W. Eaton <jwe@octave.org>
parents:
19838
diff
changeset
|
3229 CFLAGS="$original_octave_configure_CFLAGS" |
d3dcc62512d7
do a better job of saving and restoring compiler flags (bug #44353)
John W. Eaton <jwe@octave.org>
parents:
19838
diff
changeset
|
3230 CXXFLAGS="$original_octave_configure_CXXFLAGS" |
1304 | 3231 |
16330
306e0ac231d0
move AH_BOTTOM output to separate header file
John W. Eaton <jwe@octave.org>
parents:
16329
diff
changeset
|
3232 AH_BOTTOM([#include "oct-conf-post.h"]) |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
3233 |
15779
4456ad3d8a56
configure.ac: Ensure that all AC_DEFINEs are captured by UGLY_DEFS variable.
Rik <rik@octave.org>
parents:
15777
diff
changeset
|
3234 ### 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
|
3235 ### 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
|
3236 ### 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
|
3237 |
4456ad3d8a56
configure.ac: Ensure that all AC_DEFINEs are captured by UGLY_DEFS variable.
Rik <rik@octave.org>
parents:
15777
diff
changeset
|
3238 AC_OUTPUT_MAKE_DEFS |
3923 | 3239 |
21409
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3240 AC_CONFIG_COMMANDS_PRE([ |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3241 ## Fully expand all directory variables. These are normally left |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3242 ## unexpanded (as explained and recommended by the autoconf manual). |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3243 ## But we store coniguration info in files and expect whatever |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3244 ## is set at configure time stay the same when Make is executed. |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3245 ## Doing things like |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3246 ## |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3247 ## configure --prefix=/some/where |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3248 ## make --prefix="/some/where/else |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3249 ## |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3250 ## won't work properly and is not allowed when building Octave. |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3251 |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3252 eval prefix="\"$prefix\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3253 eval exec_prefix="\"$exec_prefix\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3254 eval bindir="\"$bindir\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3255 eval sbindir="\"$sbindir\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3256 eval libexecdir="\"$libexecdir\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3257 eval datarootdir="\"$datarootdir\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3258 eval datadir="\"$datadir\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3259 eval sysconfdir="\"$sysconfdir\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3260 eval sharedstatedir="\"$sharedstatedir\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3261 eval localstatedir="\"$localstatedir\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3262 eval runstatedir="\"$runstatedir\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3263 eval includedir="\"$includedir\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3264 eval oldincludedir="\"$oldincludedir\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3265 eval docdir="\"$docdir\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3266 eval infodir="\"$infodir\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3267 eval htmldir="\"$htmldir\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3268 eval dvidir="\"$dvidir\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3269 eval pdfdir="\"$pdfdir\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3270 eval psdir="\"$psdir\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3271 eval libdir="\"$libdir\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3272 eval localedir="\"$localedir\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3273 eval mandir="\"$mandir\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3274 |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3275 version="$OCTAVE_VERSION" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3276 api_version="$OCTAVE_API_VERSION" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3277 |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3278 eval octlibdir="\"$octlibdir\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3279 eval archlibdir="\"$archlibdir\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3280 eval localarchlibdir="\"$localarchlibdir\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3281 eval localapiarchlibdir="\"$localapiarchlibdir\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3282 eval localverarchlibdir="\"$localverarchlibdir\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3283 eval octfiledir="\"$octfiledir\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3284 eval localoctfiledir="\"$localoctfiledir\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3285 eval localapioctfiledir="\"$localapioctfiledir\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3286 eval localveroctfiledir="\"$localveroctfiledir\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3287 eval octincludedir="\"$octincludedir\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3288 eval fcnfiledir="\"$fcnfiledir\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3289 eval localfcnfiledir="\"$localfcnfiledir\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3290 eval localapifcnfiledir="\"$localapifcnfiledir\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3291 eval localverfcnfiledir="\"$localverfcnfiledir\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3292 eval octetcdir="\"$octetcdir\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3293 eval octlocaledir="\"$octlocaledir\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3294 eval doc_cache_file="\"$doc_cache_file\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3295 eval octtestsdir="\"$octtestsdir\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3296 eval texi_macros_file="\"$texi_macros_file\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3297 eval imagedir="\"$imagedir\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3298 eval octdatadir="\"$octdatadir\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3299 eval startupfiledir="\"$startupfiledir\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3300 eval localstartupfiledir="\"$localstartupfiledir\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3301 eval man1dir="\"$man1dir\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3302 eval man1ext="\"$man1ext\"" |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3303 eval infofile="\"$infofile\"" |
21925
a53f46577e39
Fix variable expansion in dynamic linking flags for macOS (bug #48215)
Mike Miller <mtmiller@octave.org>
parents:
21908
diff
changeset
|
3304 |
a53f46577e39
Fix variable expansion in dynamic linking flags for macOS (bug #48215)
Mike Miller <mtmiller@octave.org>
parents:
21908
diff
changeset
|
3305 ## Also expand MKOCTFILE_DL_LDFLAGS, because it may depend on the values |
a53f46577e39
Fix variable expansion in dynamic linking flags for macOS (bug #48215)
Mike Miller <mtmiller@octave.org>
parents:
21908
diff
changeset
|
3306 ## of variables expanded above. |
a53f46577e39
Fix variable expansion in dynamic linking flags for macOS (bug #48215)
Mike Miller <mtmiller@octave.org>
parents:
21908
diff
changeset
|
3307 |
a53f46577e39
Fix variable expansion in dynamic linking flags for macOS (bug #48215)
Mike Miller <mtmiller@octave.org>
parents:
21908
diff
changeset
|
3308 eval MKOCTFILE_DL_LDFLAGS="\"$MKOCTFILE_DL_LDFLAGS\"" |
21409
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3309 ]) |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3310 |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3311 ### Do the substitutions in Makefiles and other scripts that |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3312 ### hold configuration info. |
869 | 3313 |
21413
3fb2bdea47a5
check substituted variables against current make variables
John W. Eaton <jwe@octave.org>
parents:
21412
diff
changeset
|
3314 AUTOCONF_SUBST_VARS="`echo $ac_subst_vars`" |
3fb2bdea47a5
check substituted variables against current make variables
John W. Eaton <jwe@octave.org>
parents:
21412
diff
changeset
|
3315 |
3fb2bdea47a5
check substituted variables against current make variables
John W. Eaton <jwe@octave.org>
parents:
21412
diff
changeset
|
3316 AC_SUBST(AUTOCONF_SUBST_VARS) |
8850
538184c540a9
Add make target "configfiles" to automatically regenerate configuration files
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
8849
diff
changeset
|
3317 AC_SUBST(ac_config_files) |
9645 | 3318 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
|
3319 |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3320 AC_CONFIG_FILES([ |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
3321 Makefile |
21413
3fb2bdea47a5
check substituted variables against current make variables
John W. Eaton <jwe@octave.org>
parents:
21412
diff
changeset
|
3322 build-aux/check-subst-vars.sh:build-aux/check-subst-vars.in.sh |
17102
c48625614ea6
Properly incorporate Doxygen into the build system
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
16088
diff
changeset
|
3323 doc/doxyhtml/Doxyfile |
21397
df859661e31e
generate default-qt-settings at configure time
John W. Eaton <jwe@octave.org>
parents:
21392
diff
changeset
|
3324 libgnu/Makefile]) |
df859661e31e
generate default-qt-settings at configure time
John W. Eaton <jwe@octave.org>
parents:
21392
diff
changeset
|
3325 |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
3326 dnl We use a .in.h file for oct-conf-post.h simply to copy it to |
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
3327 dnl the build tree and so that we don't have to add the -I${top_srcdir} |
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
3328 dnl to any CPPFLAGS variables. |
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
3329 |
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
3330 AC_CONFIG_FILES([oct-conf-post.h-tmp:oct-conf-post.in.h]) |
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
3331 AC_CONFIG_COMMANDS([oct-conf-post.h], |
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
3332 [$SHELL $srcdir/build-aux/move-if-change oct-conf-post.h-tmp oct-conf-post.h]) |
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
3333 |
21397
df859661e31e
generate default-qt-settings at configure time
John W. Eaton <jwe@octave.org>
parents:
21392
diff
changeset
|
3334 OCTAVE_CONFIG_MOVE_IF_CHANGE_FILES([ |
21413
3fb2bdea47a5
check substituted variables against current make variables
John W. Eaton <jwe@octave.org>
parents:
21412
diff
changeset
|
3335 build-aux/mk-default-qt-settings.sh |
3fb2bdea47a5
check substituted variables against current make variables
John W. Eaton <jwe@octave.org>
parents:
21412
diff
changeset
|
3336 build-aux/mk-f77-def.sh |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
3337 build-aux/mk-mxarray-h.sh |
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
3338 build-aux/mk-version-h.sh |
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
3339 build-aux/subst-config-vals.sh |
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
3340 build-aux/subst-cross-config-vals.sh |
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
3341 build-aux/subst-default-vals.sh |
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
3342 build-aux/subst-f77-isnan-macro.sh |
21413
3fb2bdea47a5
check substituted variables against current make variables
John W. Eaton <jwe@octave.org>
parents:
21412
diff
changeset
|
3343 build-aux/subst-script-vals.sh]) |
8850
538184c540a9
Add make target "configfiles" to automatically regenerate configuration files
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
8849
diff
changeset
|
3344 |
3887 | 3345 AC_OUTPUT |
1225 | 3346 |
3347 ### Print a summary so that important information isn't missed. | |
3348 | |
5844 | 3349 AC_MSG_NOTICE([ |
1225 | 3350 |
3351 Octave is now configured for $canonical_host_type | |
3352 | |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3353 Source directory: $srcdir |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3354 Installation prefix: $prefix |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3355 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
|
3356 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
|
3357 Fortran compiler: $F77 $FFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3358 Fortran libraries: $FLIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3359 Lex libraries: $LEXLIB |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3360 LIBS: $LIBS |
20712
4a25c398ffa2
configure option to build with address sanitizer (bugg #46449)
John W. Eaton <jwe@octave.org>
parents:
20677
diff
changeset
|
3361 Extra LDFLAGS: $WARN_LDFLAGS |
9519
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
3362 |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3363 AMD CPPFLAGS: $AMD_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3364 AMD LDFLAGS: $AMD_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3365 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
|
3366 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
|
3367 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
|
3368 ARPACK libraries: $ARPACK_LIBS |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3369 BLAS libraries: $BLAS_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3370 CAMD CPPFLAGS: $CAMD_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3371 CAMD LDFLAGS: $CAMD_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3372 CAMD libraries: $CAMD_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3373 CARBON libraries: $CARBON_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3374 CCOLAMD CPPFLAGS: $CCOLAMD_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3375 CCOLAMD LDFLAGS: $CCOLAMD_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3376 CCOLAMD libraries: $CCOLAMD_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3377 CHOLMOD CPPFLAGS: $CHOLMOD_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3378 CHOLMOD LDFLAGS: $CHOLMOD_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3379 CHOLMOD libraries: $CHOLMOD_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3380 COLAMD CPPFLAGS: $COLAMD_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3381 COLAMD LDFLAGS: $COLAMD_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3382 COLAMD libraries: $COLAMD_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3383 CURL CPPFLAGS: $CURL_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3384 CURL LDFLAGS: $CURL_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3385 CURL libraries: $CURL_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3386 CXSPARSE CPPFLAGS: $CXSPARSE_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3387 CXSPARSE LDFLAGS: $CXSPARSE_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3388 CXSPARSE libraries: $CXSPARSE_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3389 DL libraries: $DL_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3390 FFTW3 CPPFLAGS: $FFTW3_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3391 FFTW3 LDFLAGS: $FFTW3_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3392 FFTW3 libraries: $FFTW3_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3393 FFTW3F CPPFLAGS: $FFTW3F_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3394 FFTW3F LDFLAGS: $FFTW3F_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3395 FFTW3F libraries: $FFTW3F_LIBS |
19733
08033d583435
more consistently use _CPPFLAGS and _LDFLAGS variables
John W. Eaton <jwe@octave.org>
parents:
19732
diff
changeset
|
3396 FLTK CPPFLAGS: $FLTK_CPPFLAGS |
08033d583435
more consistently use _CPPFLAGS and _LDFLAGS variables
John W. Eaton <jwe@octave.org>
parents:
19732
diff
changeset
|
3397 FLTK LDFLAGS: $FLTK_LDFLAGS |
19732
bf25e9f7c22a
use FLTK_CFLAGS and FLTK_LIBS instead of GRAPHICS_CFLAGS and GRAPHICS_LIBS
John W. Eaton <jwe@octave.org>
parents:
19703
diff
changeset
|
3398 FLTK libraries: $FLTK_LIBS |
19733
08033d583435
more consistently use _CPPFLAGS and _LDFLAGS variables
John W. Eaton <jwe@octave.org>
parents:
19732
diff
changeset
|
3399 fontconfig CPPFLAGS: $FONTCONFIG_CPPFLAGS |
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
|
3400 fontconfig libraries: $FONTCONFIG_LIBS |
19733
08033d583435
more consistently use _CPPFLAGS and _LDFLAGS variables
John W. Eaton <jwe@octave.org>
parents:
19732
diff
changeset
|
3401 FreeType2 CPPFLAGS: $FT2_CPPFLAGS |
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
|
3402 FreeType2 libraries: $FT2_LIBS |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3403 GLPK CPPFLAGS: $GLPK_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3404 GLPK LDFLAGS: $GLPK_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3405 GLPK libraries: $GLPK_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3406 HDF5 CPPFLAGS: $HDF5_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3407 HDF5 LDFLAGS: $HDF5_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3408 HDF5 libraries: $HDF5_LIBS |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
3409 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
|
3410 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
|
3411 Java CPPFLAGS: $JAVA_CPPFLAGS |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
15600
diff
changeset
|
3412 Java libraries: $JAVA_LIBS |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3413 LAPACK libraries: $LAPACK_LIBS |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
3414 LLVM CPPFLAGS: $LLVM_CPPFLAGS |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
3415 LLVM LDFLAGS: $LLVM_LDFLAGS |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
3416 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
|
3417 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
|
3418 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
|
3419 Magick++ libraries: $MAGICK_LIBS |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3420 OPENGL libraries: $OPENGL_LIBS |
19703
a81177f4bfe6
Add __osmesa_print__.cc for offscreen rendering with OpenGL
Andreas Weber <andy.weber.aw@gmail.com>
parents:
19697
diff
changeset
|
3421 OSMesa CPPFLAGS: $OSMESA_CPPFLAGS |
a81177f4bfe6
Add __osmesa_print__.cc for offscreen rendering with OpenGL
Andreas Weber <andy.weber.aw@gmail.com>
parents:
19697
diff
changeset
|
3422 OSMesa LDFLAGS: $OSMESA_LDFLAGS |
a81177f4bfe6
Add __osmesa_print__.cc for offscreen rendering with OpenGL
Andreas Weber <andy.weber.aw@gmail.com>
parents:
19697
diff
changeset
|
3423 OSMesa libraries: $OSMESA_LIBS |
17821
82c94987abc6
build: Remove REGEX_CPPFLAGS from XTRA_CXXFLAGS.
Rik <rik@octave.org>
parents:
17820
diff
changeset
|
3424 PCRE CPPFLAGS: $PCRE_CPPFLAGS |
82c94987abc6
build: Remove REGEX_CPPFLAGS from XTRA_CXXFLAGS.
Rik <rik@octave.org>
parents:
17820
diff
changeset
|
3425 PCRE libraries: $PCRE_LIBS |
19470
23833e1bfa2e
check for PortAudio
Vytautas Jančauskas <unaudio@gmail.com>
parents:
19467
diff
changeset
|
3426 PortAudio CPPFLAGS: $PORTAUDIO_CPPFLAGS |
23833e1bfa2e
check for PortAudio
Vytautas Jančauskas <unaudio@gmail.com>
parents:
19467
diff
changeset
|
3427 PortAudio LDFLAGS: $PORTAUDIO_LDFLAGS |
23833e1bfa2e
check for PortAudio
Vytautas Jančauskas <unaudio@gmail.com>
parents:
19467
diff
changeset
|
3428 PortAudio libraries: $PORTAUDIO_LIBS |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3429 PTHREAD flags: $PTHREAD_CFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3430 PTHREAD libraries: $PTHREAD_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3431 QHULL CPPFLAGS: $QHULL_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3432 QHULL LDFLAGS: $QHULL_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3433 QHULL libraries: $QHULL_LIBS |
15424
cabe2fa4566c
build: Add and organize octave_config_info variables.
Rik <rik@octave.org>
parents:
15412
diff
changeset
|
3434 QRUPDATE CPPFLAGS: $QRUPDATE_CPPFLAGS |
cabe2fa4566c
build: Add and organize octave_config_info variables.
Rik <rik@octave.org>
parents:
15412
diff
changeset
|
3435 QRUPDATE LDFLAGS: $QRUPDATE_LDFLAGS |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3436 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
|
3437 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
|
3438 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
|
3439 Qt libraries: $QT_LIBS |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3440 READLINE libraries: $READLINE_LIBS |
19464
8fe2780c1491
update configure.ac to build and configure sndfile audio file utilities
Vytautas Jančauskas <unaudio@gmail.com>
parents:
17465
diff
changeset
|
3441 Sndfile CPPFLAGS: $SNDFILE_CPPFLAGS |
8fe2780c1491
update configure.ac to build and configure sndfile audio file utilities
Vytautas Jančauskas <unaudio@gmail.com>
parents:
17465
diff
changeset
|
3442 Sndfile LDFLAGS: $SNDFILE_LDFLAGS |
8fe2780c1491
update configure.ac to build and configure sndfile audio file utilities
Vytautas Jančauskas <unaudio@gmail.com>
parents:
17465
diff
changeset
|
3443 Sndfile libraries: $SNDFILE_LIBS |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3444 TERM libraries: $TERM_LIBS |
15424
cabe2fa4566c
build: Add and organize octave_config_info variables.
Rik <rik@octave.org>
parents:
15412
diff
changeset
|
3445 UMFPACK CPPFLAGS: $UMFPACK_CPPFLAGS |
cabe2fa4566c
build: Add and organize octave_config_info variables.
Rik <rik@octave.org>
parents:
15412
diff
changeset
|
3446 UMFPACK LDFLAGS: $UMFPACK_LDFLAGS |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3447 UMFPACK libraries: $UMFPACK_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3448 X11 include flags: $X11_INCFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3449 X11 libraries: $X11_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3450 Z CPPFLAGS: $Z_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3451 Z LDFLAGS: $Z_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3452 Z libraries: $Z_LIBS |
9519
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
3453 |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3454 Default pager: $DEFAULT_PAGER |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3455 gnuplot: $GNUPLOT |
1664 | 3456 |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
3457 Build Octave Qt GUI: $build_qt_gui |
21131
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
3458 JIT compiler for loops: $ENABLE_JIT |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
3459 Build Java interface: $build_java |
21131
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
3460 Do internal array bounds checking: $ENABLE_BOUNDS_CHECK |
4110 | 3461 Build static libraries: $STATIC_LIBS |
3462 Build shared libraries: $SHARED_LIBS | |
4128 | 3463 Dynamic Linking: $ENABLE_DYNAMIC_LINKING $DL_API_MSG |
4110 | 3464 Include support for GNU readline: $USE_READLINE |
21131
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
3465 64-bit array dims and indexing: $ENABLE_64 |
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
3466 OpenMP SMP multithreading: $ENABLE_OPENMP |
19971
28a9e59d0714
cross-tools: Add ability to build cross built octave-config
John Donoghue
parents:
19965
diff
changeset
|
3467 Build cross tools: $cross_tools |
20307
c3c1fb44f9b5
eliminate recursive make invocations in doc directory tree
John W. Eaton <jwe@octave.org>
parents:
20306
diff
changeset
|
3468 Build docs: $ENABLE_DOCS |
21131
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
3469 Truncate intermediate FP results: $ENABLE_FLOAT_TRUNCATE |
1225 | 3470 ]) |
3105 | 3471 |
3472 warn_msg_printed=false | |
3473 | |
14605
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
3474 OCTAVE_CONFIGURE_WARNING_SUMMARY |
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
3475 |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
3476 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
|
3477 if test $SHARED_LIBS = no; then |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
3478 AC_MSG_WARN([]) |
4469 | 3479 AC_MSG_WARN([You used --enable-dl but not --enable-shared.]) |
3480 AC_MSG_WARN([Are you sure that is what you want to do?]) | |
3481 warn_msg_printed=true | |
3482 fi | |
3483 fi | |
3484 | |
21131
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
3485 if test $ENABLE_64 = yes; then |
6161 | 3486 AC_MSG_WARN([]) |
5857 | 3487 AC_MSG_WARN([You used the EXPERIMENTAL --enable-64 option.]) |
3488 AC_MSG_WARN([Are you sure that is what you want to do?]) | |
3489 AC_MSG_WARN([]) | |
10331
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
3490 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
|
3491 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
|
3492 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
|
3493 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
|
3494 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
|
3495 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
|
3496 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
|
3497 AC_MSG_WARN([libraries to use 8 byte signed integers for array indexing.]) |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
3498 warn_msg_printed=true |
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
3499 fi |
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
3500 |
21378
172479a97e6c
configure.ac: Remove overquoting in shell variables tests.
Rik <rik@octave.org>
parents:
21374
diff
changeset
|
3501 if test $opengl_graphics = no; then |
10011
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3502 AC_MSG_WARN([]) |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
3503 AC_MSG_WARN([I didn't find the libraries needed to compile Octave]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
3504 AC_MSG_WARN([with support for OpenGL graphics. Creating plots is]) |
21513
6bf7f41afea6
* configure.ac: Correct typo of "gnuplot" in warning message
Mike Miller <mtmiller@octave.org>
parents:
21512
diff
changeset
|
3505 AC_MSG_WARN([still possible if you have gnuplot installed.]) |
10011
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3506 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
|
3507 fi |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3508 |
21131
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
3509 if test $ENABLE_ATOMIC_REFCOUNT = no; then |
13985
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
3510 AC_MSG_WARN([]) |
18584
89b7bd7d0b83
configure.ac: Use atomic reference counting by default for Qt toolkit.
Rik <rik@octave.org>
parents:
18551
diff
changeset
|
3511 AC_MSG_WARN([atomic reference counting disabled.]) |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
3512 AC_MSG_WARN([This feature allows access to Octave data safely from]) |
18584
89b7bd7d0b83
configure.ac: Use atomic reference counting by default for Qt toolkit.
Rik <rik@octave.org>
parents:
18551
diff
changeset
|
3513 AC_MSG_WARN([another thread, and is required when using the GUI's Qt toolkit]) |
89b7bd7d0b83
configure.ac: Use atomic reference counting by default for Qt toolkit.
Rik <rik@octave.org>
parents:
18551
diff
changeset
|
3514 AC_MSG_WARN([for plotting.]) |
89b7bd7d0b83
configure.ac: Use atomic reference counting by default for Qt toolkit.
Rik <rik@octave.org>
parents:
18551
diff
changeset
|
3515 fi |
13985
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
3516 |
6191 | 3517 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
|
3518 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
|
3519 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
|
3520 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
|
3521 AC_MSG_NOTICE([NOTE: system. ]) |
6161 | 3522 fi |
3523 | |
3105 | 3524 ### End of configure. |