Mercurial > jwe > octave
annotate configure.ac @ 26912:5042a568771a
don't disable all of sundials if including sunlinsol_klu.h fails (bug #55911)
* configure.ac (HAVE_SUNDIALS): Don't disable sundials if
sunlinsol_klu.h is missing or unusable.
* acinclude.m4 (OCTAVE_CHECK_SUNDIALS_SUNLINSOL_KLU): Don't define
HAVE_SUNDIALS_SUNLINSOL_KLU if sunlinsol_klu.h is missing or unusable.
* __ode15__.cc: Make inline definition of replacement for
SUNLinSol_KLU conditional.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 14 Mar 2019 07:05:22 +0000 |
parents | 73b141d5a888 |
children | 075c4d3bf1de |
rev | line source |
---|---|
5 | 1 dnl Process this file with autoconf to produce a configure script. |
2 dnl | |
26379
00f796120a6d
maint: Update copyright dates in all source files.
John W. Eaton <jwe@octave.org>
parents:
26366
diff
changeset
|
3 dnl Copyright (C) 1993-2019 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 ### |
24534
194eb4bd202b
maint: Update punctuation for GPL v3 license text.
Rik <rik@octave.org>
parents:
24390
diff
changeset
|
7 ### Octave is free software: you can redistribute it and/or modify it |
22755
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22743
diff
changeset
|
8 ### under the terms of the GNU General Public License as published by |
24534
194eb4bd202b
maint: Update punctuation for GPL v3 license text.
Rik <rik@octave.org>
parents:
24390
diff
changeset
|
9 ### the Free Software Foundation, either version 3 of the License, or |
22755
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22743
diff
changeset
|
10 ### (at 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 ### |
22755
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22743
diff
changeset
|
12 ### Octave is distributed in the hope that it will be useful, but |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22743
diff
changeset
|
13 ### WITHOUT ANY WARRANTY; without even the implied warranty of |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22743
diff
changeset
|
14 ### MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22743
diff
changeset
|
15 ### GNU General Public License 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 |
24534
194eb4bd202b
maint: Update punctuation for GPL v3 license text.
Rik <rik@octave.org>
parents:
24390
diff
changeset
|
19 ### <https://www.gnu.org/licenses/>. |
869 | 20 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
21 ### Initialize Autoconf |
23505
021d0ea8fa00
* configure.ac (AC_PREREQ): Require autoconf version 2.65.
John W. Eaton <jwe@octave.org>
parents:
23495
diff
changeset
|
22 AC_PREREQ([2.65]) |
26274
7afff15260ad
maint: Merge stable to default, begin active development of Octave 6
John W. Eaton <jwe@octave.org>
parents:
26273
diff
changeset
|
23 AC_INIT([GNU Octave], [6.0.0], [https://octave.org/bugs.html], [octave], |
25137
f18f4700aded
configure: override default project URL with https URL
Mike Miller <mtmiller@octave.org>
parents:
25098
diff
changeset
|
24 [https://www.gnu.org/software/octave/]) |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
25 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
26 ### Declare version numbers |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
27 |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
28 dnl Note that the version number is duplicated here and in AC_INIT because |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
29 dnl AC_INIT requires it to be static, not computed from shell variables. |
24881
086e6a86f83f
maint: merge default to stable in preparation for upcoming 4.4 release
John W. Eaton <jwe@octave.org>
diff
changeset
|
30 |
25590
02766a14c461
add info about version numbers in etc/HACKING.md file
John W. Eaton <jwe@octave.org>
parents:
25589
diff
changeset
|
31 ## The description of the Octave version number in the etc/HACKING.md |
02766a14c461
add info about version numbers in etc/HACKING.md file
John W. Eaton <jwe@octave.org>
parents:
25589
diff
changeset
|
32 ## explains how to update these numbers for release and development |
02766a14c461
add info about version numbers in etc/HACKING.md file
John W. Eaton <jwe@octave.org>
parents:
25589
diff
changeset
|
33 ## versions. |
02766a14c461
add info about version numbers in etc/HACKING.md file
John W. Eaton <jwe@octave.org>
parents:
25589
diff
changeset
|
34 |
26274
7afff15260ad
maint: Merge stable to default, begin active development of Octave 6
John W. Eaton <jwe@octave.org>
parents:
26273
diff
changeset
|
35 OCTAVE_MAJOR_VERSION=6 |
25145
dfc6ccc2a3e8
set dev branch version to 5.0.0
John W. Eaton <jwe@octave.org>
parents:
25141
diff
changeset
|
36 OCTAVE_MINOR_VERSION=0 |
26274
7afff15260ad
maint: Merge stable to default, begin active development of Octave 6
John W. Eaton <jwe@octave.org>
parents:
26273
diff
changeset
|
37 OCTAVE_PATCH_VERSION=0 |
18229
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
38 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
39 dnl PACKAGE_VERSION is set by the AC_INIT VERSION argument. |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
40 OCTAVE_VERSION="$PACKAGE_VERSION" |
18229
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
41 |
26623
82865ccb62c2
bump version for first 5.1 release candidate
John W. Eaton <jwe@octave.org>
parents:
26616
diff
changeset
|
42 OCTAVE_COPYRIGHT="Copyright (C) 2019 John W. Eaton and others." |
82865ccb62c2
bump version for first 5.1 release candidate
John W. Eaton <jwe@octave.org>
parents:
26616
diff
changeset
|
43 |
26791 | 44 OCTAVE_RELEASE_DATE="2019-02-23" |
18229
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
45 |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
46 ## 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
|
47 ## liboctave and libinterp libraries haven't changed in a backwardly |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
48 ## incompatible way when loading .oct files. A better way to do this is with |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
49 ## library versioning, but not all systems support it. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
50 ## |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
51 ## NOTE: This macro will be removed in a future version of Octave! |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
52 ## If you insist on checking for features using a version number, use the |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
53 ## OCTAVE_MAJOR_VERSION, OCTAVE_MINOR_VERSION, and OCTAVE_PATCH_VERSION |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
54 ## macros instead. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
55 dnl |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
56 dnl FIXME: Since we also set libtool versions for liboctave and libinterp, |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
57 dnl perhaps we should be computing the "api version" from those versions numbers |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
58 dnl in some way instead of setting it independently here. |
26806
14815cb62fbe
Add '+' to OCTAVE_API_VERSION to make dev branch oct files incompatible with stable.
Rik <rik@octave.org>
parents:
26795
diff
changeset
|
59 OCTAVE_API_VERSION="api-v53+" |
18229
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
60 |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
61 AC_SUBST(OCTAVE_MAJOR_VERSION) |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
62 AC_SUBST(OCTAVE_MINOR_VERSION) |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
63 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
|
64 AC_SUBST(OCTAVE_VERSION) |
18229
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
65 AC_SUBST(OCTAVE_COPYRIGHT) |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
66 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
|
67 AC_SUBST(OCTAVE_API_VERSION) |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
68 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
69 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
|
70 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
|
71 dnl AC_REVISION($Revision: 1.603 $) |
15195 | 72 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
|
73 AC_CONFIG_HEADERS([config.h:config.in.h]) |
9946 | 74 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
|
75 AC_CONFIG_MACRO_DIR([m4]) |
869 | 76 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
77 ### Initialize Automake |
24162
312c00dd723a
use markdown for README and etc/HACKING files
John W. Eaton <jwe@octave.org>
parents:
24150
diff
changeset
|
78 AM_INIT_AUTOMAKE([1.14 -Wno-portability -Wno-override tar-ustar subdir-objects dist-lzip dist-xz]) |
9946 | 79 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
80 ## Add option to enable silent rules and make silent the default behavior. |
19801
c1654224bc99
enable silent makefile rules by default
John W. Eaton <jwe@octave.org>
parents:
19744
diff
changeset
|
81 AM_SILENT_RULES([yes]) |
17375
bc018154e46a
build: Support optional Automake silent rules
Mike Miller <mtmiller@ieee.org>
parents:
17330
diff
changeset
|
82 |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
83 OCTAVE_CANONICAL_HOST |
5844 | 84 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
85 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
|
86 |
9091
45c832e9976d
configure.in: require autoconf 2.60; eliminate some obsolete macros
John W. Eaton <jwe@octave.org>
parents:
9090
diff
changeset
|
87 AC_USE_SYSTEM_EXTENSIONS |
1667 | 88 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
89 ### Make configure args available in variable form for other uses. |
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
|
90 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
91 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
|
92 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
|
93 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
94 ### Set default file locations. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
95 |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
96 ## Where to install libraries like liboctave.a, liboctinterp.a, and other |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
97 ## architecture-dependent binaries. |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
98 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
|
99 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
100 ## Where to put executables to be run by Octave, rather than the user. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
101 ## This path usually includes the Octave version and configuration name, so |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
102 ## that configurations 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
|
103 OCTAVE_SET_DEFAULT([archlibdir], |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
104 '${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
|
105 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
106 ## Where to put executables to be run by Octave, rather than the user, that |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
107 ## 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
|
108 OCTAVE_SET_DEFAULT([localarchlibdir], |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
109 '${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
|
110 |
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
|
111 OCTAVE_SET_DEFAULT([localapiarchlibdir], |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
112 '${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
|
113 |
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([localverarchlibdir], |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
115 '${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
|
116 |
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
117 ## Where to put object files that will by dynamically loaded. |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
118 ## This path includes the Octave version and configuration name, so that |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
119 ## configurations 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
|
120 OCTAVE_SET_DEFAULT([octfiledir], |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
121 '${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
|
122 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
123 ## Directories that Octave should search for object files that will be |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
124 ## dynamically loaded and that are specific to this site (i.e. customizations), |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
125 ## before consulting ${octfiledir}. This should be a colon-separated list of |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
126 ## 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
|
127 OCTAVE_SET_DEFAULT([localoctfiledir], |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
128 '${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
|
129 |
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
|
130 OCTAVE_SET_DEFAULT([localapioctfiledir], |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
131 '${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
|
132 |
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
|
133 OCTAVE_SET_DEFAULT([localveroctfiledir], |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
134 '${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
|
135 |
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
136 ## 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
|
137 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
|
138 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
139 ## Where to install the function files distributed with Octave. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
140 ## This includes the Octave version, so that the function files for different |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
141 ## versions of Octave will be installed in separate directories. |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
142 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
|
143 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
144 ## Directories that Octave should search for function files specific to this |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
145 ## site (i.e. customizations), before consulting ${fcnfiledir}. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
146 ## This should be a colon-separated list of directories. |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
147 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
|
148 |
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
|
149 OCTAVE_SET_DEFAULT([localapifcnfiledir], |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
150 '${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
|
151 |
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
152 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
|
153 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
154 ## Where to install 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
|
155 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
|
156 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
157 ## Where to install 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
|
158 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
|
159 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
160 ## 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
|
161 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
|
162 |
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
163 ## 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
|
164 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
|
165 |
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
166 ## 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
|
167 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
|
168 |
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
169 ## 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
|
170 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
|
171 |
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
172 ## 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
|
173 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
|
174 |
24876
7c7b60dd4d4c
Generate Qt compressed help and collection files for the manual (bug #53006)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24874
diff
changeset
|
175 ## Where Octave will search for Qt help files shipped with distribution. |
7c7b60dd4d4c
Generate Qt compressed help and collection files for the manual (bug #53006)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24874
diff
changeset
|
176 OCTAVE_SET_DEFAULT([octdocdir], '${datadir}/octave/${version}/doc') |
7c7b60dd4d4c
Generate Qt compressed help and collection files for the manual (bug #53006)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24874
diff
changeset
|
177 |
24899
1a46d174a483
include a proper definition of Octave's private font fallback directory
Mike Miller <mtmiller@octave.org>
parents:
24890
diff
changeset
|
178 ## Where Octave will search for fallback font files shipped with distribution. |
1a46d174a483
include a proper definition of Octave's private font fallback directory
Mike Miller <mtmiller@octave.org>
parents:
24890
diff
changeset
|
179 OCTAVE_SET_DEFAULT([octfontsdir], '${datadir}/octave/${version}/fonts') |
24935
c27398f0601c
maint: revert inadvertent changes from merge revision ff80c319e664
Mike Miller <mtmiller@octave.org>
parents:
24927
diff
changeset
|
180 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
181 ## Where Octave will look for startup files. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
182 OCTAVE_SET_DEFAULT([startupfiledir], '${fcnfiledir}/startup') |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
183 OCTAVE_SET_DEFAULT([localstartupfiledir], '${localfcnfiledir}/startup') |
24935
c27398f0601c
maint: revert inadvertent changes from merge revision ff80c319e664
Mike Miller <mtmiller@octave.org>
parents:
24927
diff
changeset
|
184 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
185 ## Where Octave will look for man and info files. |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
186 OCTAVE_SET_DEFAULT([man1dir], '${mandir}/man1') |
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
|
187 OCTAVE_SET_DEFAULT([man1ext], '.1') |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
188 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
|
189 |
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 ### 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
|
191 |
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 ## Programs used in configuring Octave. |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
193 dnl Find pkg-config executable (sets $PKG_CONFIG) |
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
|
194 PKG_PROG_PKG_CONFIG |
25391
26070f36f1e7
Provide octave configuration files for pkg-config (bug #48775)
Carnë Draug <carandraug@octave.org>
parents:
25333
diff
changeset
|
195 ## And where we will install our own .pc files. |
26070f36f1e7
Provide octave configuration files for pkg-config (bug #48775)
Carnë Draug <carandraug@octave.org>
parents:
25333
diff
changeset
|
196 PKG_INSTALLDIR |
26070f36f1e7
Provide octave configuration files for pkg-config (bug #48775)
Carnë Draug <carandraug@octave.org>
parents:
25333
diff
changeset
|
197 AC_SUBST([liboctave_pkgconfigdir], [$pkgconfigdir]) |
26070f36f1e7
Provide octave configuration files for pkg-config (bug #48775)
Carnë Draug <carandraug@octave.org>
parents:
25333
diff
changeset
|
198 AC_SUBST([libinterp_pkgconfigdir], [$pkgconfigdir]) |
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
|
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 ## 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
|
201 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
|
202 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
|
203 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
|
204 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
|
205 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
|
206 |
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 ## 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
|
208 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
|
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 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
|
211 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
|
212 |
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 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
|
214 |
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 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
|
216 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
|
217 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
|
218 |
24077
e483dcb5777d
build the source distribution archives reproducibly
Mike Miller <mtmiller@octave.org>
parents:
23993
diff
changeset
|
219 OCTAVE_PROG_TAR_REPRODUCIBLE |
e483dcb5777d
build the source distribution archives reproducibly
Mike Miller <mtmiller@octave.org>
parents:
23993
diff
changeset
|
220 |
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
|
221 ## 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
|
222 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
|
223 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
|
224 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
225 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
|
226 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
|
227 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
|
228 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
229 ## Programs used when running Octave. |
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
|
230 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
|
231 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
|
232 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
|
233 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
|
234 |
19744
1687269e31e4
build: Generate Octave logo icons from SVG source (bug #37062)
Mike Miller <mtmiller@ieee.org>
parents:
19733
diff
changeset
|
235 ## 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
|
236 OCTAVE_PROG_ICOTOOL |
1687269e31e4
build: Generate Octave logo icons from SVG source (bug #37062)
Mike Miller <mtmiller@ieee.org>
parents:
19733
diff
changeset
|
237 OCTAVE_PROG_RSVG_CONVERT |
1687269e31e4
build: Generate Octave logo icons from SVG source (bug #37062)
Mike Miller <mtmiller@ieee.org>
parents:
19733
diff
changeset
|
238 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
|
239 [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
|
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 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
267 ### Define the path to the shell on the host system. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
268 ### Most systems will ensure /bin/sh is the default shell so this can be safely |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
269 ### ignored by almost everyone. However, when building for Android, for |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
270 ### example, this will need to be set. |
15756
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 |
24900
00d42b86d0a5
configure: new option --with-system-freefont to use system fonts (bug #53348)
Mike Miller <mtmiller@octave.org>
parents:
24899
diff
changeset
|
288 ### Use the system-wide installation of GNU FreeFont if the user requests it. |
00d42b86d0a5
configure: new option --with-system-freefont to use system fonts (bug #53348)
Mike Miller <mtmiller@octave.org>
parents:
24899
diff
changeset
|
289 ### By default, Octave includes its own copy of the FreeSans font, which it |
00d42b86d0a5
configure: new option --with-system-freefont to use system fonts (bug #53348)
Mike Miller <mtmiller@octave.org>
parents:
24899
diff
changeset
|
290 ### installs in its own directory for use as a fallback default font. If this |
00d42b86d0a5
configure: new option --with-system-freefont to use system fonts (bug #53348)
Mike Miller <mtmiller@octave.org>
parents:
24899
diff
changeset
|
291 ### configuration option is used, then do not install our own copy of the fonts |
00d42b86d0a5
configure: new option --with-system-freefont to use system fonts (bug #53348)
Mike Miller <mtmiller@octave.org>
parents:
24899
diff
changeset
|
292 ### and assume they can be found in the provided system directory. |
00d42b86d0a5
configure: new option --with-system-freefont to use system fonts (bug #53348)
Mike Miller <mtmiller@octave.org>
parents:
24899
diff
changeset
|
293 SYSTEM_FREEFONT_DIR= |
00d42b86d0a5
configure: new option --with-system-freefont to use system fonts (bug #53348)
Mike Miller <mtmiller@octave.org>
parents:
24899
diff
changeset
|
294 AC_ARG_WITH([system-freefont], |
00d42b86d0a5
configure: new option --with-system-freefont to use system fonts (bug #53348)
Mike Miller <mtmiller@octave.org>
parents:
24899
diff
changeset
|
295 [AS_HELP_STRING([--with-system-freefont=DIR], |
00d42b86d0a5
configure: new option --with-system-freefont to use system fonts (bug #53348)
Mike Miller <mtmiller@octave.org>
parents:
24899
diff
changeset
|
296 [use FreeSans fonts in DIR (default: install and use internal copy)])]) |
00d42b86d0a5
configure: new option --with-system-freefont to use system fonts (bug #53348)
Mike Miller <mtmiller@octave.org>
parents:
24899
diff
changeset
|
297 case $with_system_freefont in |
00d42b86d0a5
configure: new option --with-system-freefont to use system fonts (bug #53348)
Mike Miller <mtmiller@octave.org>
parents:
24899
diff
changeset
|
298 no | "") |
00d42b86d0a5
configure: new option --with-system-freefont to use system fonts (bug #53348)
Mike Miller <mtmiller@octave.org>
parents:
24899
diff
changeset
|
299 SYSTEM_FREEFONT_DIR= |
00d42b86d0a5
configure: new option --with-system-freefont to use system fonts (bug #53348)
Mike Miller <mtmiller@octave.org>
parents:
24899
diff
changeset
|
300 ;; |
00d42b86d0a5
configure: new option --with-system-freefont to use system fonts (bug #53348)
Mike Miller <mtmiller@octave.org>
parents:
24899
diff
changeset
|
301 yes) |
00d42b86d0a5
configure: new option --with-system-freefont to use system fonts (bug #53348)
Mike Miller <mtmiller@octave.org>
parents:
24899
diff
changeset
|
302 AC_MSG_ERROR([directory argument required for --with-system-freefont]) |
00d42b86d0a5
configure: new option --with-system-freefont to use system fonts (bug #53348)
Mike Miller <mtmiller@octave.org>
parents:
24899
diff
changeset
|
303 ;; |
00d42b86d0a5
configure: new option --with-system-freefont to use system fonts (bug #53348)
Mike Miller <mtmiller@octave.org>
parents:
24899
diff
changeset
|
304 *) |
00d42b86d0a5
configure: new option --with-system-freefont to use system fonts (bug #53348)
Mike Miller <mtmiller@octave.org>
parents:
24899
diff
changeset
|
305 SYSTEM_FREEFONT_DIR=$with_system_freefont |
00d42b86d0a5
configure: new option --with-system-freefont to use system fonts (bug #53348)
Mike Miller <mtmiller@octave.org>
parents:
24899
diff
changeset
|
306 ;; |
00d42b86d0a5
configure: new option --with-system-freefont to use system fonts (bug #53348)
Mike Miller <mtmiller@octave.org>
parents:
24899
diff
changeset
|
307 esac |
00d42b86d0a5
configure: new option --with-system-freefont to use system fonts (bug #53348)
Mike Miller <mtmiller@octave.org>
parents:
24899
diff
changeset
|
308 if test -n "$SYSTEM_FREEFONT_DIR"; then |
00d42b86d0a5
configure: new option --with-system-freefont to use system fonts (bug #53348)
Mike Miller <mtmiller@octave.org>
parents:
24899
diff
changeset
|
309 AC_MSG_NOTICE([configuring Octave to use system fonts in $SYSTEM_FREEFONT_DIR]) |
00d42b86d0a5
configure: new option --with-system-freefont to use system fonts (bug #53348)
Mike Miller <mtmiller@octave.org>
parents:
24899
diff
changeset
|
310 AC_DEFINE_UNQUOTED([SYSTEM_FREEFONT_DIR], ["$SYSTEM_FREEFONT_DIR"], |
00d42b86d0a5
configure: new option --with-system-freefont to use system fonts (bug #53348)
Mike Miller <mtmiller@octave.org>
parents:
24899
diff
changeset
|
311 [Define this to be the system directory containing the GNU FreeFont fonts.]) |
24927
c280560d9c96
Overhaul special functions modified by GSOC2018 project.
Rik <rik@octave.org>
parents:
24926
diff
changeset
|
312 fi |
24900
00d42b86d0a5
configure: new option --with-system-freefont to use system fonts (bug #53348)
Mike Miller <mtmiller@octave.org>
parents:
24899
diff
changeset
|
313 AM_CONDITIONAL([AMCOND_INSTALL_INTERNAL_FONT_FILES], |
00d42b86d0a5
configure: new option --with-system-freefont to use system fonts (bug #53348)
Mike Miller <mtmiller@octave.org>
parents:
24899
diff
changeset
|
314 [test -z "$SYSTEM_FREEFONT_DIR"]) |
24927
c280560d9c96
Overhaul special functions modified by GSOC2018 project.
Rik <rik@octave.org>
parents:
24926
diff
changeset
|
315 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
316 ### Determine which C++ compiler to use (we expect to find g++). |
869 | 317 |
405 | 318 AC_PROG_CXX |
319 AC_PROG_CXXCPP | |
869 | 320 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
321 ## Ensure that the C++ compiler fully supports C++11. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
322 dnl Test must occur after calling AC_PROG_CXX, which tests for language |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
323 dnl features and sets the shell variable ac_cv_prog_cxx_cxx11 appropriately. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
324 |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
325 if test x"$ac_cv_prog_cxx_cxx11" = xno; then |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
326 AC_MSG_ERROR([a compiler that fully supports C++11 is required to build Octave]) |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
327 fi |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
328 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
329 ### Determine which C compiler to use (we expect to find gcc). |
869 | 330 |
5 | 331 AC_PROG_CC |
405 | 332 AC_PROG_CPP |
832 | 333 AC_PROG_GCC_TRADITIONAL |
869 | 334 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
335 ## Save and restore CFLAGS and CXXFLAGS globally. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
336 dnl These variables are for users, so we shouldn't be touching them. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
337 dnl Instead, we should set the corresponding AM_ flags (currently by way of the |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
338 dnl XTRA_ variables). However, for the duration of the configure script, we |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
339 dnl may set CFLAGS and CXXFLAGS so that subsequent tests succeed. Temporary |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
340 dnl settings 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
|
341 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
|
342 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
|
343 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
344 ## Check for MSVC |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
345 have_msvc=no |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
346 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
347 msdosmsvc) |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
348 have_msvc=yes |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
349 ;; |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
350 mingw*) |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
351 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
|
352 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
|
353 #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
|
354 #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
|
355 #endif |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
356 ]])], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
357 have_msvc=yes, have_msvc=no) |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
358 AC_MSG_RESULT([$have_msvc]) |
405 | 359 ;; |
5 | 360 esac |
869 | 361 |
15142
f4684192158e
configure.ac: Split gnulib initialization into 2 parts to match recommended usage.
Rik <rik@octave.org>
parents:
15141
diff
changeset
|
362 ### gnulib initialization: part 1 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
363 dnl Must take place immediately after a compiler is determined |
9946 | 364 |
365 gl_EARLY | |
366 | |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
367 ### Check version number when using g++. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
368 |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
369 GXX_VERSION= |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
370 if test "$GXX" = yes; then |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
371 AC_MSG_CHECKING([C++ compiler version number]) |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
372 gxx_version=`$CXX -v 2>&1 | $GREP "^.*g.. version" | \ |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
373 $SED -e 's/^.*g.. version *//' -e 's/cygnus-//' -e 's/egcs-//' -e 's/ .*//'` |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
374 |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
375 AX_COMPARE_VERSION([$gxx_version], [lt], [4.1], |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
376 [warn_gxx_version="g++ version $gxx_version is likely to cause problems" |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
377 OCTAVE_CONFIGURE_WARNING([warn_gxx_version])]) |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
378 |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
379 GXX_VERSION=$gxx_version |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
380 AC_MSG_RESULT([$GXX_VERSION]) |
2108 | 381 fi |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
382 AC_SUBST(GXX_VERSION) |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
383 |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
384 ## Workaround for broken STL algorithm library. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
385 OCTAVE_CHECK_BROKEN_STL_ALGO_H |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
386 AM_CONDITIONAL([AMCOND_HAVE_BROKEN_STL_ALGO_H], |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
387 [test $octave_cv_broken_stl_algo_h = yes]) |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
388 |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
389 if test $octave_cv_broken_stl_algo_h = yes; then |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
390 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." |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
391 OCTAVE_CONFIGURE_WARNING([warn_stl_algo_h]) |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
392 fi |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
393 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
394 ### Check version number when using gcc. |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
395 dnl It might be different from the g++ version number. |
869 | 396 |
15167
1c711a646fa7
Deprecate configure variables CC_VERSION, CXX_VERSION.
Rik <rik@octave.org>
parents:
15166
diff
changeset
|
397 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
|
398 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
|
399 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
|
400 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
|
401 $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
|
402 |
15170
a44ff4f0a20b
Add AX_COMPARE_VERSION.m4 macro m4/ dir to make configure.ac simpler.
Rik <rik@octave.org>
parents:
15168
diff
changeset
|
403 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
|
404 [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
|
405 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
|
406 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
407 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
|
408 AC_MSG_RESULT([$GCC_VERSION]) |
1894 | 409 fi |
17877
540d1c122b08
* configure.ac: Also check for g++ version.
John W. Eaton <jwe@octave.org>
parents:
17844
diff
changeset
|
410 AC_SUBST(GCC_VERSION) |
1894 | 411 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
412 ## It seems that there are some broken inline assembly functions in GNU libc. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
413 ## Since it is uncertain how to test whether Octave is linked against GNU libc, |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
414 ## just disable them for all platforms. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
415 |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
416 AC_MSG_NOTICE([defining __NO_MATH_INLINES avoids buggy GNU libc exp function]) |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
417 AC_DEFINE(__NO_MATH_INLINES, 1, |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
418 [Define to 1 if your version of GNU libc has buggy inline assembly code for math functions like exp.]) |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
419 |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
420 ### Determine the compiler flag necessary to create dependencies. |
3775 | 421 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
422 ## Assume GCC. |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
423 INCLUDE_DEPS=yes |
3775 | 424 DEPEND_FLAGS="-M" |
425 DEPEND_EXTRA_SED_PATTERN="" | |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
426 if test "$GCC" != yes; then |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
427 case $canonical_host_type in |
6087 | 428 sparc-sun-solaris2* | i386-pc-solaris2*) |
3775 | 429 DEPEND_FLAGS="-xM1" |
430 DEPEND_EXTRA_SED_PATTERN="-e '/\/opt\/SUNWspro/d'" | |
6087 | 431 ;; |
7451 | 432 *-*-msdosmsvc) |
433 ;; | |
10123
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
434 *-*-mingw*) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
435 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
|
436 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
|
437 fi |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
438 ;; |
6087 | 439 *) |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
440 INCLUDE_DEPS=no |
6087 | 441 ;; |
442 esac | |
443 fi | |
444 AC_SUBST(INCLUDE_DEPS) | |
3775 | 445 AC_SUBST(DEPEND_FLAGS) |
446 AC_SUBST(DEPEND_EXTRA_SED_PATTERN) | |
447 | |
25552
5f9fa229cc8a
configure.ac: Reorder tests so that FPICFLAG is correctly set on Solaris (bug #54235).
Rik <rik@octave.org>
parents:
25519
diff
changeset
|
448 ### Check for math library. |
5f9fa229cc8a
configure.ac: Reorder tests so that FPICFLAG is correctly set on Solaris (bug #54235).
Rik <rik@octave.org>
parents:
25519
diff
changeset
|
449 dnl If found, this will add -lm to LIBS. |
5f9fa229cc8a
configure.ac: Reorder tests so that FPICFLAG is correctly set on Solaris (bug #54235).
Rik <rik@octave.org>
parents:
25519
diff
changeset
|
450 |
5f9fa229cc8a
configure.ac: Reorder tests so that FPICFLAG is correctly set on Solaris (bug #54235).
Rik <rik@octave.org>
parents:
25519
diff
changeset
|
451 dnl Keep this check before the check for the Fortran compiler, |
5f9fa229cc8a
configure.ac: Reorder tests so that FPICFLAG is correctly set on Solaris (bug #54235).
Rik <rik@octave.org>
parents:
25519
diff
changeset
|
452 dnl in case -lm is needed to compile Fortran programs. |
5f9fa229cc8a
configure.ac: Reorder tests so that FPICFLAG is correctly set on Solaris (bug #54235).
Rik <rik@octave.org>
parents:
25519
diff
changeset
|
453 AC_CHECK_LIB(m, sin) |
5f9fa229cc8a
configure.ac: Reorder tests so that FPICFLAG is correctly set on Solaris (bug #54235).
Rik <rik@octave.org>
parents:
25519
diff
changeset
|
454 |
5f9fa229cc8a
configure.ac: Reorder tests so that FPICFLAG is correctly set on Solaris (bug #54235).
Rik <rik@octave.org>
parents:
25519
diff
changeset
|
455 ### Determine the Fortran compiler and how to invoke it |
5f9fa229cc8a
configure.ac: Reorder tests so that FPICFLAG is correctly set on Solaris (bug #54235).
Rik <rik@octave.org>
parents:
25519
diff
changeset
|
456 |
5f9fa229cc8a
configure.ac: Reorder tests so that FPICFLAG is correctly set on Solaris (bug #54235).
Rik <rik@octave.org>
parents:
25519
diff
changeset
|
457 ## Prefer gfortran, but the user's F77 environment variable will override. |
5f9fa229cc8a
configure.ac: Reorder tests so that FPICFLAG is correctly set on Solaris (bug #54235).
Rik <rik@octave.org>
parents:
25519
diff
changeset
|
458 AC_PROG_F77([gfortran]) |
5f9fa229cc8a
configure.ac: Reorder tests so that FPICFLAG is correctly set on Solaris (bug #54235).
Rik <rik@octave.org>
parents:
25519
diff
changeset
|
459 if test -z "$F77"; then |
5f9fa229cc8a
configure.ac: Reorder tests so that FPICFLAG is correctly set on Solaris (bug #54235).
Rik <rik@octave.org>
parents:
25519
diff
changeset
|
460 ## No gfortran found, search for any other installed compiler. |
5f9fa229cc8a
configure.ac: Reorder tests so that FPICFLAG is correctly set on Solaris (bug #54235).
Rik <rik@octave.org>
parents:
25519
diff
changeset
|
461 AC_PROG_F77 |
5f9fa229cc8a
configure.ac: Reorder tests so that FPICFLAG is correctly set on Solaris (bug #54235).
Rik <rik@octave.org>
parents:
25519
diff
changeset
|
462 fi |
5f9fa229cc8a
configure.ac: Reorder tests so that FPICFLAG is correctly set on Solaris (bug #54235).
Rik <rik@octave.org>
parents:
25519
diff
changeset
|
463 if test "$F77" = g77; then |
5f9fa229cc8a
configure.ac: Reorder tests so that FPICFLAG is correctly set on Solaris (bug #54235).
Rik <rik@octave.org>
parents:
25519
diff
changeset
|
464 AC_MSG_ERROR([g77 is not a supported Fortran compiler. Select another compiler by setting the environment variable F77 and re-running configure.]) |
5f9fa229cc8a
configure.ac: Reorder tests so that FPICFLAG is correctly set on Solaris (bug #54235).
Rik <rik@octave.org>
parents:
25519
diff
changeset
|
465 fi |
5f9fa229cc8a
configure.ac: Reorder tests so that FPICFLAG is correctly set on Solaris (bug #54235).
Rik <rik@octave.org>
parents:
25519
diff
changeset
|
466 |
5f9fa229cc8a
configure.ac: Reorder tests so that FPICFLAG is correctly set on Solaris (bug #54235).
Rik <rik@octave.org>
parents:
25519
diff
changeset
|
467 AC_MSG_CHECKING([whether a usable Fortran compiler was found]) |
5f9fa229cc8a
configure.ac: Reorder tests so that FPICFLAG is correctly set on Solaris (bug #54235).
Rik <rik@octave.org>
parents:
25519
diff
changeset
|
468 if test -n "$F77"; then |
5f9fa229cc8a
configure.ac: Reorder tests so that FPICFLAG is correctly set on Solaris (bug #54235).
Rik <rik@octave.org>
parents:
25519
diff
changeset
|
469 AC_MSG_RESULT(yes) |
5f9fa229cc8a
configure.ac: Reorder tests so that FPICFLAG is correctly set on Solaris (bug #54235).
Rik <rik@octave.org>
parents:
25519
diff
changeset
|
470 else |
5f9fa229cc8a
configure.ac: Reorder tests so that FPICFLAG is correctly set on Solaris (bug #54235).
Rik <rik@octave.org>
parents:
25519
diff
changeset
|
471 AC_MSG_RESULT(no) |
25559
4fe32753cb56
move some fortran and dynamic linking configure checks to separate macros
John W. Eaton <jwe@octave.org>
parents:
25552
diff
changeset
|
472 AC_MSG_ERROR([a Fortran compiler is required to build Octave]) |
25552
5f9fa229cc8a
configure.ac: Reorder tests so that FPICFLAG is correctly set on Solaris (bug #54235).
Rik <rik@octave.org>
parents:
25519
diff
changeset
|
473 fi |
5f9fa229cc8a
configure.ac: Reorder tests so that FPICFLAG is correctly set on Solaris (bug #54235).
Rik <rik@octave.org>
parents:
25519
diff
changeset
|
474 |
5f9fa229cc8a
configure.ac: Reorder tests so that FPICFLAG is correctly set on Solaris (bug #54235).
Rik <rik@octave.org>
parents:
25519
diff
changeset
|
475 AC_F77_LIBRARY_LDFLAGS |
5f9fa229cc8a
configure.ac: Reorder tests so that FPICFLAG is correctly set on Solaris (bug #54235).
Rik <rik@octave.org>
parents:
25519
diff
changeset
|
476 AC_F77_DUMMY_MAIN |
5f9fa229cc8a
configure.ac: Reorder tests so that FPICFLAG is correctly set on Solaris (bug #54235).
Rik <rik@octave.org>
parents:
25519
diff
changeset
|
477 AC_F77_WRAPPERS |
5f9fa229cc8a
configure.ac: Reorder tests so that FPICFLAG is correctly set on Solaris (bug #54235).
Rik <rik@octave.org>
parents:
25519
diff
changeset
|
478 |
25559
4fe32753cb56
move some fortran and dynamic linking configure checks to separate macros
John W. Eaton <jwe@octave.org>
parents:
25552
diff
changeset
|
479 ### Must appear after checks for Fortran compiler. |
4fe32753cb56
move some fortran and dynamic linking configure checks to separate macros
John W. Eaton <jwe@octave.org>
parents:
25552
diff
changeset
|
480 OCTAVE_CHECK_FORTRAN_SYMBOL_AND_CALLING_CONVENTIONS |
4fe32753cb56
move some fortran and dynamic linking configure checks to separate macros
John W. Eaton <jwe@octave.org>
parents:
25552
diff
changeset
|
481 |
4fe32753cb56
move some fortran and dynamic linking configure checks to separate macros
John W. Eaton <jwe@octave.org>
parents:
25552
diff
changeset
|
482 ### Must appear after checks for compilers. |
4fe32753cb56
move some fortran and dynamic linking configure checks to separate macros
John W. Eaton <jwe@octave.org>
parents:
25552
diff
changeset
|
483 OCTAVE_DEFINE_MKOCTFILE_DYNAMIC_LINK_OPTIONS |
25552
5f9fa229cc8a
configure.ac: Reorder tests so that FPICFLAG is correctly set on Solaris (bug #54235).
Rik <rik@octave.org>
parents:
25519
diff
changeset
|
484 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
485 ### Use a 64-bit integer type for array dimensions and indexing, if possible. |
5275 | 486 |
22986
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
487 AC_CHECK_SIZEOF([void *]) |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
488 if test $ac_cv_sizeof_void_p -ge 8; then |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
489 ENABLE_64=yes |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
490 else |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
491 ENABLE_64=no |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
492 fi |
23563
614d71cdf614
maint: Strip trailing whitespace from files.
John W. Eaton <jwe@octave.org>
parents:
23505
diff
changeset
|
493 |
5275 | 494 AC_ARG_ENABLE(64, |
22986
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
495 [AS_HELP_STRING([--disable-64], |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
496 [don't use 64-bit integers for array dimensions and indexing])], |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
497 [case $enableval in |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
498 yes) ENABLE_64=yes ;; |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
499 no) ENABLE_64=no ;; |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
500 *) AC_MSG_ERROR([bad value $enableval for --enable-64]) ;; |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
501 esac]) |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
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 if test $ENABLE_64 = yes; then |
22995
5fdf29cb4ab8
set OCTAVE_IDX_TYPE correctly when using --disable-64 (bug #49985)
John W. Eaton <jwe@octave.org>
parents:
22992
diff
changeset
|
504 if test $ac_cv_sizeof_void_p -ge 8; then |
16313
6aafe87a3144
use int64_t for idx type if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16297
diff
changeset
|
505 OCTAVE_IDX_TYPE=int64_t |
5275 | 506 else |
22986
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
507 warn_64_bit="--enable-64 option given but pointers are less than 64-bits wide; disabling 64-bit indexing" |
14605
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
508 OCTAVE_CONFIGURE_WARNING([warn_64_bit]) |
22986
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
509 OCTAVE_IDX_TYPE=int32_t |
21131
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
510 ENABLE_64=no |
5275 | 511 fi |
22995
5fdf29cb4ab8
set OCTAVE_IDX_TYPE correctly when using --disable-64 (bug #49985)
John W. Eaton <jwe@octave.org>
parents:
22992
diff
changeset
|
512 else |
5fdf29cb4ab8
set OCTAVE_IDX_TYPE correctly when using --disable-64 (bug #49985)
John W. Eaton <jwe@octave.org>
parents:
22992
diff
changeset
|
513 OCTAVE_IDX_TYPE=int32_t |
5275 | 514 fi |
22986
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
515 |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
516 AC_SUBST(ENABLE_64) |
21131
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
517 if test $ENABLE_64 = yes; then |
23014
7a9313d27cea
define macros for size of idx_type and f77_int_type
John W. Eaton <jwe@octave.org>
parents:
23010
diff
changeset
|
518 octave_sizeof_octave_idx_type=8 |
21229
a83e7a384ee0
create and install a subset of config.h in octave-config.h
John W. Eaton <jwe@octave.org>
parents:
21211
diff
changeset
|
519 AC_DEFINE(OCTAVE_ENABLE_64, 1, |
23009
624f76f2ca51
configure.ac: Use a common style for messages.
Rik <rik@octave.org>
parents:
23007
diff
changeset
|
520 [Define to 1 to use 64-bit integers for array dimensions and indexing.]) |
23014
7a9313d27cea
define macros for size of idx_type and f77_int_type
John W. Eaton <jwe@octave.org>
parents:
23010
diff
changeset
|
521 else |
7a9313d27cea
define macros for size of idx_type and f77_int_type
John W. Eaton <jwe@octave.org>
parents:
23010
diff
changeset
|
522 octave_sizeof_octave_idx_type=4 |
5275 | 523 fi |
22986
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
524 |
23014
7a9313d27cea
define macros for size of idx_type and f77_int_type
John W. Eaton <jwe@octave.org>
parents:
23010
diff
changeset
|
525 AC_DEFINE_UNQUOTED(OCTAVE_SIZEOF_IDX_TYPE, [$octave_sizeof_octave_idx_type], |
7a9313d27cea
define macros for size of idx_type and f77_int_type
John W. Eaton <jwe@octave.org>
parents:
23010
diff
changeset
|
526 [Define to the size of the octave_idx_type (8 or 4).]) |
7a9313d27cea
define macros for size of idx_type and f77_int_type
John W. Eaton <jwe@octave.org>
parents:
23010
diff
changeset
|
527 |
5275 | 528 AC_SUBST(OCTAVE_IDX_TYPE) |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
529 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
|
530 [Define to the type of octave_idx_type (64 or 32 bit signed integer).]) |
5275 | 531 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
532 ### Enable bounds checking on element references within Octave's array and |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
533 ### matrix classes. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
534 dnl This slows down some operations a bit, so it is turned off by default. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
535 |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
536 ENABLE_BOUNDS_CHECK=no |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
537 AC_ARG_ENABLE([bounds-check], |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
538 [AS_HELP_STRING([--enable-bounds-check], |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
539 [OBSOLETE: use --enable-address-sanitizer-flags instead])], |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
540 [if test "$enableval" = yes; then ENABLE_BOUNDS_CHECK=yes; fi], []) |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
541 if test $ENABLE_BOUNDS_CHECK = yes; then |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
542 warn_bounds_check="--enable-bounds-check is obsolete; use --enable-address-sanitizer-flags instead" |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
543 OCTAVE_CONFIGURE_WARNING([warn_bounds_check]) |
23664
af611609c6a4
configure: ensure that the C++ compiler supports C++11
Mike Miller <mtmiller@octave.org>
parents:
23663
diff
changeset
|
544 fi |
af611609c6a4
configure: ensure that the C++ compiler supports C++11
Mike Miller <mtmiller@octave.org>
parents:
23663
diff
changeset
|
545 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
546 ### Use atomic operations for internal reference counting. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
547 ### This is required for thread-safe behavior (Qt Handles) but incurs a |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
548 ### significant slowdown. Enabled by default until a higher performing |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
549 ### solution can be found. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
550 |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
551 ENABLE_ATOMIC_REFCOUNT=yes |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
552 AC_ARG_ENABLE([atomic-refcount], |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
553 [AS_HELP_STRING([--disable-atomic-refcount], |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
554 [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.])], |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
555 [if test "$enableval" = no; then ENABLE_ATOMIC_REFCOUNT=no; fi], []) |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
556 if test $ENABLE_ATOMIC_REFCOUNT = yes; then |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
557 AC_DEFINE(OCTAVE_ENABLE_ATOMIC_REFCOUNT, 1, |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
558 [Define to 1 to use atomic operations for reference counting.]) |
1894 | 559 fi |
3775 | 560 |
22398
1442ae783e1f
check for pthread and openmp libs before shared lib support (bug #48786)
John W. Eaton <jwe@octave.org>
parents:
22345
diff
changeset
|
561 ### Check for pthread library |
1442ae783e1f
check for pthread and openmp libs before shared lib support (bug #48786)
John W. Eaton <jwe@octave.org>
parents:
22345
diff
changeset
|
562 |
1442ae783e1f
check for pthread and openmp libs before shared lib support (bug #48786)
John W. Eaton <jwe@octave.org>
parents:
22345
diff
changeset
|
563 AX_PTHREAD |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
564 dnl Include pthread libs and flags early in case other config tests need them. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
565 dnl They seem to be required for the OpenGL tests on Debian systems. |
22398
1442ae783e1f
check for pthread and openmp libs before shared lib support (bug #48786)
John W. Eaton <jwe@octave.org>
parents:
22345
diff
changeset
|
566 LIBS="$PTHREAD_LIBS $LIBS" |
1442ae783e1f
check for pthread and openmp libs before shared lib support (bug #48786)
John W. Eaton <jwe@octave.org>
parents:
22345
diff
changeset
|
567 XTRA_CFLAGS="$XTRA_CFLAGS $PTHREAD_CFLAGS" |
1442ae783e1f
check for pthread and openmp libs before shared lib support (bug #48786)
John W. Eaton <jwe@octave.org>
parents:
22345
diff
changeset
|
568 XTRA_CXXFLAGS="$XTRA_CXXFLAGS $PTHREAD_CFLAGS" |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
569 dnl Set these for any other tests that may require them. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
570 dnl They will be reset before output files are generated. |
22398
1442ae783e1f
check for pthread and openmp libs before shared lib support (bug #48786)
John W. Eaton <jwe@octave.org>
parents:
22345
diff
changeset
|
571 CFLAGS="$CFLAGS $PTHREAD_CFLAGS" |
1442ae783e1f
check for pthread and openmp libs before shared lib support (bug #48786)
John W. Eaton <jwe@octave.org>
parents:
22345
diff
changeset
|
572 CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS" |
1442ae783e1f
check for pthread and openmp libs before shared lib support (bug #48786)
John W. Eaton <jwe@octave.org>
parents:
22345
diff
changeset
|
573 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
574 ### Test whether the compiler supports OpenMP. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
575 dnl This is enabled by default to allow the option of using OpenMP in |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
576 dnl loadable modules. |
22398
1442ae783e1f
check for pthread and openmp libs before shared lib support (bug #48786)
John W. Eaton <jwe@octave.org>
parents:
22345
diff
changeset
|
577 |
1442ae783e1f
check for pthread and openmp libs before shared lib support (bug #48786)
John W. Eaton <jwe@octave.org>
parents:
22345
diff
changeset
|
578 ENABLE_OPENMP=no |
1442ae783e1f
check for pthread and openmp libs before shared lib support (bug #48786)
John W. Eaton <jwe@octave.org>
parents:
22345
diff
changeset
|
579 check_for_openmp=yes |
1442ae783e1f
check for pthread and openmp libs before shared lib support (bug #48786)
John W. Eaton <jwe@octave.org>
parents:
22345
diff
changeset
|
580 AC_ARG_ENABLE([openmp], |
1442ae783e1f
check for pthread and openmp libs before shared lib support (bug #48786)
John W. Eaton <jwe@octave.org>
parents:
22345
diff
changeset
|
581 [AS_HELP_STRING([--disable-openmp], |
1442ae783e1f
check for pthread and openmp libs before shared lib support (bug #48786)
John W. Eaton <jwe@octave.org>
parents:
22345
diff
changeset
|
582 [disable OpenMP SMP multi-threading])], |
1442ae783e1f
check for pthread and openmp libs before shared lib support (bug #48786)
John W. Eaton <jwe@octave.org>
parents:
22345
diff
changeset
|
583 [if test "$enableval" = no; then check_for_openmp=no; fi], []) |
1442ae783e1f
check for pthread and openmp libs before shared lib support (bug #48786)
John W. Eaton <jwe@octave.org>
parents:
22345
diff
changeset
|
584 if test $check_for_openmp = yes; then |
1442ae783e1f
check for pthread and openmp libs before shared lib support (bug #48786)
John W. Eaton <jwe@octave.org>
parents:
22345
diff
changeset
|
585 AC_LANG_PUSH(C) |
1442ae783e1f
check for pthread and openmp libs before shared lib support (bug #48786)
John W. Eaton <jwe@octave.org>
parents:
22345
diff
changeset
|
586 AX_OPENMP([XTRA_CFLAGS="$XTRA_CFLAGS $OPENMP_CFLAGS"; ENABLE_OPENMP=yes], []) |
1442ae783e1f
check for pthread and openmp libs before shared lib support (bug #48786)
John W. Eaton <jwe@octave.org>
parents:
22345
diff
changeset
|
587 AC_LANG_POP(C) |
1442ae783e1f
check for pthread and openmp libs before shared lib support (bug #48786)
John W. Eaton <jwe@octave.org>
parents:
22345
diff
changeset
|
588 AC_LANG_PUSH(C++) |
1442ae783e1f
check for pthread and openmp libs before shared lib support (bug #48786)
John W. Eaton <jwe@octave.org>
parents:
22345
diff
changeset
|
589 AX_OPENMP([XTRA_CXXFLAGS="$XTRA_CXXFLAGS $OPENMP_CXXFLAGS"; ENABLE_OPENMP=yes], []) |
1442ae783e1f
check for pthread and openmp libs before shared lib support (bug #48786)
John W. Eaton <jwe@octave.org>
parents:
22345
diff
changeset
|
590 AC_LANG_POP(C++) |
1442ae783e1f
check for pthread and openmp libs before shared lib support (bug #48786)
John W. Eaton <jwe@octave.org>
parents:
22345
diff
changeset
|
591 fi |
1442ae783e1f
check for pthread and openmp libs before shared lib support (bug #48786)
John W. Eaton <jwe@octave.org>
parents:
22345
diff
changeset
|
592 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
593 dnl Set these for any other tests that may require them. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
594 dnl They will be reset before output files are generated. |
22398
1442ae783e1f
check for pthread and openmp libs before shared lib support (bug #48786)
John W. Eaton <jwe@octave.org>
parents:
22345
diff
changeset
|
595 CFLAGS="$CFLAGS $OPENMP_CFLAGS" |
1442ae783e1f
check for pthread and openmp libs before shared lib support (bug #48786)
John W. Eaton <jwe@octave.org>
parents:
22345
diff
changeset
|
596 CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS" |
1442ae783e1f
check for pthread and openmp libs before shared lib support (bug #48786)
John W. Eaton <jwe@octave.org>
parents:
22345
diff
changeset
|
597 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
598 dnl Define here since it is skipped if the first argument to AX_OPENMP |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
599 dnl is not empty. |
22398
1442ae783e1f
check for pthread and openmp libs before shared lib support (bug #48786)
John W. Eaton <jwe@octave.org>
parents:
22345
diff
changeset
|
600 if test $ENABLE_OPENMP = yes; then |
1442ae783e1f
check for pthread and openmp libs before shared lib support (bug #48786)
John W. Eaton <jwe@octave.org>
parents:
22345
diff
changeset
|
601 AC_CHECK_HEADERS([omp.h]) |
1442ae783e1f
check for pthread and openmp libs before shared lib support (bug #48786)
John W. Eaton <jwe@octave.org>
parents:
22345
diff
changeset
|
602 AC_CHECK_FUNCS([omp_get_num_threads]) |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
603 AC_DEFINE(OCTAVE_ENABLE_OPENMP, 1, [Define to 1 if OpenMP is enabled]) |
22398
1442ae783e1f
check for pthread and openmp libs before shared lib support (bug #48786)
John W. Eaton <jwe@octave.org>
parents:
22345
diff
changeset
|
604 fi |
1442ae783e1f
check for pthread and openmp libs before shared lib support (bug #48786)
John W. Eaton <jwe@octave.org>
parents:
22345
diff
changeset
|
605 |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
606 ### Start determination of shared vs. static libraries |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
607 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
608 ## Use -static if compiling on Alpha OSF/1 1.3 systems. |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
609 case $canonical_host_type in |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
610 alpha*-dec-osf1.3) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
611 LD_STATIC_FLAG=-static |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
612 ;; |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
613 esac |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
614 if test -n "$LD_STATIC_FLAG"; then |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
615 AC_MSG_NOTICE([defining LD_STATIC_FLAG to be $LD_STATIC_FLAG]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
616 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
617 AC_SUBST(LD_STATIC_FLAG) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
618 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
619 ## Check for programs necessary for shared libraries (ar, libtool) |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
620 OCTAVE_PROG_AR |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
621 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
622 ifdef([LT_INIT], [], [ |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
623 errprint([error: you must have libtool 2.2.2 or a more recent version |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
624 ]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
625 m4exit([1])]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
626 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
627 LT_PREREQ([2.2.2]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
628 LT_INIT([disable-static dlopen win32-dll]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
629 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
630 if test $enable_shared = yes; then |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
631 SHARED_LIBS=yes |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
632 else |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
633 SHARED_LIBS=no |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
634 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
635 AC_SUBST(SHARED_LIBS) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
636 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
637 if test $enable_static = yes; then |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
638 STATIC_LIBS=yes |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
639 else |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
640 STATIC_LIBS=no |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
641 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
642 AC_SUBST(STATIC_LIBS) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
643 |
23434
f4d4d83f15c5
maint: rename cruft/ directory to external/
Rik <rik@octave.org>
parents:
23426
diff
changeset
|
644 XTRA_EXTERNAL_SH_LDFLAGS= |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
645 if test $have_msvc = yes; then |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
646 FLIBS="$FLIBS -lkernel32" |
23434
f4d4d83f15c5
maint: rename cruft/ directory to external/
Rik <rik@octave.org>
parents:
23426
diff
changeset
|
647 XTRA_EXTERNAL_SH_LDFLAGS="-Wl,external/external.def" |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
648 fi |
23434
f4d4d83f15c5
maint: rename cruft/ directory to external/
Rik <rik@octave.org>
parents:
23426
diff
changeset
|
649 AC_SUBST(XTRA_EXTERNAL_SH_LDFLAGS) |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
650 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
651 if test $STATIC_LIBS = no && test $SHARED_LIBS = no; then |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
652 AC_MSG_ERROR([You can't disable building both static AND shared libraries!]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
653 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
654 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
655 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
656 ### More configure argument checking related to linking |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
657 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
658 AC_ARG_ENABLE([no-undefined], |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
659 [AS_HELP_STRING([--disable-no-undefined], |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
660 [don't pass -no-undefined to libtool when linking Octave and its shared libraries])], |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
661 [case $enableval in |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
662 yes) NO_UNDEFINED_LDFLAG="-no-undefined" ;; |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
663 no) NO_UNDEFINED_LDFLAG="" ;; |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
664 *) AC_MSG_ERROR([bad value $enableval for --disable-no-undefined]) ;; |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
665 esac], |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
666 [NO_UNDEFINED_LDFLAG="-no-undefined"]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
667 AC_SUBST(NO_UNDEFINED_LDFLAG) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
668 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
669 AC_ARG_ENABLE([link-all-dependencies], |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
670 [AS_HELP_STRING([--enable-link-all-dependencies], |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
671 [link Octave and its shared libraries with all dependencies, not just those immediately referenced (should not be needed on most systems)])], |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
672 [case $enableval in |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
673 yes) link_all_deps=yes ;; |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
674 no) link_all_deps=no ;; |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
675 *) AC_MSG_ERROR([bad value $enableval for --enable-link-all-depenencies]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
676 ;; |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
677 esac], |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
678 [link_all_deps=no]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
679 AM_CONDITIONAL([AMCOND_LINK_ALL_DEPS], [test $link_all_deps = yes]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
680 |
22986
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
681 ### Check for BLAS and LAPACK libraries: |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
682 |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
683 ## Need to adjust FFLAGS to include correct integer size. |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
684 save_FFLAGS="$FFLAGS" |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
685 FFLAGS="$FFLAGS $F77_INTEGER_8_FLAG" |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
686 |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
687 OCTAVE_BLAS_WITH_F77_FUNC([:], [:], |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
688 [ax_blas_ok=yes |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
689 AC_MSG_CHECKING([BLAS can be called from Fortran]) |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
690 AC_MSG_RESULT([yes assumed for cross compilation])]) |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
691 AX_LAPACK([:], [:]) |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
692 |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
693 ## Restore FFLAGS. |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
694 FFLAGS="$save_FFLAGS" |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
695 |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
696 ## If necessary, try again with -ff2c in FFLAGS |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
697 if test $ax_blas_ok = no; then |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
698 save_FFLAGS="$FFLAGS" |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
699 FFLAGS="-ff2c $FFLAGS $F77_INTEGER_8_FLAG" |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
700 |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
701 OCTAVE_BLAS_WITH_F77_FUNC([:], [:]) |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
702 AX_LAPACK([:], [:]) |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
703 |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
704 ## Restore FFLAGS, with -ff2c if that was helpful |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
705 if test $ax_blas_ok = yes; then |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
706 FFLAGS="-ff2c $save_FFLAGS" |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
707 else |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
708 FFLAGS="$save_FFLAGS" |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
709 fi |
22345
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
710 fi |
22986
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
711 |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
712 ## On OSX, try again with a wrapper library (without -ff2c!) |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
713 if test $ax_blas_ok = no; then |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
714 case $host_os in |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
715 darwin*) |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
716 ## test if wrapper functions help |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
717 octave_blaswrap_save_CFLAGS="$CFLAGS" |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
718 CFLAGS="$CFLAGS -DUSE_BLASWRAP" |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
719 AC_LANG_PUSH(C) |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
720 AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ |
23426
58d56f52d50a
move contents of liboctave/cruft/misc to liboctave/util
John W. Eaton <jwe@octave.org>
parents:
23389
diff
changeset
|
721 #include "liboctave/util/blaswrap.c" |
22986
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
722 ]])], |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
723 [mv conftest.$ac_objext blaswrap.$ac_objext |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
724 octave_blaswrap_save_BLAS_LIBS="$BLAS_LIBS" |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
725 BLAS_LIBS="blaswrap.$ac_objext -framework vecLib" |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
726 |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
727 save_FFLAGS="$FFLAGS" |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
728 FFLAGS="$FFLAGS $F77_INTEGER_8_FLAG" |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
729 |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
730 OCTAVE_BLAS_WITH_F77_FUNC([:], [:]) |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
731 AX_LAPACK([:], [:]) |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
732 |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
733 ## Restore FFLAGS. |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
734 FFLAGS="$save_FFLAGS" |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
735 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
736 dnl remove temp file |
22986
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
737 rm -f blaswrap.$ac_objext], |
23426
58d56f52d50a
move contents of liboctave/cruft/misc to liboctave/util
John W. Eaton <jwe@octave.org>
parents:
23389
diff
changeset
|
738 [AC_MSG_FAILURE([cannot compile liboctave/util/blaswrap.c])]) |
22986
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
739 AC_LANG_POP(C) |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
740 CFLAGS="$octave_blaswrap_save_CFLAGS" |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
741 |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
742 if test $ax_blas_ok = no; then |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
743 BLAS_LIBS="$octave_blaswrap_save_BLAS_LIBS" |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
744 else |
23426
58d56f52d50a
move contents of liboctave/cruft/misc to liboctave/util
John W. Eaton <jwe@octave.org>
parents:
23389
diff
changeset
|
745 ## wrapper in liboctave/util, remove from BLAS_LIBS |
22986
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
746 BLAS_LIBS=`echo $BLAS_LIBS | $SED -e 's/blaswrap.[[^ ]]* //g'` |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
747 AC_DEFINE(USE_BLASWRAP, 1, |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
748 [Define to 1 if BLAS functions need to be wrapped (potentially needed for 64-bit OSX only).]) |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
749 fi |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
750 ;; |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
751 esac |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
752 fi |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
753 |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
754 if test $ax_blas_ok = no || test $ax_lapack_ok = no; then |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
755 AC_MSG_ERROR([BLAS and LAPACK libraries are required]) |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
756 fi |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
757 |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
758 case $ax_blas_integer_size in |
22992
7d5c56e38801
report BLAS integer size in less alarming way
John W. Eaton <jwe@octave.org>
parents:
22986
diff
changeset
|
759 4) |
7d5c56e38801
report BLAS integer size in less alarming way
John W. Eaton <jwe@octave.org>
parents:
22986
diff
changeset
|
760 HAVE_64_BIT_BLAS=no |
7d5c56e38801
report BLAS integer size in less alarming way
John W. Eaton <jwe@octave.org>
parents:
22986
diff
changeset
|
761 ;; |
7d5c56e38801
report BLAS integer size in less alarming way
John W. Eaton <jwe@octave.org>
parents:
22986
diff
changeset
|
762 8) |
7d5c56e38801
report BLAS integer size in less alarming way
John W. Eaton <jwe@octave.org>
parents:
22986
diff
changeset
|
763 HAVE_64_BIT_BLAS=yes |
22986
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
764 ;; |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
765 *) |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
766 AC_MSG_ERROR([unrecognized BLAS library integer size]) |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
767 ;; |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
768 esac |
22345
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
769 |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
770 OCTAVE_CHECK_SIZEOF_FORTRAN_INTEGER |
22986
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
771 if test $octave_cv_sizeof_fortran_integer -ne $ax_blas_integer_size; then |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
772 if test $ax_blas_integer_size -eq 8; then |
22345
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
773 case $F77 in |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
774 *gfortran*) |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
775 case $F77_INTEGER_8_FLAG in |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
776 *-fdefault-integer-8*) |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
777 ;; |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
778 *) |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
779 case $FFLAGS in |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
780 *-fdefault-integer-8*) |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
781 AC_MSG_NOTICE([setting -fdefault-integer-8 in F77_INTEGER_8_FLAG instead of FFLAGS]) |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
782 FFLAGS=`echo $FFLAGS | $SED 's/-fdefault-integer-8//g'` |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
783 F77_INTEGER_8_FLAG="-fdefault-integer-8" |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
784 ;; |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
785 *) |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
786 AC_MSG_NOTICE([adding -fdefault-integer-8 to F77_INTEGER_8_FLAG]) |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
787 F77_INTEGER_8_FLAG="-fdefault-integer-8" |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
788 ## Invalidate the cache and try again. |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
789 $as_unset octave_cv_sizeof_fortran_integer |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
790 ;; |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
791 esac |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
792 ;; |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
793 esac |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
794 ;; |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
795 esac |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
796 if test -z "$octave_cv_sizeof_fortran_integer"; then |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
797 OCTAVE_CHECK_SIZEOF_FORTRAN_INTEGER |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
798 fi |
22986
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
799 fi |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
800 ## We intentionally don't attempt to fix things up if the default |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
801 ## Fortran integer size is 8 but BLAS appears to use 4-byte integers. |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
802 if test $octave_cv_sizeof_fortran_integer -ne $ax_blas_integer_size; then |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
803 AC_MSG_ERROR([your Fortran compiler must have an option for setting the default integer size to be the same size as your BLAS library uses ($ax_blas_integer_size bytes). See the file INSTALL for more information.]) |
22345
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
804 fi |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
805 fi |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
806 AC_SUBST(F77_INTEGER_8_FLAG) |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
807 |
22986
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
808 case $octave_cv_sizeof_fortran_integer in |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
809 8) |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
810 OCTAVE_F77_INT_TYPE=int64_t |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
811 ;; |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
812 4) |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
813 OCTAVE_F77_INT_TYPE=int32_t |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
814 ;; |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
815 esac |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
816 AC_SUBST(OCTAVE_F77_INT_TYPE) |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
817 AC_DEFINE_UNQUOTED(OCTAVE_F77_INT_TYPE, [$OCTAVE_F77_INT_TYPE], |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
818 [Define to the type of octave_f77_int_type (64 or 32 bit signed integer).]) |
23014
7a9313d27cea
define macros for size of idx_type and f77_int_type
John W. Eaton <jwe@octave.org>
parents:
23010
diff
changeset
|
819 AC_DEFINE_UNQUOTED(OCTAVE_SIZEOF_F77_INT_TYPE, |
7a9313d27cea
define macros for size of idx_type and f77_int_type
John W. Eaton <jwe@octave.org>
parents:
23010
diff
changeset
|
820 [$octave_cv_sizeof_fortran_integer], |
7a9313d27cea
define macros for size of idx_type and f77_int_type
John W. Eaton <jwe@octave.org>
parents:
23010
diff
changeset
|
821 [Define to the size of the octave_f77_int_type (8 or 4).]) |
22986
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
822 |
22345
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
823 OCTAVE_F77_FLAG([-ffloat-store], [ |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
824 AC_MSG_RESULT([setting F77_FLOAT_STORE_FLAG to -ffloat-store]) |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
825 F77_FLOAT_STORE_FLAG=-ffloat-store |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
826 AC_SUBST(F77_FLOAT_STORE_FLAG) |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
827 ]) |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
828 |
25781
4e658452f6c7
add -std=legacy to FFLAGS if GNU compiler accepts it (bug #54390)
John W. Eaton <jwe@octave.org>
parents:
25775
diff
changeset
|
829 if test $ac_cv_f77_compiler_gnu = yes; then |
4e658452f6c7
add -std=legacy to FFLAGS if GNU compiler accepts it (bug #54390)
John W. Eaton <jwe@octave.org>
parents:
25775
diff
changeset
|
830 OCTAVE_F77_FLAG([-std=legacy]) |
4e658452f6c7
add -std=legacy to FFLAGS if GNU compiler accepts it (bug #54390)
John W. Eaton <jwe@octave.org>
parents:
25775
diff
changeset
|
831 fi |
4e658452f6c7
add -std=legacy to FFLAGS if GNU compiler accepts it (bug #54390)
John W. Eaton <jwe@octave.org>
parents:
25775
diff
changeset
|
832 |
25487
fbc270aeb55d
* interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions.
John W. Eaton <jwe@octave.org>
parents:
25331
diff
changeset
|
833 BUILD_EXTERNAL_LIBXERBLA= |
fbc270aeb55d
* interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions.
John W. Eaton <jwe@octave.org>
parents:
25331
diff
changeset
|
834 case $host_os in |
fbc270aeb55d
* interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions.
John W. Eaton <jwe@octave.org>
parents:
25331
diff
changeset
|
835 msdosmsvc | mingw*) |
fbc270aeb55d
* interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions.
John W. Eaton <jwe@octave.org>
parents:
25331
diff
changeset
|
836 BUILD_EXTERNAL_LIBXERBLA=ues |
fbc270aeb55d
* interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions.
John W. Eaton <jwe@octave.org>
parents:
25331
diff
changeset
|
837 ;; |
fbc270aeb55d
* interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions.
John W. Eaton <jwe@octave.org>
parents:
25331
diff
changeset
|
838 esac |
fbc270aeb55d
* interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions.
John W. Eaton <jwe@octave.org>
parents:
25331
diff
changeset
|
839 |
fbc270aeb55d
* interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions.
John W. Eaton <jwe@octave.org>
parents:
25331
diff
changeset
|
840 AM_CONDITIONAL([AMCOND_BUILD_EXTERNAL_LIBXERBLA], |
fbc270aeb55d
* interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions.
John W. Eaton <jwe@octave.org>
parents:
25331
diff
changeset
|
841 [test -n "$BUILD_EXTERNAL_LIBXERBLA"]) |
fbc270aeb55d
* interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions.
John W. Eaton <jwe@octave.org>
parents:
25331
diff
changeset
|
842 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
843 ### Dynamic linking is now enabled only if we are building shared |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
844 ### libs and some API for dynamic linking has been detected. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
845 |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
846 dnl FIXME: A lot of the following duplicates the functionality of |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
847 dnl code generated by the dlopen option for LT_INIT. |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
848 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
849 LD_CXX="${CXX}" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
850 RDYNAMIC_FLAG= |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
851 DL_API_MSG="" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
852 dlopen_api=no |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
853 loadlibrary_api=no |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
854 |
25885
22ee68edcf3a
require dynamic loading capabilities to build Octave
John W. Eaton <jwe@octave.org>
parents:
25847
diff
changeset
|
855 case $lt_cv_dlopen in |
22ee68edcf3a
require dynamic loading capabilities to build Octave
John W. Eaton <jwe@octave.org>
parents:
25847
diff
changeset
|
856 dlopen) |
22ee68edcf3a
require dynamic loading capabilities to build Octave
John W. Eaton <jwe@octave.org>
parents:
25847
diff
changeset
|
857 dlopen_api=yes |
22ee68edcf3a
require dynamic loading capabilities to build Octave
John W. Eaton <jwe@octave.org>
parents:
25847
diff
changeset
|
858 DL_API_MSG="dlopen" |
22ee68edcf3a
require dynamic loading capabilities to build Octave
John W. Eaton <jwe@octave.org>
parents:
25847
diff
changeset
|
859 AC_DEFINE(HAVE_DLOPEN_API, 1, |
22ee68edcf3a
require dynamic loading capabilities to build Octave
John W. Eaton <jwe@octave.org>
parents:
25847
diff
changeset
|
860 [Define to 1 if system has dlopen, dlsym, dlerror, and dlclose for dynamic linking.]) |
22ee68edcf3a
require dynamic loading capabilities to build Octave
John W. Eaton <jwe@octave.org>
parents:
25847
diff
changeset
|
861 OCTAVE_CXX_FLAG([-rdynamic], [RDYNAMIC_FLAG=-rdynamic]) |
22ee68edcf3a
require dynamic loading capabilities to build Octave
John W. Eaton <jwe@octave.org>
parents:
25847
diff
changeset
|
862 ;; |
22ee68edcf3a
require dynamic loading capabilities to build Octave
John W. Eaton <jwe@octave.org>
parents:
25847
diff
changeset
|
863 LoadLibrary) |
22ee68edcf3a
require dynamic loading capabilities to build Octave
John W. Eaton <jwe@octave.org>
parents:
25847
diff
changeset
|
864 loadlibrary_api=yes |
22ee68edcf3a
require dynamic loading capabilities to build Octave
John W. Eaton <jwe@octave.org>
parents:
25847
diff
changeset
|
865 DL_API_MSG="LoadLibrary" |
22ee68edcf3a
require dynamic loading capabilities to build Octave
John W. Eaton <jwe@octave.org>
parents:
25847
diff
changeset
|
866 AC_DEFINE(HAVE_LOADLIBRARY_API, 1, |
22ee68edcf3a
require dynamic loading capabilities to build Octave
John W. Eaton <jwe@octave.org>
parents:
25847
diff
changeset
|
867 [Define to 1 if system has LoadLibrary for dynamic linking.]) |
22ee68edcf3a
require dynamic loading capabilities to build Octave
John W. Eaton <jwe@octave.org>
parents:
25847
diff
changeset
|
868 ;; |
22ee68edcf3a
require dynamic loading capabilities to build Octave
John W. Eaton <jwe@octave.org>
parents:
25847
diff
changeset
|
869 *) |
22ee68edcf3a
require dynamic loading capabilities to build Octave
John W. Eaton <jwe@octave.org>
parents:
25847
diff
changeset
|
870 AC_MSG_ERROR([Octave requires some way to perform dynamic linking.]) |
22ee68edcf3a
require dynamic loading capabilities to build Octave
John W. Eaton <jwe@octave.org>
parents:
25847
diff
changeset
|
871 ;; |
22ee68edcf3a
require dynamic loading capabilities to build Octave
John W. Eaton <jwe@octave.org>
parents:
25847
diff
changeset
|
872 esac |
22ee68edcf3a
require dynamic loading capabilities to build Octave
John W. Eaton <jwe@octave.org>
parents:
25847
diff
changeset
|
873 |
22ee68edcf3a
require dynamic loading capabilities to build Octave
John W. Eaton <jwe@octave.org>
parents:
25847
diff
changeset
|
874 DL_LIBS="$lt_cv_dlopen_libs" |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
875 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
876 if test $SHARED_LIBS = yes; then |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
877 LIBOCTINTERP="-loctinterp" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
878 LIBOCTAVE="-loctave" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
879 else |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
880 LIBOCTINTERP="${top_builddir}/libinterp/liboctinterp.a" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
881 LIBOCTAVE="${top_builddir}/liboctave/liboctave.a" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
882 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
883 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
884 AC_SUBST(LD_CXX) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
885 AC_SUBST(RDYNAMIC_FLAG) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
886 AC_SUBST(LIBOCTINTERP) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
887 AC_SUBST(LIBOCTAVE) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
888 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
889 if test "$cross_compiling" = yes && test -n "$ac_tool_prefix"; then |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
890 CROSS_TOOL_PREFIX="$ac_tool_prefix" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
891 MKOCTFILE_AR=`echo "$AR" | $SED "s,$CROSS_TOOL_PREFIX,,"` |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
892 MKOCTFILE_CC=`echo "$CC" | $SED "s,$CROSS_TOOL_PREFIX,,"` |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
893 MKOCTFILE_CXX=`echo "$CXX" | $SED "s,$CROSS_TOOL_PREFIX,,"` |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
894 MKOCTFILE_DL_LD=`echo "$DL_LD" | $SED "s,$CROSS_TOOL_PREFIX,,"` |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
895 MKOCTFILE_F77=`echo "$F77" | $SED "s,$CROSS_TOOL_PREFIX,,"` |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
896 MKOCTFILE_LD_CXX=`echo "$LD_CXX" | $SED "s,$CROSS_TOOL_PREFIX,,"` |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
897 MKOCTFILE_RANLIB=`echo "$RANLIB" | $SED "s,$CROSS_TOOL_PREFIX,,"` |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
898 else |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
899 MKOCTFILE_AR="$AR" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
900 MKOCTFILE_CC="$CC" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
901 MKOCTFILE_CXX="$CXX" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
902 MKOCTFILE_DL_LD="$DL_LD" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
903 MKOCTFILE_F77="$F77" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
904 MKOCTFILE_LD_CXX="$LD_CXX" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
905 MKOCTFILE_RANLIB="$RANLIB" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
906 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
907 AC_MSG_NOTICE([defining CROSS_TOOL_PREFIX to be $CROSS_TOOL_PREFIX]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
908 AC_MSG_NOTICE([defining MKOCTFILE_AR to be $MKOCTFILE_AR]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
909 AC_MSG_NOTICE([defining MKOCTFILE_CC to be $MKOCTFILE_CC]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
910 AC_MSG_NOTICE([defining MKOCTFILE_CXX to be $MKOCTFILE_CXX]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
911 AC_MSG_NOTICE([defining MKOCTFILE_DL_LD to be $MKOCTFILE_DL_LD]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
912 AC_MSG_NOTICE([defining MKOCTFILE_F77 to be $MKOCTFILE_F77]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
913 AC_MSG_NOTICE([defining MKOCTFILE_LD_CXX to be $MKOCTFILE_LD_CXX]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
914 AC_MSG_NOTICE([defining MKOCTFILE_RANLIB to be $MKOCTFILE_RANLIB]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
915 AC_SUBST(CROSS_TOOL_PREFIX) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
916 AC_SUBST(MKOCTFILE_AR) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
917 AC_SUBST(MKOCTFILE_CC) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
918 AC_SUBST(MKOCTFILE_CXX) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
919 AC_SUBST(MKOCTFILE_DL_LD) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
920 AC_SUBST(MKOCTFILE_F77) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
921 AC_SUBST(MKOCTFILE_LD_CXX) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
922 AC_SUBST(MKOCTFILE_RANLIB) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
923 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
924 ### Enable float truncation to work around issues with x87 co-processors |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
925 |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
926 dnl When compiling math for x87, problems may arise in some code comparing |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
927 dnl floating-point intermediate results. The root cause is the extra precision |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
928 dnl (~80 bits) of x87 co-processor registers versus the IEEE standard 64 bits. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
929 dnl Generally, storing the result in a local volatile variable forces a |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
930 dnl truncation back to 64 bits, but it also degrades performance. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
931 dnl However, this performance degradation is very minimal, if indeed measurable. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
932 dnl Therefore, it has been enabled for all platforms and compilers. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
933 dnl Reported bugs indicate that --enable-float-truncate is required for MinGW |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
934 dnl and Cygwin platforms and for GCC compilers >= 5.0. It should not be |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
935 dnl 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
|
936 ENABLE_FLOAT_TRUNCATE=yes |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
937 AC_ARG_ENABLE([float-truncate], |
19965
d20dd211cc89
Enable float truncation by default for octave builds.
Rik <rik@octave.org>
parents:
19964
diff
changeset
|
938 [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
|
939 [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
|
940 [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
|
941 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
|
942 AC_DEFINE(OCTAVE_ENABLE_FLOAT_TRUNCATE, 1, |
23009
624f76f2ca51
configure.ac: Use a common style for messages.
Rik <rik@octave.org>
parents:
23007
diff
changeset
|
943 [Define to 1 to 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
|
944 fi |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
945 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
946 ### Determine extra CFLAGS, CXXFLAGS that may be necessary for Octave. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
947 |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
948 ## On Intel systems with gcc, we need to compile with -mieee-fp to get full |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
949 ## support for IEEE floating point. |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
950 ## |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
951 ## On Alpha/OSF systems, we require -mieee or -ieee for full support. |
869 | 952 |
3126 | 953 ieee_fp_flag= |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
954 case $canonical_host_type in |
3887 | 955 i[[3456789]]86-*-*) |
5076 | 956 if test "$GCC" = yes; then |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
957 OCTAVE_CC_FLAG([-mieee-fp], [ |
5076 | 958 ieee_fp_flag=-mieee-fp |
959 XTRA_CFLAGS="$XTRA_CFLAGS -mieee-fp" | |
5844 | 960 AC_MSG_NOTICE([adding -mieee-fp to XTRA_CFLAGS])]) |
5076 | 961 fi |
962 if test "$GXX" = yes; then | |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
963 OCTAVE_CXX_FLAG([-mieee-fp], [ |
12451 | 964 ieee_fp_flag=-mieee-fp |
965 XTRA_CXXFLAGS="$XTRA_CXXFLAGS -mieee-fp" | |
966 AC_MSG_NOTICE([adding -mieee-fp to XTRA_CXXFLAGS])]) | |
5076 | 967 fi |
324 | 968 ;; |
3127 | 969 alpha*-*-*) |
4284 | 970 if test "$GCC" = yes; then |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
971 OCTAVE_CC_FLAG([-mieee], [ |
12451 | 972 ieee_fp_flag=-mieee |
973 XTRA_CFLAGS="$XTRA_CFLAGS -mieee" | |
974 AC_MSG_NOTICE([adding -mieee to XTRA_CFLAGS])]) | |
5076 | 975 else |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
976 OCTAVE_CC_FLAG([-ieee], [ |
12451 | 977 ieee_fp_flag=-ieee |
978 XTRA_CFLAGS="$XTRA_CFLAGS -ieee" | |
979 AC_MSG_NOTICE([adding -ieee to XTRA_CFLAGS])]) | |
5076 | 980 fi |
981 if test "$GXX" = yes; then | |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
982 OCTAVE_CXX_FLAG([-mieee], [ |
12451 | 983 ieee_fp_flag=-mieee |
984 XTRA_CXXFLAGS="$XTRA_CXXFLAGS -mieee" | |
985 AC_MSG_NOTICE([adding -mieee to XTRA_CXXFLAGS])]) | |
4284 | 986 else |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
987 OCTAVE_CXX_FLAG([-ieee], [ |
12451 | 988 ieee_fp_flag=-ieee |
989 XTRA_CXXFLAGS="$XTRA_CXXFLAGS -ieee" | |
990 AC_MSG_NOTICE([adding -ieee to XTRA_CXXFLAGS])]) | |
4284 | 991 fi |
2020 | 992 ;; |
3176 | 993 *ibm-aix4*) |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
994 OCTAVE_CC_FLAG([-mminimal-toc], [ |
3351 | 995 XTRA_CFLAGS="$XTRA_CFLAGS -mminimal-toc"]) |
3176 | 996 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
997 OCTAVE_CXX_FLAG([-mminimal-toc], [ |
3351 | 998 XTRA_CXXFLAGS="$XTRA_CXXFLAGS -mminimal-toc"]) |
3176 | 999 ;; |
324 | 1000 esac |
3126 | 1001 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1002 AC_SUBST(XTRA_CFLAGS) |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1003 AC_SUBST(XTRA_CXXFLAGS) |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1004 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1005 ### Defaults for cross compiling. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1006 dnl BUILD_CC and BUILD_CXX are the compilers that we use for building tools |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1007 dnl on the build system. For now, we assume that the only cross compiling we |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1008 dnl can do is with gcc on a Unixy system, but the dedicated hacker can |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1009 dnl override these. |
4094 | 1010 |
1011 if test "$cross_compiling" = yes; then | |
1012 BUILD_CC="gcc" | |
1013 BUILD_CFLAGS="-O2 -g" | |
1014 BUILD_CXX="g++" | |
22883
7cf0b9654d44
cross-tools: enable std=c++11 for default cross g++ CXXFLAGS (Bug #49822)
John D
parents:
22842
diff
changeset
|
1015 BUILD_CXXFLAGS="-O2 -g -std=c++11" |
4298 | 1016 BUILD_LDFLAGS="" |
4098 | 1017 BUILD_EXEEXT="" |
4094 | 1018 else |
21409
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
1019 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
|
1020 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
|
1021 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
|
1022 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
|
1023 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
|
1024 BUILD_EXEEXT="${EXEEXT}" |
4094 | 1025 fi |
1026 | |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1027 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
|
1028 [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
|
1029 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
|
1030 [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
|
1031 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
|
1032 [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
|
1033 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
|
1034 [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
|
1035 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
|
1036 [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
|
1037 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
|
1038 [build system executable extension (used if cross compiling)]) |
3222 | 1039 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1040 ### Determine whether to create cross-mkoctfile and other cross-tools. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1041 |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1042 cross_tools=no |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1043 AC_ARG_ENABLE([cross-tools], |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1044 [AS_HELP_STRING([--enable-cross-tools], |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1045 [build cross tools (mkoctfile, octave-config) if cross compiling])], |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1046 [if test "$enableval" = yes; then cross_tools=yes; fi]) |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1047 |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1048 if test "$cross_tools" = yes; then |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1049 if test "$cross_compiling" = no; then |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1050 AC_MSG_WARN([ignoring --enable-cross-tools when not cross compiling]) |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1051 cross_tools=no |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1052 fi |
11208
a44ba1cdfbb5
handle --without-opengl configure option
John W. Eaton <jwe@octave.org>
parents:
11119
diff
changeset
|
1053 fi |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1054 AM_CONDITIONAL([AMCOND_CROSS_TOOLS], [test $cross_tools = yes]) |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1055 |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1056 ### Check compiler characteristics. |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1057 dnl FIXME: How many of these are necessary now that C++11 is required? |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1058 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1059 ## Check if C++ compiler can auto allocate variable sized arrays. |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1060 OCTAVE_CXX_DYNAMIC_AUTO_ARRAYS |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1061 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1062 ## Check that C compiler and libraries support IEEE754 data format. |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1063 OCTAVE_IEEE754_DATA_FORMAT |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1064 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1065 ## Are bit_and, bit_or, and bit_xor defined as templated operators? |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1066 OCTAVE_CXX_BITWISE_OP_TEMPLATES |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1067 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1068 ## Can complex class set components independently? |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1069 OCTAVE_CXX_COMPLEX_SETTERS |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1070 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1071 ## Are there functions to access real/imag parts of numbers via references? |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1072 OCTAVE_CXX_COMPLEX_REFERENCE_ACCESSORS |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1073 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1074 ## Does the C compiler handle alloca and const correctly? |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1075 AC_FUNC_ALLOCA |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1076 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1077 ## Does the C compiler support Automake subdir-objects option? |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1078 AM_PROG_CC_C_O |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1079 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1080 ### gnulib initialization: part 2 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1081 dnl Must take place after part 1, and after standard compiler options and |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1082 dnl search paths have been established, and at the same priority level as |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1083 dnl system library function and header checks, but before checks for all |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1084 dnl external library dependencies. |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1085 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1086 gl_INIT |
8185
69c5cce38c29
implement 64-bit arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents:
8169
diff
changeset
|
1087 |
869 | 1088 ### Checks for header files. |
1089 | |
1377 | 1090 AC_HEADER_SYS_WAIT |
2097 | 1091 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1092 ## C headers |
4051 | 1093 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1094 dnl Use multiple AC_CHECKs to avoid line continuations '\' in list. |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1095 AC_CHECK_HEADERS([dlfcn.h floatingpoint.h fpu_control.h grp.h]) |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1096 AC_CHECK_HEADERS([ieeefp.h pthread.h pwd.h sys/ioctl.h]) |
4051 | 1097 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1098 ## Find a termio header to include. |
1901 | 1099 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1100 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
|
1101 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
|
1102 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
|
1103 AC_CHECK_HEADERS([conio.h], have_conio_h=yes, have_conio_h=no) |
3249 | 1104 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1105 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
|
1106 && test $have_termio_h != yes \ |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1107 && test $have_sgtty_h != yes; then |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1108 AC_MSG_WARN([couldn't find one of termios.h, termio.h, or sgtty.h!]) |
832 | 1109 fi |
869 | 1110 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1111 ## 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
|
1112 if test $have_msvc = yes; then |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1113 AC_DEFINE(NOMINMAX, 1, [Define to 1 to avoid min/max macro definition in Windows headers.]) |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1114 fi |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1115 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1116 ### Determine types and size of types. |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1117 |
15172
c7d466a02065
configure.ac: Add checks for a few missing types.
Rik <rik@octave.org>
parents:
15170
diff
changeset
|
1118 AC_TYPE_INT64_T |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1119 AC_TYPE_MODE_T |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1120 AC_TYPE_OFF_T |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1121 AC_TYPE_PID_T |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1122 AC_TYPE_SIZE_T |
15172
c7d466a02065
configure.ac: Add checks for a few missing types.
Rik <rik@octave.org>
parents:
15170
diff
changeset
|
1123 AC_TYPE_SSIZE_T |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1124 AC_TYPE_UID_T |
15172
c7d466a02065
configure.ac: Add checks for a few missing types.
Rik <rik@octave.org>
parents:
15170
diff
changeset
|
1125 AC_TYPE_UINT64_T |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1126 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
|
1127 AC_CHECK_TYPES([ptrdiff_t]) |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1128 |
21354
06d15e4e611a
move public data type macros to octave-config.h
John W. Eaton <jwe@octave.org>
parents:
21306
diff
changeset
|
1129 AC_CHECK_TYPES([long long int]) |
21378
172479a97e6c
configure.ac: Remove overquoting in shell variables tests.
Rik <rik@octave.org>
parents:
21374
diff
changeset
|
1130 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
|
1131 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
|
1132 [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
|
1133 fi |
06d15e4e611a
move public data type macros to octave-config.h
John W. Eaton <jwe@octave.org>
parents:
21306
diff
changeset
|
1134 |
06d15e4e611a
move public data type macros to octave-config.h
John W. Eaton <jwe@octave.org>
parents:
21306
diff
changeset
|
1135 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
|
1136 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
|
1137 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
|
1138 [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
|
1139 fi |
06d15e4e611a
move public data type macros to octave-config.h
John W. Eaton <jwe@octave.org>
parents:
21306
diff
changeset
|
1140 |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1141 ## Check for long double type (may be used for 64-bit integer computations). |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1142 AC_CHECK_SIZEOF([long double]) |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1143 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1144 ### Check structures and existence of necessary members. |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1145 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1146 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
|
1147 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
|
1148 AC_CHECK_MEMBERS([struct group.gr_passwd]) |
3887 | 1149 |
1186 | 1150 AC_STRUCT_TIMEZONE |
8998
a48fba01e4ac
optimize isnan/isinf/isfinite mappers
Jaroslav Hajek <highegg@gmail.com>
parents:
8940
diff
changeset
|
1151 |
21235
b48d65c5df5b
Disable char/int8_t function overloads where not permitted (bug #45411)
Mike Miller <mtmiller@octave.org>
parents:
21105
diff
changeset
|
1152 ## 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
|
1153 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
|
1154 [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
|
1155 [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
|
1156 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
|
1157 #include <stdint.h> |
b48d65c5df5b
Disable char/int8_t function overloads where not permitted (bug #45411)
Mike Miller <mtmiller@octave.org>
parents:
21105
diff
changeset
|
1158 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
|
1159 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
|
1160 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
|
1161 ]])], |
b48d65c5df5b
Disable char/int8_t function overloads where not permitted (bug #45411)
Mike Miller <mtmiller@octave.org>
parents:
21105
diff
changeset
|
1162 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
|
1163 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
|
1164 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
|
1165 ]) |
b48d65c5df5b
Disable char/int8_t function overloads where not permitted (bug #45411)
Mike Miller <mtmiller@octave.org>
parents:
21105
diff
changeset
|
1166 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
|
1167 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
|
1168 [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
|
1169 fi |
b48d65c5df5b
Disable char/int8_t function overloads where not permitted (bug #45411)
Mike Miller <mtmiller@octave.org>
parents:
21105
diff
changeset
|
1170 |
1788 | 1171 ### Checks for functions and variables. |
869 | 1172 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1173 dnl The list of functions is short because we use gnulib to guarantee |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1174 dnl valid implementations for many common problematic functions. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1175 |
15452
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
1176 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
|
1177 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
|
1178 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
|
1179 AC_CHECK_FUNCS([ctermid dup2]) |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1180 AC_CHECK_FUNCS([endgrent endpwent execvp fork]) |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1181 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
|
1182 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
|
1183 AC_CHECK_FUNCS([isascii kill]) |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1184 AC_CHECK_FUNCS([lgamma_r lgammaf_r]) |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1185 AC_CHECK_FUNCS([realpath resolvepath]) |
21949
baeffde5c87d
fix build for Windows systems
John W. Eaton <jwe@octave.org>
parents:
21945
diff
changeset
|
1186 AC_CHECK_FUNCS([select setgrent setpwent setsid siglongjmp strsignal]) |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1187 AC_CHECK_FUNCS([tcgetattr tcsetattr toascii]) |
17946 | 1188 AC_CHECK_FUNCS([umask waitpid]) |
20786
a8ee668e7fd7
Fix kbhit and pause on Windows systems.
Rik <rik@octave.org>
parents:
20640
diff
changeset
|
1189 AC_CHECK_FUNCS([_getch _kbhit]) |
15452
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
1190 |
15852
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
1191 ## 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
|
1192 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
|
1193 [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
|
1194 [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
|
1195 #include <math.h> |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
1196 ]], [[ |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
1197 double x = M_LN2;]])], |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
1198 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
|
1199 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
|
1200 ]) |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
1201 |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
1202 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
|
1203 ## 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
|
1204 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
|
1205 [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
|
1206 [save_CPPFLAGS="$CPPFLAGS" |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
1207 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
|
1208 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
|
1209 #include <math.h> |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
1210 ]], [[ |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
1211 double x = M_LN2;]])], |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
1212 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
|
1213 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
|
1214 CPPFLAGS="$save_CPPFLAGS" |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
1215 ]) |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
1216 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
|
1217 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
|
1218 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
|
1219 [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
|
1220 CPPFLAGS="$CPPFLAGS -D_USE_MATH_DEFINES" |
1978 | 1221 fi |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
1222 fi |
15852
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
1223 |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
1224 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
|
1225 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
|
1226 [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
|
1227 else |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
1228 AC_MSG_ERROR([MATH DEFINES in math.h such as M_PI are required to build Octave]) |
4163 | 1229 fi |
1230 | |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1231 ## 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
|
1232 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
1233 msdosmsvc | mingw*) |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1234 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
|
1235 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
|
1236 #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
|
1237 #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
|
1238 #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
|
1239 #endif |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1240 ]], [])], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1241 [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
|
1242 [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
|
1243 [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
|
1244 AC_MSG_RESULT([0x0403])]) |
956 | 1245 ;; |
1246 esac | |
1247 | |
15452
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
1248 ## Windows-specific use of functions |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
1249 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
1250 msdosmsvc | mingw*) |
15452
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
1251 AC_CHECK_FUNCS([setvbuf], [], |
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
1252 [AC_MSG_ERROR([Missing function required to build Octave])]) |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1253 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1254 ## We need this for GetDeviceCaps. Should we actually check for |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1255 ## the function and library? |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1256 LIBS="-lgdi32 $LIBS" |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1257 ;; |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1258 esac |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1259 |
24678
aa9c29f48718
configure.ac: Only check for psapi library when compiling for Windows.
Rik <rik@octave.org>
parents:
24653
diff
changeset
|
1260 ## Windows-specific module used for winqueryreg function |
aa9c29f48718
configure.ac: Only check for psapi library when compiling for Windows.
Rik <rik@octave.org>
parents:
24653
diff
changeset
|
1261 case $host_os in |
aa9c29f48718
configure.ac: Only check for psapi library when compiling for Windows.
Rik <rik@octave.org>
parents:
24653
diff
changeset
|
1262 msdosmsvc | mingw*) |
24719
9af783c01c7f
Fix cross-building for win32 target (bug #50463).
Markus Mützel <markus.muetzel@gmx.de>
parents:
24678
diff
changeset
|
1263 AC_CHECK_HEADERS([psapi.h], |
9af783c01c7f
Fix cross-building for win32 target (bug #50463).
Markus Mützel <markus.muetzel@gmx.de>
parents:
24678
diff
changeset
|
1264 [LIBS="-lpsapi $LIBS"], |
9af783c01c7f
Fix cross-building for win32 target (bug #50463).
Markus Mützel <markus.muetzel@gmx.de>
parents:
24678
diff
changeset
|
1265 [AC_MSG_ERROR([Missing PSAPI required to build for Windows target.])], |
9af783c01c7f
Fix cross-building for win32 target (bug #50463).
Markus Mützel <markus.muetzel@gmx.de>
parents:
24678
diff
changeset
|
1266 [#include <windows.h>]) |
18352
c460566106f0
configure.ac: Find Qt libs in framework option for Macs (bug #41236)
Michael C. Grant <mcg@cvxr.com>
parents:
18342
diff
changeset
|
1267 ;; |
15452
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
1268 esac |
3130 | 1269 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1270 ## Cygwin kluge for getrusage. |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1271 AC_CHECK_FUNCS([getrusage]) |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
1272 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
1273 cygwin*) |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1274 AC_DEFINE(RUSAGE_TIMES_ONLY, 1, |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1275 [Define to 1 if the 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
|
1276 ;; |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1277 esac |
869 | 1278 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1279 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
|
1280 |
1388 | 1281 AC_FUNC_CLOSEDIR_VOID |
1225 | 1282 |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1283 ## Check return type of matherr |
15143
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
1284 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
|
1285 [octave_cv_func_matherr_type], |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
1286 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
1287 #include <math.h> |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
1288 ]], [[ |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
1289 struct exception *x; |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
1290 x->type; |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
1291 x->name; |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
1292 ]])], |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
1293 octave_cv_func_matherr_type=yes, |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
1294 octave_cv_func_matherr_type=no) |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
1295 ]) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1296 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
|
1297 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
|
1298 [Define to 1 if math.h declares struct exception for matherr.]) |
2488 | 1299 fi |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
1300 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1301 ## Signal stuff. |
869 | 1302 |
5844 | 1303 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
|
1304 [[#include <signal.h> |
5844 | 1305 /* NetBSD declares sys_siglist in unistd.h. */ |
1306 #if HAVE_UNISTD_H | |
1307 # include <unistd.h> | |
1308 #endif | |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1309 ]]) |
2633 | 1310 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1311 ### 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
|
1312 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1313 OCTAVE_CHECK_LIB(qhull, QHull, |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1314 [Qhull library not found. This will result in loss of functionality for 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
|
1315 [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
|
1316 [qh_qhull], [], [], |
9519
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
1317 [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
|
1318 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
|
1319 OCTAVE_CHECK_LIB_QHULL_OK( |
19355
22289e6e316e
build: Remove unused TEXINFO_LIBNAME definitions from Makefiles.
Rik <rik@octave.org>
parents:
19353
diff
changeset
|
1320 [AC_DEFINE(HAVE_QHULL, 1, [Define to 1 if Qhull is available.])], |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1321 [warn_qhull="Qhull library found, but does not seem to work properly. This will result in loss of functionality for some geometry functions. Please try recompiling the library with -fno-strict-aliasing."])]) |
6855 | 1322 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1323 ### Check for PCRE regex library. |
12464
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
1324 |
23007
b8cef5f05dcd
use OCTAVE_CHECK_LIB to check for PCRE library (bug #49993)
John W. Eaton <jwe@octave.org>
parents:
23005
diff
changeset
|
1325 OCTAVE_CHECK_LIB(pcre, PCRE, |
b8cef5f05dcd
use OCTAVE_CHECK_LIB to check for PCRE library (bug #49993)
John W. Eaton <jwe@octave.org>
parents:
23005
diff
changeset
|
1326 [], [pcre.h pcre/pcre.h], [pcre_compile], [], [], [], |
b8cef5f05dcd
use OCTAVE_CHECK_LIB to check for PCRE library (bug #49993)
John W. Eaton <jwe@octave.org>
parents:
23005
diff
changeset
|
1327 [libpcre], [REQUIRED]) |
7169 | 1328 |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1329 ### Check for readline library. |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1330 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1331 OCTAVE_ENABLE_READLINE |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1332 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1333 ## Find a termlib to use. |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1334 OCTAVE_CHECK_LIB_TERMLIB |
7169 | 1335 |
5270 | 1336 ### Check for ZLIB library. |
3820 | 1337 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1338 OCTAVE_CHECK_LIB(z, ZLIB, |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1339 [ZLIB library not found. Octave will not be able to load or save compressed data files or HDF5 files.], |
9538
d0239bddf621
use OCTAVE_CHECK_LIB to check for zlib
John W. Eaton <jwe@octave.org>
parents:
9536
diff
changeset
|
1340 [zlib.h], [gzclearerr]) |
3687 | 1341 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1342 ## 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
|
1343 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
|
1344 AC_DEFINE(HAVE_ZLIB, 1, [Define to 1 if ZLIB is available.]) |
21131
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
1345 fi |
16332
5293cee91891
conditionally define HAVE_FFTW and HAVE_ZLIB in config.h
John W. Eaton <jwe@octave.org>
parents:
16330
diff
changeset
|
1346 |
22160
766f934db568
Rewrite gzip and bzip2 in C++ instead of using its applications (bug #43431)
Carnë Draug <carandraug@octave.org>
parents:
22150
diff
changeset
|
1347 ### Check for BZIP2 library. |
766f934db568
Rewrite gzip and bzip2 in C++ instead of using its applications (bug #43431)
Carnë Draug <carandraug@octave.org>
parents:
22150
diff
changeset
|
1348 |
766f934db568
Rewrite gzip and bzip2 in C++ instead of using its applications (bug #43431)
Carnë Draug <carandraug@octave.org>
parents:
22150
diff
changeset
|
1349 OCTAVE_CHECK_LIB(bz2, BZIP2, |
766f934db568
Rewrite gzip and bzip2 in C++ instead of using its applications (bug #43431)
Carnë Draug <carandraug@octave.org>
parents:
22150
diff
changeset
|
1350 [BZIP2 library not found. Octave will not be able to compress or decompress bzip2 files.], |
766f934db568
Rewrite gzip and bzip2 in C++ instead of using its applications (bug #43431)
Carnë Draug <carandraug@octave.org>
parents:
22150
diff
changeset
|
1351 [bzlib.h], [BZ2_bzCompressInit]) |
766f934db568
Rewrite gzip and bzip2 in C++ instead of using its applications (bug #43431)
Carnë Draug <carandraug@octave.org>
parents:
22150
diff
changeset
|
1352 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1353 ### Check for the LLVM library (JIT compiler). |
15001
894cf2c07f92
Properly restore compiler and linker flags after llvm tests
Carlo de Falco <cdf@users.sourceforge.net>
parents:
14994
diff
changeset
|
1354 |
21131
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
1355 ENABLE_JIT=no |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
1356 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
|
1357 [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
|
1358 [(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
|
1359 [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
|
1360 |
14899 | 1361 LLVM_CPPFLAGS= |
1362 LLVM_LDFLAGS= | |
1363 LLVM_LIBS= | |
1364 | |
21131
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
1365 if test $ENABLE_JIT = yes; then |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
1366 |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
1367 ## 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
|
1368 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
|
1369 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
|
1370 |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
1371 if test -z "$LLVM_CONFIG"; then |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
1372 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
|
1373 else |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1374 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
|
1375 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
|
1376 |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
1377 save_CPPFLAGS="$CPPFLAGS" |
17387
2b4ed68be0d5
Allow shared libs for LLVM (Bug #38654)
John Donoghue <john.donoghue@ieee.org>
parents:
17376
diff
changeset
|
1378 save_LDFLAGS="$LDFLAGS" |
14994
bbc825cb2ea0
Use -I instead of -isystem if -isystem is not avaiable
Max Brister <max@2bass.com>
parents:
14993
diff
changeset
|
1379 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1380 dnl Use -isystem if available because we don't want to see warnings in LLVM |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
1381 LLVM_INCLUDE_FLAG=-I |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1382 OCTAVE_CC_FLAG([-isystem .], [ |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
1383 LLVM_INCLUDE_FLAG=-isystem |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
1384 AC_MSG_NOTICE([using -isystem for LLVM headers])]) |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
1385 |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
1386 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
|
1387 LLVM_CPPFLAGS="$LLVM_INCLUDE_FLAG `$LLVM_CONFIG --includedir`" |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1388 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
|
1389 |
2b4ed68be0d5
Allow shared libs for LLVM (Bug #38654)
John Donoghue <john.donoghue@ieee.org>
parents:
17376
diff
changeset
|
1390 LDFLAGS="$LDFLAGS $LLVM_LDFLAGS" |
2b4ed68be0d5
Allow shared libs for LLVM (Bug #38654)
John Donoghue <john.donoghue@ieee.org>
parents:
17376
diff
changeset
|
1391 LLVM_SO=LLVM-`$LLVM_CONFIG --version` |
24236
aec57eeb3aca
configure.ac: Add missing --system-libs arguments to llvm-config call
Julien Bect <jbect@users.sourceforge.net>
parents:
24162
diff
changeset
|
1392 AC_CHECK_LIB([$LLVM_SO], [LLVMBuildAdd], [LLVM_LIBS="-l$LLVM_SO"], |
aec57eeb3aca
configure.ac: Add missing --system-libs arguments to llvm-config call
Julien Bect <jbect@users.sourceforge.net>
parents:
24162
diff
changeset
|
1393 [LLVM_LIBS="`$LLVM_CONFIG --libs` `$LLVM_CONFIG --system-libs`"]) |
14994
bbc825cb2ea0
Use -I instead of -isystem if -isystem is not avaiable
Max Brister <max@2bass.com>
parents:
14993
diff
changeset
|
1394 |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
1395 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
|
1396 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
|
1397 dnl very helpful. |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
1398 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
|
1399 AC_LANG_PUSH(C++) |
17820
3488d987eb50
build: Remove LLVM_(CPPFLAGS|CXXFLAGS) from XTRA_CXXFLAGS.
Rik <rik@octave.org>
parents:
17819
diff
changeset
|
1400 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
|
1401 |
bc20614022aa
build: Redo LLVM macros to disable JIT rather than stop build if headers not found.
Rik <rik@octave.org>
parents:
17180
diff
changeset
|
1402 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
|
1403 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
|
1404 [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
|
1405 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
|
1406 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
|
1407 fi |
26539
b3157525cebf
jit: configure: Check llvm::IRBuilder API
Julien Bect <jbect@users.sourceforge.net>
parents:
26379
diff
changeset
|
1408 |
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
|
1409 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
|
1410 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
|
1411 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
|
1412 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
|
1413 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
|
1414 fi |
26539
b3157525cebf
jit: configure: Check llvm::IRBuilder API
Julien Bect <jbect@users.sourceforge.net>
parents:
26379
diff
changeset
|
1415 |
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
|
1416 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
|
1417 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
|
1418 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
|
1419 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
|
1420 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
|
1421 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
|
1422 |
18831
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18586
diff
changeset
|
1423 AC_CHECK_HEADERS([llvm/IR/Verifier.h]) |
24245
b3b7677334f6
jit: pt-jit.cc: Use createBasicAAWrapperPass instead of createBasicAliasAnalysisPass
Julien Bect <jbect@users.sourceforge.net>
parents:
24236
diff
changeset
|
1424 AC_CHECK_HEADERS([llvm/Analysis/BasicAliasAnalysis.h]) |
26540
7a77eb39c7f0
jit: configure: Check if llvm/Transforms/Scalar/GVN.h exists
Julien Bect <jbect@users.sourceforge.net>
parents:
26539
diff
changeset
|
1425 AC_CHECK_HEADERS([llvm/Transforms/Scalar/GVN.h]) |
26542
ed1dad5e71c3
jit: configure: Check if llvm/Bitcode/ReaderWriter.h exists
Julien Bect <jbect@users.sourceforge.net>
parents:
26541
diff
changeset
|
1426 AC_CHECK_HEADERS([llvm/Bitcode/ReaderWriter.h]) |
18831
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18586
diff
changeset
|
1427 |
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
|
1428 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
|
1429 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
|
1430 OCTAVE_LLVM_CALLINST_ADDATTRIBUTE_API |
18831
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18586
diff
changeset
|
1431 OCTAVE_LLVM_RAW_FD_OSTREAM_API |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18586
diff
changeset
|
1432 OCTAVE_LLVM_LEGACY_PASSMANAGER_API |
26539
b3157525cebf
jit: configure: Check llvm::IRBuilder API
Julien Bect <jbect@users.sourceforge.net>
parents:
26379
diff
changeset
|
1433 OCTAVE_LLVM_IRBUILDER_API |
26541
ea25fc64c275
jit: configure: Check if llvm::createAlwaysInlinerPass exists
Julien Bect <jbect@users.sourceforge.net>
parents:
26540
diff
changeset
|
1434 OCTAVE_LLVM_HAS_CREATEALWAYSINLINERPASS |
26543
df230bb22ba6
jit: configure: Check if llvm::IRBuilder::CreateConstInBoundsGEP1_32 API
Julien Bect <jbect@users.sourceforge.net>
parents:
26542
diff
changeset
|
1435 OCTAVE_LLVM_IRBUILDER_CREATECONSTINBOUNDSGEP1_32_API |
df230bb22ba6
jit: configure: Check if llvm::IRBuilder::CreateConstInBoundsGEP1_32 API
Julien Bect <jbect@users.sourceforge.net>
parents:
26542
diff
changeset
|
1436 |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
1437 AC_LANG_POP(C++) |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
1438 CPPFLAGS="$save_CPPFLAGS" |
17387
2b4ed68be0d5
Allow shared libs for LLVM (Bug #38654)
John Donoghue <john.donoghue@ieee.org>
parents:
17376
diff
changeset
|
1439 LDFLAGS="$save_LDFLAGS" |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
1440 fi |
14993
06f2e9bdade6
configure.ac: Skip compiling JIT if LLVM_CONFIG is not specified
Max Brister <max@2bass.com>
parents:
14990
diff
changeset
|
1441 |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
1442 if test -z "$warn_llvm"; then |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
1443 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
|
1444 else |
21131
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
1445 ENABLE_JIT=no |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
1446 LLVM_CPPFLAGS= |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
1447 LLVM_LDFLAGS= |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
1448 LLVM_LIBS= |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
1449 OCTAVE_CONFIGURE_WARNING([warn_llvm]) |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
1450 fi |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1451 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
|
1452 dnl else |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1453 dnl ## JIT build disabled |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1454 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
|
1455 dnl OCTAVE_CONFIGURE_WARNING([warn_llvm]) |
14899 | 1456 fi |
24374
80948d6e58c2
Fix ENABLE_JIT mistakenly being set by configure.
Rik <rik@octave.org>
parents:
24329
diff
changeset
|
1457 if test $ENABLE_JIT = yes; then |
21131
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
1458 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
|
1459 fi |
14899 | 1460 |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
1461 AC_SUBST(LLVM_CPPFLAGS) |
14899 | 1462 AC_SUBST(LLVM_LDFLAGS) |
1463 AC_SUBST(LLVM_LIBS) | |
18338
7a1a71e3f328
configure.ac: Fix broken build with AMCOND_HAVE_LLVM.
Rik <rik@octave.org>
parents:
18328
diff
changeset
|
1464 AM_CONDITIONAL([AMCOND_HAVE_LLVM], [test -z "$warn_llvm"]) |
14899 | 1465 |
9538
d0239bddf621
use OCTAVE_CHECK_LIB to check for zlib
John W. Eaton <jwe@octave.org>
parents:
9536
diff
changeset
|
1466 ### Check for HDF5 library. |
5270 | 1467 |
9542
f5ec5dc66824
use OCTAVE_CHECK_LIBRARY to check for HDF5
John W. Eaton <jwe@octave.org>
parents:
9540
diff
changeset
|
1468 save_CPPFLAGS="$CPPFLAGS" |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1469 save_LIBS="$LIBS" |
9542
f5ec5dc66824
use OCTAVE_CHECK_LIBRARY to check for HDF5
John W. Eaton <jwe@octave.org>
parents:
9540
diff
changeset
|
1470 CPPFLAGS="$Z_CPPFLAGS $CPPFLAGS" |
f5ec5dc66824
use OCTAVE_CHECK_LIBRARY to check for HDF5
John W. Eaton <jwe@octave.org>
parents:
9540
diff
changeset
|
1471 LIBS="$Z_LDFLAGS $Z_LIBS $LIBS" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1472 OCTAVE_CHECK_LIB(hdf5, HDF5, |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1473 [HDF5 library not found. Octave will not be able to load or save HDF5 data files.], |
9542
f5ec5dc66824
use OCTAVE_CHECK_LIBRARY to check for HDF5
John W. Eaton <jwe@octave.org>
parents:
9540
diff
changeset
|
1474 [hdf5.h], [H5Gget_num_objs], [], [], |
f5ec5dc66824
use OCTAVE_CHECK_LIBRARY to check for HDF5
John W. Eaton <jwe@octave.org>
parents:
9540
diff
changeset
|
1475 [warn_hdf5= |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1476 OCTAVE_CHECK_HDF5_HAS_VER_16_API |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1477 AC_DEFINE(HAVE_HDF5, 1, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1478 [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
|
1479 if test $have_msvc = yes; then |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1480 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
|
1481 fi |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1482 ]) |
9542
f5ec5dc66824
use OCTAVE_CHECK_LIBRARY to check for HDF5
John W. Eaton <jwe@octave.org>
parents:
9540
diff
changeset
|
1483 CPPFLAGS="$save_CPPFLAGS" |
f5ec5dc66824
use OCTAVE_CHECK_LIBRARY to check for HDF5
John W. Eaton <jwe@octave.org>
parents:
9540
diff
changeset
|
1484 LIBS="$save_LIBS" |
5270 | 1485 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1486 dnl FIXME: Should we check for this now, or wait until some version of HDF5 |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1487 dnl actually supports this feature? |
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
|
1488 have_hdf5_int2float_conversions=no |
21378
172479a97e6c
configure.ac: Remove overquoting in shell variables tests.
Rik <rik@octave.org>
parents:
21374
diff
changeset
|
1489 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
|
1490 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
|
1491 [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
|
1492 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
|
1493 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1494 ### Check for FFTW library. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1495 ### Default to Fortran FFTPACK if it is not available. |
5203 | 1496 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1497 ## Check for FFTW header and library. |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1498 OCTAVE_CHECK_LIB(fftw3, FFTW3, |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1499 [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
|
1500 [fftw3.h], [fftw_plan_dft_1d]) |
3827 | 1501 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1502 OCTAVE_CHECK_LIB(fftw3f, FFTW3F, |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1503 [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
|
1504 [fftw3.h], [fftwf_plan_dft_1d]) |
3827 | 1505 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1506 ## 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
|
1507 build_fftw_threads=yes |
15960
bde7731b2b83
added FFTW multithreaded library support
Andreas Weber <andy.weber.aw@gmail.com>
parents:
15946
diff
changeset
|
1508 AC_ARG_ENABLE([fftw-threads], |
bde7731b2b83
added FFTW multithreaded library support
Andreas Weber <andy.weber.aw@gmail.com>
parents:
15946
diff
changeset
|
1509 [AS_HELP_STRING([--disable-fftw-threads], |
bde7731b2b83
added FFTW multithreaded library support
Andreas Weber <andy.weber.aw@gmail.com>
parents:
15946
diff
changeset
|
1510 [disable Multi-threaded FFTW])], |
8938
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
1511 [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
|
1512 build_fftw_threads=no |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1513 fi], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1514 []) |
2813 | 1515 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1516 dnl Octave is currently unable to use FFTW unless both float and double |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1517 dnl 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
|
1518 |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1519 AM_CONDITIONAL([AMCOND_HAVE_FFTW], |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1520 [test -n "$FFTW3_LIBS" && test -n "$FFTW3F_LIBS"]) |
3827 | 1521 |
16332
5293cee91891
conditionally define HAVE_FFTW and HAVE_ZLIB in config.h
John W. Eaton <jwe@octave.org>
parents:
16330
diff
changeset
|
1522 if test -n "$FFTW3_LIBS" && test -n "$FFTW3F_LIBS"; then |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1523 AC_DEFINE(HAVE_FFTW, 1, [Define to 1 if both FFTW3 and FFTW3F libraries are available.]) |
19344
88847d5d1a96
configure.ac: Fix handling of --without-fftw3[f] options.
Rik <rik@octave.org>
parents:
18991
diff
changeset
|
1524 else |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1525 dnl --without-fftw3 given, or one of the FFTW3 libs not installed. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1526 dnl Don't check for FFTW threads as this is now pointless. |
19344
88847d5d1a96
configure.ac: Fix handling of --without-fftw3[f] options.
Rik <rik@octave.org>
parents:
18991
diff
changeset
|
1527 build_fftw_threads=no |
88847d5d1a96
configure.ac: Fix handling of --without-fftw3[f] options.
Rik <rik@octave.org>
parents:
18991
diff
changeset
|
1528 fi |
88847d5d1a96
configure.ac: Fix handling of --without-fftw3[f] options.
Rik <rik@octave.org>
parents:
18991
diff
changeset
|
1529 |
88847d5d1a96
configure.ac: Fix handling of --without-fftw3[f] options.
Rik <rik@octave.org>
parents:
18991
diff
changeset
|
1530 ## Check for the multithreaded FFTW library. |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1531 ## Fallback to singlethreaded if not found or disabled. |
19344
88847d5d1a96
configure.ac: Fix handling of --without-fftw3[f] options.
Rik <rik@octave.org>
parents:
18991
diff
changeset
|
1532 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
|
1533 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
|
1534 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
|
1535 fi |
5293cee91891
conditionally define HAVE_FFTW and HAVE_ZLIB in config.h
John W. Eaton <jwe@octave.org>
parents:
16330
diff
changeset
|
1536 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1537 ## Collections of flags. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1538 dnl These are here instead of just in the Makefile.am file because we |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1539 dnl substitute some of them into other source files like mkoctfile. |
23389
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
1540 |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
1541 ## Order matters, at least on some systems (Cygwin, for example). |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
1542 |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
1543 FFTW_XCPPFLAGS="$FFTW3_CPPFLAGS $FFTW3F_CPPFLAGS" |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
1544 |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
1545 FFTW_XLDFLAGS="$FFTW3_LDFLAGS $FFTW3F_LDFLAGS" |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
1546 |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
1547 FFTW_XLIBS="$FFTW3_LIBS $FFTW3F_LIBS" |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
1548 |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
1549 AC_SUBST(FFTW_XCPPFLAGS) |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
1550 AC_SUBST(FFTW_XLDFLAGS) |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
1551 AC_SUBST(FFTW_XLIBS) |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
1552 |
23434
f4d4d83f15c5
maint: rename cruft/ directory to external/
Rik <rik@octave.org>
parents:
23426
diff
changeset
|
1553 ## Subdirectory of liboctave/external 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
|
1554 FFT_DIR="fftpack" |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1555 AC_SUBST(FFT_DIR) |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1556 |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1557 ### Check for GLPK library and header. |
5235 | 1558 |
9540
79b5fe2d5646
use Z_LIBS in checks for curl and glpk libraries
John W. Eaton <jwe@octave.org>
parents:
9538
diff
changeset
|
1559 save_CPPFLAGS="$CPPFLAGS" |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1560 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
|
1561 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
|
1562 LIBS="$Z_LDFLAGS $Z_LIBS $LIBS" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1563 OCTAVE_CHECK_LIB(glpk, GLPK, |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1564 [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
|
1565 [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
|
1566 [warn_glpk= |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17196
diff
changeset
|
1567 OCTAVE_CHECK_LIB_GLPK_OK( |
19355
22289e6e316e
build: Remove unused TEXINFO_LIBNAME definitions from Makefiles.
Rik <rik@octave.org>
parents:
19353
diff
changeset
|
1568 [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
|
1569 [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
|
1570 LIBS="$save_LIBS" |
79b5fe2d5646
use Z_LIBS in checks for curl and glpk libraries
John W. Eaton <jwe@octave.org>
parents:
9538
diff
changeset
|
1571 CPPFLAGS="$save_CPPFLAGS" |
5235 | 1572 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1573 ### Checks for cURL header and library. |
6043 | 1574 |
9540
79b5fe2d5646
use Z_LIBS in checks for curl and glpk libraries
John W. Eaton <jwe@octave.org>
parents:
9538
diff
changeset
|
1575 save_CPPFLAGS="$CPPFLAGS" |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1576 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
|
1577 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
|
1578 LIBS="$Z_LDFLAGS $Z_LIBS $LIBS" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1579 OCTAVE_CHECK_LIB(curl, cURL, |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1580 [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
|
1581 [curl/curl.h], [curl_easy_escape]) |
15323
c42bf5cadb60
Add check for CURLOPT_DIRLISTONLY in libcurl
Mike Miller <mtmiller@ieee.org>
parents:
15317
diff
changeset
|
1582 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
|
1583 ## 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
|
1584 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
|
1585 [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
|
1586 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
15323
c42bf5cadb60
Add check for CURLOPT_DIRLISTONLY in libcurl
Mike Miller <mtmiller@ieee.org>
parents:
15317
diff
changeset
|
1587 #include <curl/curl.h> |
c42bf5cadb60
Add check for CURLOPT_DIRLISTONLY in libcurl
Mike Miller <mtmiller@ieee.org>
parents:
15317
diff
changeset
|
1588 ]], [[ |
c42bf5cadb60
Add check for CURLOPT_DIRLISTONLY in libcurl
Mike Miller <mtmiller@ieee.org>
parents:
15317
diff
changeset
|
1589 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
|
1590 ]])], |
16080
c53f8f706c55
Reverse logic of libcurl feature test result
Mike Miller <mtmiller@ieee.org>
parents:
16079
diff
changeset
|
1591 [octave_cv_curl_has_curlopt_dirlistonly=yes], |
c53f8f706c55
Reverse logic of libcurl feature test result
Mike Miller <mtmiller@ieee.org>
parents:
16079
diff
changeset
|
1592 [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
|
1593 ]) |
16080
c53f8f706c55
Reverse logic of libcurl feature test result
Mike Miller <mtmiller@ieee.org>
parents:
16079
diff
changeset
|
1594 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
|
1595 AC_DEFINE(CURLOPT_DIRLISTONLY, CURLOPT_FTPLISTONLY, |
16079
3a90c3f4046d
Fix typo in changeset dc39c1d84c5b
Mike Miller <mtmiller@ieee.org>
parents:
16078
diff
changeset
|
1596 [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
|
1597 fi |
15323
c42bf5cadb60
Add check for CURLOPT_DIRLISTONLY in libcurl
Mike Miller <mtmiller@ieee.org>
parents:
15317
diff
changeset
|
1598 fi |
9540
79b5fe2d5646
use Z_LIBS in checks for curl and glpk libraries
John W. Eaton <jwe@octave.org>
parents:
9538
diff
changeset
|
1599 LIBS="$save_LIBS" |
79b5fe2d5646
use Z_LIBS in checks for curl and glpk libraries
John W. Eaton <jwe@octave.org>
parents:
9538
diff
changeset
|
1600 CPPFLAGS="$save_CPPFLAGS" |
6133 | 1601 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1602 ### Check for sndfile library. |
19464
8fe2780c1491
update configure.ac to build and configure sndfile audio file utilities
Vytautas Jančauskas <unaudio@gmail.com>
parents:
17465
diff
changeset
|
1603 |
22104
cfc260765ddf
build: use simpler and more consistent checks for portaudio and sndfile
Mike Miller <mtmiller@octave.org>
parents:
22041
diff
changeset
|
1604 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
|
1605 [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
|
1606 [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
|
1607 [], [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
|
1608 [warn_sndfile= |
d534a3014fd7
build: restore sndfile check for specific features needed to build
Mike Miller <mtmiller@octave.org>
parents:
22104
diff
changeset
|
1609 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
|
1610 [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
|
1611 [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
|
1612 |
19470
23833e1bfa2e
check for PortAudio
Vytautas Jančauskas <unaudio@gmail.com>
parents:
19467
diff
changeset
|
1613 ### Check for PortAudio |
23833e1bfa2e
check for PortAudio
Vytautas Jančauskas <unaudio@gmail.com>
parents:
19467
diff
changeset
|
1614 |
22104
cfc260765ddf
build: use simpler and more consistent checks for portaudio and sndfile
Mike Miller <mtmiller@octave.org>
parents:
22041
diff
changeset
|
1615 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
|
1616 [PortAudio library not found. The audioplayer, audiorecorder, and audiodevinfo functions will be disabled.], |
22458
30002d6568c4
build: fix detection of PortAudio to differentiate usable versions (bug #49039)
Mike Miller <mtmiller@octave.org>
parents:
22455
diff
changeset
|
1617 [portaudio.h], [Pa_GetDeviceCount], |
22104
cfc260765ddf
build: use simpler and more consistent checks for portaudio and sndfile
Mike Miller <mtmiller@octave.org>
parents:
22041
diff
changeset
|
1618 [], [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
|
1619 [], [portaudio-2.0]) |
19470
23833e1bfa2e
check for PortAudio
Vytautas Jančauskas <unaudio@gmail.com>
parents:
19467
diff
changeset
|
1620 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1621 ### 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
|
1622 |
21381 | 1623 check_magick=yes |
1624 use_magick=no | |
11216
5036b0ff9597
configure.ac: Properly m4 quote AS_HELP_STRING.
Rik <octave@nomad.inbox5.com>
parents:
11214
diff
changeset
|
1625 AC_ARG_WITH([magick], |
5036b0ff9597
configure.ac: Properly m4 quote AS_HELP_STRING.
Rik <octave@nomad.inbox5.com>
parents:
11214
diff
changeset
|
1626 [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
|
1627 [select library to use for image I/O (options: GraphicsMagick(default) or ImageMagick)])], |
21381 | 1628 [if test x"$withval" = xno; then |
1629 check_magick=no | |
22041
26c0e65e6b77
configure: clean up warning messages when building without GraphicsMagick
Mike Miller <mtmiller@octave.org>
parents:
22027
diff
changeset
|
1630 warn_magick_disabled="--without-magick specified. The imread, imwrite, and imfinfo functions for reading and writing image files will not be fully functional." |
21381 | 1631 OCTAVE_CONFIGURE_WARNING([warn_magick_disabled]) |
1632 else | |
1633 magick="$withval" | |
1634 fi], [magick="GraphicsMagick"]) | |
1635 | |
1636 if test $check_magick = yes; then | |
1637 | |
1638 MAGICK_CPPFLAGS= | |
1639 MAGICK_LDFLAGS= | |
1640 MAGICK_LIBS= | |
1641 | |
1642 PKG_CHECK_EXISTS([$magick++], [ | |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1643 dnl Make sure we only get -I, -L, and -l flags. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1644 dnl Some Graphics/ImageMagick++ dnl packages add extra flags that are |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1645 dnl useful when building Graphics/ImageMagick++ extentions. These extra |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1646 dnl flags break the Octave build. |
23835
6ae0292aaa5c
configure: ensure empty pkg-config results are actually empty (bug #51680)
Mike Miller <mtmiller@octave.org>
parents:
23620
diff
changeset
|
1647 MAGICK_CPPFLAGS="$($PKG_CONFIG --cflags-only-I $magick++ | $SED -e 's/^ *$//')" |
6ae0292aaa5c
configure: ensure empty pkg-config results are actually empty (bug #51680)
Mike Miller <mtmiller@octave.org>
parents:
23620
diff
changeset
|
1648 MAGICK_LDFLAGS="$($PKG_CONFIG --libs-only-L $magick++ | $SED -e 's/^ *$//')" |
6ae0292aaa5c
configure: ensure empty pkg-config results are actually empty (bug #51680)
Mike Miller <mtmiller@octave.org>
parents:
23620
diff
changeset
|
1649 MAGICK_LIBS="$($PKG_CONFIG --libs-only-l $magick++ | $SED -e 's/^ *$//')" |
21381 | 1650 |
22041
26c0e65e6b77
configure: clean up warning messages when building without GraphicsMagick
Mike Miller <mtmiller@octave.org>
parents:
22027
diff
changeset
|
1651 warn_magick="$magick++ library fails tests. The imread, imwrite, and imfinfo functions for reading and writing image files will not be fully functional." |
21381 | 1652 |
1653 save_CPPFLAGS="$CPPFLAGS" | |
1654 save_LIBS="$LIBS" | |
1655 CPPFLAGS="$MAGICK_CPPFLAGS $CPPFLAGS" | |
1656 LIBS="$MAGICK_LDFLAGS $MAGICK_LIBS $LIBS" | |
1657 AC_LANG_PUSH(C++) | |
1658 AC_CHECK_HEADER([Magick++.h], [ | |
1659 AC_CACHE_CHECK([for Magick::ColorRGB in Magick++.h], | |
1660 [octave_cv_func_magick_colorrgb], | |
1661 [AC_PREPROC_IFELSE([AC_LANG_SOURCE([[ | |
1662 #include <Magick++.h> | |
1663 ]], [[ | |
1664 Magick::ColorRGB c; | |
1665 ]])], | |
1666 octave_cv_func_magick_colorrgb=yes, | |
1667 octave_cv_func_magick_colorrgb=no) | |
1668 ]) | |
1669 if test $octave_cv_func_magick_colorrgb = yes; then | |
1670 use_magick=yes | |
1671 warn_magick= | |
1672 fi | |
1673 ]) | |
1674 AC_LANG_POP(C++) | |
1675 CPPFLAGS="$save_CPPFLAGS" | |
1676 LIBS="$save_LIBS" | |
1677 | |
1678 AC_CHECK_FUNCS([setlocale], [], | |
1679 [use_magick=no | |
22041
26c0e65e6b77
configure: clean up warning messages when building without GraphicsMagick
Mike Miller <mtmiller@octave.org>
parents:
22027
diff
changeset
|
1680 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
|
1681 ], |
26c0e65e6b77
configure: clean up warning messages when building without GraphicsMagick
Mike Miller <mtmiller@octave.org>
parents:
22027
diff
changeset
|
1682 [use_magick=no |
26c0e65e6b77
configure: clean up warning messages when building without GraphicsMagick
Mike Miller <mtmiller@octave.org>
parents:
22027
diff
changeset
|
1683 warn_magick="$magick++ library not found. The imread, imwrite, and imfinfo functions for reading and writing image files will not be fully functional."]) |
21381 | 1684 fi |
1685 | |
1686 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
|
1687 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
|
1688 [Define to 1 if Graphics/ImageMagick++ is available.]) |
7937
6661387827d6
Allow build without GraphicsMagick installed
David Bateman <dbateman@free.fr>
parents:
7934
diff
changeset
|
1689 else |
21381 | 1690 if test -n "$warn_magick"; then |
1691 OCTAVE_CONFIGURE_WARNING([warn_magick]) | |
1692 fi | |
9575
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
1693 MAGICK_CPPFLAGS= |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
1694 MAGICK_LDFLAGS= |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
1695 MAGICK_LIBS= |
8938
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
1696 fi |
9575
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
1697 AC_SUBST(MAGICK_CPPFLAGS) |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
1698 AC_SUBST(MAGICK_LDFLAGS) |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
1699 AC_SUBST(MAGICK_LIBS) |
6043 | 1700 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1701 ### Check for X11 libraries |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1702 |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1703 AC_PATH_X |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1704 if test "$have_x" = yes; then |
23009
624f76f2ca51
configure.ac: Use a common style for messages.
Rik <rik@octave.org>
parents:
23007
diff
changeset
|
1705 AC_DEFINE(HAVE_X_WINDOWS, 1, [Define to 1 if X11 is available.]) |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1706 |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1707 if test "$x_includes" != "NONE"; then |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1708 X11_INCFLAGS="$x_includes" |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1709 fi |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1710 AC_SUBST(X11_INCFLAGS) |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1711 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1712 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
|
1713 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
|
1714 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
|
1715 AC_CHECK_LIB([X11], XrmInitialize, |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1716 [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
|
1717 fi |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1718 AC_SUBST(X11_LIBS) |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1719 fi |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1720 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1721 ### Check for the Carbon framework on macOS systems. |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1722 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1723 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
|
1724 [[#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
|
1725 [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
|
1726 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
|
1727 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
|
1728 [Define to 1 if framework CARBON is available.]) |
22208
83963bad5e7d
improvements to Qt & OpenGL linking on the Mac (bug #41574)
Michael C. Grant <mcg@cvxr.com>
parents:
22160
diff
changeset
|
1729 CARBON_LIBS="-framework Carbon" |
83963bad5e7d
improvements to Qt & OpenGL linking on the Mac (bug #41574)
Michael C. Grant <mcg@cvxr.com>
parents:
22160
diff
changeset
|
1730 AC_MSG_NOTICE([adding -framework Carbon to CARBON_LIBS]) |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1731 AC_SUBST(CARBON_LIBS) |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1732 fi |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1733 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1734 ## Check for the CGDisplayBitsPerPixel function. |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1735 if test $have_framework_carbon = yes; then |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1736 OCTAVE_CARBON_CGDISPLAYBITSPERPIXEL |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1737 fi |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1738 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1739 ### Check for OpenGL and helper libraries used by OpenGL graphics renderer. |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1740 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1741 check_opengl=yes |
11208
a44ba1cdfbb5
handle --without-opengl configure option
John W. Eaton <jwe@octave.org>
parents:
11119
diff
changeset
|
1742 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
|
1743 [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
|
1744 [don't use OpenGL libraries, disable OpenGL graphics])], |
21381 | 1745 [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
|
1746 check_opengl=no |
21381 | 1747 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
|
1748 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
|
1749 fi]) |
11208
a44ba1cdfbb5
handle --without-opengl configure option
John W. Eaton <jwe@octave.org>
parents:
11119
diff
changeset
|
1750 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1751 ## 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
|
1752 if test $check_opengl = yes; then |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1753 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
|
1754 if test -z "$OPENGL_LIBS"; then |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1755 warn_opengl_libs="OpenGL libs (GL and GLU) not found. 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
|
1756 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
|
1757 fi |
11208
a44ba1cdfbb5
handle --without-opengl configure option
John W. Eaton <jwe@octave.org>
parents:
11119
diff
changeset
|
1758 fi |
a44ba1cdfbb5
handle --without-opengl configure option
John W. Eaton <jwe@octave.org>
parents:
11119
diff
changeset
|
1759 |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1760 ## 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
|
1761 |
24121
e2dc75c661ac
configure: add a command-line option '--without-freetype' to disable FreeType
Mike Miller <mtmiller@octave.org>
parents:
24077
diff
changeset
|
1762 check_freetype=yes |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1763 warn_freetype= |
24121
e2dc75c661ac
configure: add a command-line option '--without-freetype' to disable FreeType
Mike Miller <mtmiller@octave.org>
parents:
24077
diff
changeset
|
1764 AC_ARG_WITH([freetype], |
e2dc75c661ac
configure: add a command-line option '--without-freetype' to disable FreeType
Mike Miller <mtmiller@octave.org>
parents:
24077
diff
changeset
|
1765 [AS_HELP_STRING([--without-freetype], |
e2dc75c661ac
configure: add a command-line option '--without-freetype' to disable FreeType
Mike Miller <mtmiller@octave.org>
parents:
24077
diff
changeset
|
1766 [don't use FreeType library, OpenGL graphics will not be fully functional])], |
e2dc75c661ac
configure: add a command-line option '--without-freetype' to disable FreeType
Mike Miller <mtmiller@octave.org>
parents:
24077
diff
changeset
|
1767 [if test x"$withval" = xno; then |
e2dc75c661ac
configure: add a command-line option '--without-freetype' to disable FreeType
Mike Miller <mtmiller@octave.org>
parents:
24077
diff
changeset
|
1768 check_freetype=no |
e2dc75c661ac
configure: add a command-line option '--without-freetype' to disable FreeType
Mike Miller <mtmiller@octave.org>
parents:
24077
diff
changeset
|
1769 warn_freetype="--without-freetype specified. OpenGL graphics will not be fully functional." |
e2dc75c661ac
configure: add a command-line option '--without-freetype' to disable FreeType
Mike Miller <mtmiller@octave.org>
parents:
24077
diff
changeset
|
1770 fi]) |
e2dc75c661ac
configure: add a command-line option '--without-freetype' to disable FreeType
Mike Miller <mtmiller@octave.org>
parents:
24077
diff
changeset
|
1771 |
e2dc75c661ac
configure: add a command-line option '--without-freetype' to disable FreeType
Mike Miller <mtmiller@octave.org>
parents:
24077
diff
changeset
|
1772 if test $check_freetype = yes; then |
e2dc75c661ac
configure: add a command-line option '--without-freetype' to disable FreeType
Mike Miller <mtmiller@octave.org>
parents:
24077
diff
changeset
|
1773 PKG_CHECK_MODULES([FT2], [freetype2], [ |
e2dc75c661ac
configure: add a command-line option '--without-freetype' to disable FreeType
Mike Miller <mtmiller@octave.org>
parents:
24077
diff
changeset
|
1774 min_ft2_version=9.03 |
e2dc75c661ac
configure: add a command-line option '--without-freetype' to disable FreeType
Mike Miller <mtmiller@octave.org>
parents:
24077
diff
changeset
|
1775 AC_MSG_CHECKING([for FreeType2 version >= $min_ft2_version]) |
e2dc75c661ac
configure: add a command-line option '--without-freetype' to disable FreeType
Mike Miller <mtmiller@octave.org>
parents:
24077
diff
changeset
|
1776 $PKG_CONFIG freetype2 --atleast-version=$min_ft2_version |
e2dc75c661ac
configure: add a command-line option '--without-freetype' to disable FreeType
Mike Miller <mtmiller@octave.org>
parents:
24077
diff
changeset
|
1777 ac_status=$? |
e2dc75c661ac
configure: add a command-line option '--without-freetype' to disable FreeType
Mike Miller <mtmiller@octave.org>
parents:
24077
diff
changeset
|
1778 if test "$ac_status" = 0; then |
e2dc75c661ac
configure: add a command-line option '--without-freetype' to disable FreeType
Mike Miller <mtmiller@octave.org>
parents:
24077
diff
changeset
|
1779 AC_MSG_RESULT(yes) |
e2dc75c661ac
configure: add a command-line option '--without-freetype' to disable FreeType
Mike Miller <mtmiller@octave.org>
parents:
24077
diff
changeset
|
1780 AC_DEFINE(HAVE_FREETYPE, 1, [Define to 1 if Freetype is available.]) |
e2dc75c661ac
configure: add a command-line option '--without-freetype' to disable FreeType
Mike Miller <mtmiller@octave.org>
parents:
24077
diff
changeset
|
1781 save_LIBS="$LIBS" |
e2dc75c661ac
configure: add a command-line option '--without-freetype' to disable FreeType
Mike Miller <mtmiller@octave.org>
parents:
24077
diff
changeset
|
1782 LIBS="$FT2_LIBS $LIBS" |
e2dc75c661ac
configure: add a command-line option '--without-freetype' to disable FreeType
Mike Miller <mtmiller@octave.org>
parents:
24077
diff
changeset
|
1783 AC_CHECK_FUNCS([FT_Reference_Face]) |
e2dc75c661ac
configure: add a command-line option '--without-freetype' to disable FreeType
Mike Miller <mtmiller@octave.org>
parents:
24077
diff
changeset
|
1784 LIBS="$save_LIBS" |
e2dc75c661ac
configure: add a command-line option '--without-freetype' to disable FreeType
Mike Miller <mtmiller@octave.org>
parents:
24077
diff
changeset
|
1785 else |
e2dc75c661ac
configure: add a command-line option '--without-freetype' to disable FreeType
Mike Miller <mtmiller@octave.org>
parents:
24077
diff
changeset
|
1786 AC_MSG_RESULT(no) |
e2dc75c661ac
configure: add a command-line option '--without-freetype' to disable FreeType
Mike Miller <mtmiller@octave.org>
parents:
24077
diff
changeset
|
1787 warn_freetype="FreeType library >= 9.03 not found. OpenGL graphics will not be fully functional." |
e2dc75c661ac
configure: add a command-line option '--without-freetype' to disable FreeType
Mike Miller <mtmiller@octave.org>
parents:
24077
diff
changeset
|
1788 fi], |
e2dc75c661ac
configure: add a command-line option '--without-freetype' to disable FreeType
Mike Miller <mtmiller@octave.org>
parents:
24077
diff
changeset
|
1789 [warn_freetype="FreeType library not found. OpenGL graphics will not be fully functional."]) |
e2dc75c661ac
configure: add a command-line option '--without-freetype' to disable FreeType
Mike Miller <mtmiller@octave.org>
parents:
24077
diff
changeset
|
1790 fi |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1791 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1792 if test -n "$warn_freetype"; then |
25671
19eba00c0c7d
if freetype detection fails, unset FT2_* config variables (bug #54369)
John W. Eaton <jwe@octave.org>
parents:
25607
diff
changeset
|
1793 FT2_CFLAGS= |
19eba00c0c7d
if freetype detection fails, unset FT2_* config variables (bug #54369)
John W. Eaton <jwe@octave.org>
parents:
25607
diff
changeset
|
1794 FT2_LIBS= |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1795 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
|
1796 else |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1797 dnl Alias CPPFLAGS to CFLAGS. This is closer to the true meaning |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1798 dnl of `pkg-config --cflags` output. |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
1799 FT2_CPPFLAGS="$FT2_CFLAGS" |
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
1800 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
|
1801 fi |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1802 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1803 ## Check for fontconfig library |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1804 |
23018
50b9eb1fb5fb
* configure.ac: Use OCTAVE_CHECK_LIB to check for fontconfig library.
John W. Eaton <jwe@octave.org>
parents:
23016
diff
changeset
|
1805 OCTAVE_CHECK_LIB(fontconfig, fontconfig, |
50b9eb1fb5fb
* configure.ac: Use OCTAVE_CHECK_LIB to check for fontconfig library.
John W. Eaton <jwe@octave.org>
parents:
23016
diff
changeset
|
1806 [Fontconfig library not found. OpenGL graphics will not be fully functional.], |
50b9eb1fb5fb
* configure.ac: Use OCTAVE_CHECK_LIB to check for fontconfig library.
John W. Eaton <jwe@octave.org>
parents:
23016
diff
changeset
|
1807 [fontconfig.h fontconfig/fontconfig.h], [FcInit], |
50b9eb1fb5fb
* configure.ac: Use OCTAVE_CHECK_LIB to check for fontconfig library.
John W. Eaton <jwe@octave.org>
parents:
23016
diff
changeset
|
1808 [], [don't use fontconfig library, OpenGL graphics will not be fully functional]) |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1809 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1810 ## Check for gl2ps which is required for printing with OpenGL graphics. |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1811 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1812 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
|
1813 [GL2PS_LIBS="-lgl2ps"], |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1814 [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
|
1815 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1816 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
|
1817 OCTAVE_CONFIGURE_WARNING([warn_gl2ps]) |
22759
39f39eb4e476
Implement "linejoin" property (bug #48387)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
22755
diff
changeset
|
1818 else |
39f39eb4e476
Implement "linejoin" property (bug #48387)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
22755
diff
changeset
|
1819 save_LIBS="$LIBS" |
39f39eb4e476
Implement "linejoin" property (bug #48387)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
22755
diff
changeset
|
1820 LIBS="$GL2PS_LIBS $LIBS" |
39f39eb4e476
Implement "linejoin" property (bug #48387)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
22755
diff
changeset
|
1821 AC_CHECK_FUNCS([gl2psLineJoin]) |
39f39eb4e476
Implement "linejoin" property (bug #48387)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
22755
diff
changeset
|
1822 LIBS="$save_LIBS" |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1823 fi |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1824 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1825 AC_SUBST(GL2PS_LIBS) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1826 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1827 ### GUI/Qt related tests. |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1828 |
22251
d6948923dc9b
Check for Qt 5, then Qt 4.
John W. Eaton <jwe@octave.org>
parents:
22234
diff
changeset
|
1829 QT_VERSIONS="5 4" |
21381 | 1830 |
1831 AC_ARG_WITH([qt], | |
22257
945e7f9c11ff
build: fix configure --without-qt or --with-qt
Mike Miller <mtmiller@octave.org>
parents:
22251
diff
changeset
|
1832 [AS_HELP_STRING([--with-qt=VER], [use the Qt major version VER]) |
945e7f9c11ff
build: fix configure --without-qt or --with-qt
Mike Miller <mtmiller@octave.org>
parents:
22251
diff
changeset
|
1833 dnl Second help string must not be indented for correct alignment |
945e7f9c11ff
build: fix configure --without-qt or --with-qt
Mike Miller <mtmiller@octave.org>
parents:
22251
diff
changeset
|
1834 AS_HELP_STRING([--without-qt], [don't use Qt libraries, disable Qt GUI])], |
945e7f9c11ff
build: fix configure --without-qt or --with-qt
Mike Miller <mtmiller@octave.org>
parents:
22251
diff
changeset
|
1835 [case $withval in |
945e7f9c11ff
build: fix configure --without-qt or --with-qt
Mike Miller <mtmiller@octave.org>
parents:
22251
diff
changeset
|
1836 yes | "") |
945e7f9c11ff
build: fix configure --without-qt or --with-qt
Mike Miller <mtmiller@octave.org>
parents:
22251
diff
changeset
|
1837 ;; |
945e7f9c11ff
build: fix configure --without-qt or --with-qt
Mike Miller <mtmiller@octave.org>
parents:
22251
diff
changeset
|
1838 no) |
945e7f9c11ff
build: fix configure --without-qt or --with-qt
Mike Miller <mtmiller@octave.org>
parents:
22251
diff
changeset
|
1839 QT_VERSIONS= |
945e7f9c11ff
build: fix configure --without-qt or --with-qt
Mike Miller <mtmiller@octave.org>
parents:
22251
diff
changeset
|
1840 warn_qt_disabled="--without-qt specified. The Qt GUI will be disabled." |
945e7f9c11ff
build: fix configure --without-qt or --with-qt
Mike Miller <mtmiller@octave.org>
parents:
22251
diff
changeset
|
1841 OCTAVE_CONFIGURE_WARNING([warn_qt_disabled]) |
945e7f9c11ff
build: fix configure --without-qt or --with-qt
Mike Miller <mtmiller@octave.org>
parents:
22251
diff
changeset
|
1842 ;; |
945e7f9c11ff
build: fix configure --without-qt or --with-qt
Mike Miller <mtmiller@octave.org>
parents:
22251
diff
changeset
|
1843 *) |
945e7f9c11ff
build: fix configure --without-qt or --with-qt
Mike Miller <mtmiller@octave.org>
parents:
22251
diff
changeset
|
1844 QT_VERSIONS="$withval" |
945e7f9c11ff
build: fix configure --without-qt or --with-qt
Mike Miller <mtmiller@octave.org>
parents:
22251
diff
changeset
|
1845 ;; |
945e7f9c11ff
build: fix configure --without-qt or --with-qt
Mike Miller <mtmiller@octave.org>
parents:
22251
diff
changeset
|
1846 esac]) |
945e7f9c11ff
build: fix configure --without-qt or --with-qt
Mike Miller <mtmiller@octave.org>
parents:
22251
diff
changeset
|
1847 |
22823
e2afee0041bf
new configure option, --without-qscintilla
John W. Eaton <jwe@octave.org>
parents:
22763
diff
changeset
|
1848 check_qscintilla=yes |
e2afee0041bf
new configure option, --without-qscintilla
John W. Eaton <jwe@octave.org>
parents:
22763
diff
changeset
|
1849 AC_ARG_WITH([qscintilla], |
e2afee0041bf
new configure option, --without-qscintilla
John W. Eaton <jwe@octave.org>
parents:
22763
diff
changeset
|
1850 [AS_HELP_STRING([--without-qscintilla], [disable QScintilla editor])], |
e2afee0041bf
new configure option, --without-qscintilla
John W. Eaton <jwe@octave.org>
parents:
22763
diff
changeset
|
1851 [if test x"$withval" = xno; then |
e2afee0041bf
new configure option, --without-qscintilla
John W. Eaton <jwe@octave.org>
parents:
22763
diff
changeset
|
1852 check_qscintilla=no |
e2afee0041bf
new configure option, --without-qscintilla
John W. Eaton <jwe@octave.org>
parents:
22763
diff
changeset
|
1853 warn_qscintilla_disabled="--without-qscintilla specified. The GUI editor will be disabled." |
e2afee0041bf
new configure option, --without-qscintilla
John W. Eaton <jwe@octave.org>
parents:
22763
diff
changeset
|
1854 OCTAVE_CONFIGURE_WARNING([warn_qscintilla_disabled]) |
e2afee0041bf
new configure option, --without-qscintilla
John W. Eaton <jwe@octave.org>
parents:
22763
diff
changeset
|
1855 fi]) |
e2afee0041bf
new configure option, --without-qscintilla
John W. Eaton <jwe@octave.org>
parents:
22763
diff
changeset
|
1856 |
22257
945e7f9c11ff
build: fix configure --without-qt or --with-qt
Mike Miller <mtmiller@octave.org>
parents:
22251
diff
changeset
|
1857 OCTAVE_CHECK_QT([$QT_VERSIONS]) |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1858 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1859 ## Default terminal font for the GUI. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1860 |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1861 case $host_os in |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1862 mingw* | msdosmsvc) |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1863 DEFAULT_TERMINAL_FONT="Lucida Console" |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1864 ;; |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1865 *) |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1866 DEFAULT_TERMINAL_FONT="Courier" |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1867 ;; |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1868 esac |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1869 DEFAULT_TERMINAL_FONT_SIZE=10 |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1870 AC_SUBST(DEFAULT_TERMINAL_FONT) |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1871 AC_SUBST(DEFAULT_TERMINAL_FONT_SIZE) |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1872 |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1873 ### Check for FLTK library |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1874 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1875 check_fltk=yes |
21512
79aa496c6d47
maint: Fix configure warning messages on missing OpenGL graphics support
Mike Miller <mtmiller@octave.org>
parents:
21480
diff
changeset
|
1876 build_fltk_graphics=no |
79aa496c6d47
maint: Fix configure warning messages on missing OpenGL graphics support
Mike Miller <mtmiller@octave.org>
parents:
21480
diff
changeset
|
1877 |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1878 AC_ARG_WITH([fltk], |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1879 [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
|
1880 [don't use FLTK libraries, disable OpenGL graphics with FLTK widgets])], |
21381 | 1881 [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
|
1882 check_fltk=no |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1883 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
|
1884 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
|
1885 fi]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1886 |
19733
08033d583435
more consistently use _CPPFLAGS and _LDFLAGS variables
John W. Eaton <jwe@octave.org>
parents:
19732
diff
changeset
|
1887 FLTK_CPPFLAGS= |
08033d583435
more consistently use _CPPFLAGS and _LDFLAGS variables
John W. Eaton <jwe@octave.org>
parents:
19732
diff
changeset
|
1888 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
|
1889 FLTK_LIBS= |
10571
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1890 |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1891 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
|
1892 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
|
1893 [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
|
1894 [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
|
1895 [fltk_prefix="$withval"], |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1896 [fltk_prefix=""]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1897 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1898 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
|
1899 [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
|
1900 [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
|
1901 [fltk_exec_prefix="$withval"], |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1902 [fltk_exec_prefix=""]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1903 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1904 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
|
1905 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
|
1906 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
|
1907 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
|
1908 fi |
18025
7c0f59b688fc
configure.ac: Check for Xft library before building native graphics.
Rik <rik@octave.org>
parents:
17989
diff
changeset
|
1909 fi |
7c0f59b688fc
configure.ac: Check for Xft library before building native graphics.
Rik <rik@octave.org>
parents:
17989
diff
changeset
|
1910 |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1911 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
|
1912 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
|
1913 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
|
1914 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
|
1915 fi |
18025
7c0f59b688fc
configure.ac: Check for Xft library before building native graphics.
Rik <rik@octave.org>
parents:
17989
diff
changeset
|
1916 fi |
7c0f59b688fc
configure.ac: Check for Xft library before building native graphics.
Rik <rik@octave.org>
parents:
17989
diff
changeset
|
1917 |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1918 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
|
1919 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1920 warn_fltk_config= |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1921 warn_fltk_opengl= |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1922 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1923 if test "$FLTK_CONFIG" = no; then |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1924 warn_fltk_config="FLTK config script not found. FLTK toolkit will be disabled." |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1925 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
|
1926 else |
21984
6187b9ce8477
build: Only include -I preprocessor options in FLTK_CPPFLAGS (bug #48302)
Mike Miller <mtmiller@octave.org>
parents:
21949
diff
changeset
|
1927 ## 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
|
1928 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
|
1929 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
|
1930 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
|
1931 -I*) |
6187b9ce8477
build: Only include -I preprocessor options in FLTK_CPPFLAGS (bug #48302)
Mike Miller <mtmiller@octave.org>
parents:
21949
diff
changeset
|
1932 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
|
1933 ;; |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1934 esac |
21984
6187b9ce8477
build: Only include -I preprocessor options in FLTK_CPPFLAGS (bug #48302)
Mike Miller <mtmiller@octave.org>
parents:
21949
diff
changeset
|
1935 done |
25213
7f6b4483468d
configure.ac: Strip any spaces from start of FLTK_XXX variables.
Rik <rik@octave.org>
parents:
25208
diff
changeset
|
1936 FLTK_CPPFLAGS=`echo "$FLTK_CPPFLAGS" | $SED -e 's/^ \+//'` |
7f6b4483468d
configure.ac: Strip any spaces from start of FLTK_XXX variables.
Rik <rik@octave.org>
parents:
25208
diff
changeset
|
1937 |
23939
fd6b1339689f
build: set FLTK_LIBS properly by splitting FLTK_LDFLAGS
Mike Miller <mtmiller@octave.org>
parents:
23836
diff
changeset
|
1938 ## Split -L and -l options into FLTK_LDFLAGS and FLTK_LIBS |
fd6b1339689f
build: set FLTK_LIBS properly by splitting FLTK_LDFLAGS
Mike Miller <mtmiller@octave.org>
parents:
23836
diff
changeset
|
1939 fltk_ldflags=`$FLTK_CONFIG $fltkconf_args --use-gl --ldflags` |
fd6b1339689f
build: set FLTK_LIBS properly by splitting FLTK_LDFLAGS
Mike Miller <mtmiller@octave.org>
parents:
23836
diff
changeset
|
1940 for fltk_option in $fltk_ldflags; do |
fd6b1339689f
build: set FLTK_LIBS properly by splitting FLTK_LDFLAGS
Mike Miller <mtmiller@octave.org>
parents:
23836
diff
changeset
|
1941 case $fltk_option in |
fd6b1339689f
build: set FLTK_LIBS properly by splitting FLTK_LDFLAGS
Mike Miller <mtmiller@octave.org>
parents:
23836
diff
changeset
|
1942 -l*) |
fd6b1339689f
build: set FLTK_LIBS properly by splitting FLTK_LDFLAGS
Mike Miller <mtmiller@octave.org>
parents:
23836
diff
changeset
|
1943 FLTK_LIBS="$FLTK_LIBS $fltk_option" |
fd6b1339689f
build: set FLTK_LIBS properly by splitting FLTK_LDFLAGS
Mike Miller <mtmiller@octave.org>
parents:
23836
diff
changeset
|
1944 ;; |
fd6b1339689f
build: set FLTK_LIBS properly by splitting FLTK_LDFLAGS
Mike Miller <mtmiller@octave.org>
parents:
23836
diff
changeset
|
1945 *) |
fd6b1339689f
build: set FLTK_LIBS properly by splitting FLTK_LDFLAGS
Mike Miller <mtmiller@octave.org>
parents:
23836
diff
changeset
|
1946 FLTK_LDFLAGS="$FLTK_LDFLAGS $fltk_option" |
fd6b1339689f
build: set FLTK_LIBS properly by splitting FLTK_LDFLAGS
Mike Miller <mtmiller@octave.org>
parents:
23836
diff
changeset
|
1947 ;; |
fd6b1339689f
build: set FLTK_LIBS properly by splitting FLTK_LDFLAGS
Mike Miller <mtmiller@octave.org>
parents:
23836
diff
changeset
|
1948 esac |
fd6b1339689f
build: set FLTK_LIBS properly by splitting FLTK_LDFLAGS
Mike Miller <mtmiller@octave.org>
parents:
23836
diff
changeset
|
1949 done |
25213
7f6b4483468d
configure.ac: Strip any spaces from start of FLTK_XXX variables.
Rik <rik@octave.org>
parents:
25208
diff
changeset
|
1950 FLTK_LIBS=`echo "$FLTK_LIBS" | $SED -e 's/^ \+//'` |
7f6b4483468d
configure.ac: Strip any spaces from start of FLTK_XXX variables.
Rik <rik@octave.org>
parents:
25208
diff
changeset
|
1951 FLTK_LDFLAGS=`echo "$FLTK_LDFLAGS" | $SED -e 's/^ \+//'` |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1952 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1953 case $host_os in |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1954 mingw*) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1955 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
|
1956 ;; |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1957 esac |
21802
66972e1679df
configure.ac: Fix check for OpenGL support in FLTK
Andreas Weber <andy.weber.aw@gmail.com>
parents:
21724
diff
changeset
|
1958 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
|
1959 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
|
1960 [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
|
1961 [save_CPPFLAGS="$CPPFLAGS" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1962 CPPFLAGS="$CFLAGS $FLTK_CPPFLAGS" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1963 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
|
1964 #include <FL/gl.h> |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1965 ]], [[ |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1966 int nothing = 0; |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1967 ]])], |
21802
66972e1679df
configure.ac: Fix check for OpenGL support in FLTK
Andreas Weber <andy.weber.aw@gmail.com>
parents:
21724
diff
changeset
|
1968 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
|
1969 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
|
1970 CPPFLAGS="$save_CPPFLAGS" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1971 ]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1972 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
|
1973 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
|
1974 else |
21512
79aa496c6d47
maint: Fix configure warning messages on missing OpenGL graphics support
Mike Miller <mtmiller@octave.org>
parents:
21480
diff
changeset
|
1975 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
|
1976 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
|
1977 fi |
21802
66972e1679df
configure.ac: Fix check for OpenGL support in FLTK
Andreas Weber <andy.weber.aw@gmail.com>
parents:
21724
diff
changeset
|
1978 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
|
1979 |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1980 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
|
1981 OCTAVE_CONFIGURE_WARNING([warn_fltk_opengl]) |
10571
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1982 fi |
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1983 fi |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1984 fi |
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1985 |
19733
08033d583435
more consistently use _CPPFLAGS and _LDFLAGS variables
John W. Eaton <jwe@octave.org>
parents:
19732
diff
changeset
|
1986 AC_SUBST(FLTK_CPPFLAGS) |
08033d583435
more consistently use _CPPFLAGS and _LDFLAGS variables
John W. Eaton <jwe@octave.org>
parents:
19732
diff
changeset
|
1987 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
|
1988 AC_SUBST(FLTK_LIBS) |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1989 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1990 ### Final determination of whether OpenGL graphics can be built |
21512
79aa496c6d47
maint: Fix configure warning messages on missing OpenGL graphics support
Mike Miller <mtmiller@octave.org>
parents:
21480
diff
changeset
|
1991 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
|
1992 opengl_graphics=no |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1993 else |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1994 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
|
1995 fi |
19703
a81177f4bfe6
Add __osmesa_print__.cc for offscreen rendering with OpenGL
Andreas Weber <andy.weber.aw@gmail.com>
parents:
19697
diff
changeset
|
1996 |
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
|
1997 ### Check for the qrupdate library |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1998 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1999 dnl No need to adjust FFLAGS because only link is attempted. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2000 dnl 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
|
2001 save_LIBS="$LIBS" |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2002 LIBS="$LAPACK_LIBS $BLAS_LIBS $FLIBS $LIBS" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2003 OCTAVE_CHECK_LIB(qrupdate, qrupdate, |
9571
263a8ed419b0
configure.in: style fixes for messages
John W. Eaton <jwe@octave.org>
parents:
9570
diff
changeset
|
2004 [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
|
2005 [], |
9707
6f5c4c82c5fc
avoid ugly F77 names in configure
Jaroslav Hajek <highegg@gmail.com>
parents:
9648
diff
changeset
|
2006 [sqr1up], |
6f5c4c82c5fc
avoid ugly F77 names in configure
Jaroslav Hajek <highegg@gmail.com>
parents:
9648
diff
changeset
|
2007 [Fortran 77], [don't use qrupdate, disable QR & Cholesky updating functions]) |
9708 | 2008 |
19349
043440fa7006
configure.ac: Respect without-z and without-qrupdate options when config.cache exists.
Rik <rik@octave.org>
parents:
19344
diff
changeset
|
2009 ## 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
|
2010 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
|
2011 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
|
2012 [octave_cv_func_slup1up], |
01c4f5d8a656
configure.ac: Cache results for QRUPDATE_LUU autoconf test.
Rik <rik@octave.org>
parents:
15350
diff
changeset
|
2013 [LIBS="$LIBS $QRUPDATE_LIBS" |
01c4f5d8a656
configure.ac: Cache results for QRUPDATE_LUU autoconf test.
Rik <rik@octave.org>
parents:
15350
diff
changeset
|
2014 AC_LANG_PUSH([Fortran 77]) |
01c4f5d8a656
configure.ac: Cache results for QRUPDATE_LUU autoconf test.
Rik <rik@octave.org>
parents:
15350
diff
changeset
|
2015 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
|
2016 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
|
2017 AC_LANG_POP([Fortran 77]) |
01c4f5d8a656
configure.ac: Cache results for QRUPDATE_LUU autoconf test.
Rik <rik@octave.org>
parents:
15350
diff
changeset
|
2018 ]) |
01c4f5d8a656
configure.ac: Cache results for QRUPDATE_LUU autoconf test.
Rik <rik@octave.org>
parents:
15350
diff
changeset
|
2019 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
|
2020 AC_DEFINE(HAVE_QRUPDATE_LUU, 1, [Define to 1 if qrupdate supports LU updates.]) |
9708 | 2021 fi |
2022 fi | |
9570
1ab56c73ec7c
use OCTAVE_CHECK_LIBRARY to check for qrupdate library
John W. Eaton <jwe@octave.org>
parents:
9568
diff
changeset
|
2023 LIBS="$save_LIBS" |
8547
d66c9b6e506a
imported patch qrupdate.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8417
diff
changeset
|
2024 |
21131
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
2025 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
|
2026 CHOLMOD_TAG="_l_" |
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
2027 CXSPARSE_TAG="_dl_" |
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
2028 UMFPACK_TAG="_zl_" |
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
2029 else |
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
2030 CHOLMOD_TAG="_" |
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
2031 CXSPARSE_TAG="_di_" |
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
2032 UMFPACK_TAG="_zi_" |
20712
4a25c398ffa2
configure option to build with address sanitizer (bugg #46449)
John W. Eaton <jwe@octave.org>
parents:
20677
diff
changeset
|
2033 fi |
4a25c398ffa2
configure option to build with address sanitizer (bugg #46449)
John W. Eaton <jwe@octave.org>
parents:
20677
diff
changeset
|
2034 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2035 ## On some systems, explicitly linking with -lsuitesparseconfig is needed |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2036 ## when using SuiteSparse libraries. If so, the checks below for specific |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2037 ## SuiteSparse libraries may fail without it. Include LIB_CLOCK_GETTIME (from |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2038 ## gnulib) on systems where needed. |
23990
6f56efc098bd
check for suitesparse config library before other suitesparse libraries
John W. Eaton <jwe@octave.org>
parents:
23989
diff
changeset
|
2039 |
6f56efc098bd
check for suitesparse config library before other suitesparse libraries
John W. Eaton <jwe@octave.org>
parents:
23989
diff
changeset
|
2040 save_LIBS="$LIBS" |
23993
49e37560e0fe
configure: rely on gnulib for detection of clock_gettime
Mike Miller <mtmiller@octave.org>
parents:
23992
diff
changeset
|
2041 LIBS="$LIB_CLOCK_GETTIME $LIBS" |
23990
6f56efc098bd
check for suitesparse config library before other suitesparse libraries
John W. Eaton <jwe@octave.org>
parents:
23989
diff
changeset
|
2042 OCTAVE_CHECK_LIB(suitesparseconfig, SUITESPARSECONFIG, |
6f56efc098bd
check for suitesparse config library before other suitesparse libraries
John W. Eaton <jwe@octave.org>
parents:
23989
diff
changeset
|
2043 [], [], [SuiteSparse_time], [], |
6f56efc098bd
check for suitesparse config library before other suitesparse libraries
John W. Eaton <jwe@octave.org>
parents:
23989
diff
changeset
|
2044 [don't link directly with suitesparseconfig library]) |
6f56efc098bd
check for suitesparse config library before other suitesparse libraries
John W. Eaton <jwe@octave.org>
parents:
23989
diff
changeset
|
2045 LIBS="$save_LIBS" |
6f56efc098bd
check for suitesparse config library before other suitesparse libraries
John W. Eaton <jwe@octave.org>
parents:
23989
diff
changeset
|
2046 |
23993
49e37560e0fe
configure: rely on gnulib for detection of clock_gettime
Mike Miller <mtmiller@octave.org>
parents:
23992
diff
changeset
|
2047 if test -n "$SUITESPARSECONFIG_LIBS" && test -n "$LIB_CLOCK_GETTIME"; then |
49e37560e0fe
configure: rely on gnulib for detection of clock_gettime
Mike Miller <mtmiller@octave.org>
parents:
23992
diff
changeset
|
2048 SUITESPARSECONFIG_LIBS="$SUITESPARSECONFIG_LIBS $LIB_CLOCK_GETTIME" |
23990
6f56efc098bd
check for suitesparse config library before other suitesparse libraries
John W. Eaton <jwe@octave.org>
parents:
23989
diff
changeset
|
2049 fi |
6f56efc098bd
check for suitesparse config library before other suitesparse libraries
John W. Eaton <jwe@octave.org>
parents:
23989
diff
changeset
|
2050 |
6f56efc098bd
check for suitesparse config library before other suitesparse libraries
John W. Eaton <jwe@octave.org>
parents:
23989
diff
changeset
|
2051 ### Reset below, after all checks for SuiteSparse libraries. |
6f56efc098bd
check for suitesparse config library before other suitesparse libraries
John W. Eaton <jwe@octave.org>
parents:
23989
diff
changeset
|
2052 suitesparse_save_LIBS="$LIBS" |
6f56efc098bd
check for suitesparse config library before other suitesparse libraries
John W. Eaton <jwe@octave.org>
parents:
23989
diff
changeset
|
2053 LIBS="$SUITESPARSECONFIG_LIBS $LIBS" |
6f56efc098bd
check for suitesparse config library before other suitesparse libraries
John W. Eaton <jwe@octave.org>
parents:
23989
diff
changeset
|
2054 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
2055 ### Check for AMD library |
7619 | 2056 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2057 OCTAVE_CHECK_LIB(amd, AMD, |
9571
263a8ed419b0
configure.in: style fixes for messages
John W. Eaton <jwe@octave.org>
parents:
9570
diff
changeset
|
2058 [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
|
2059 [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
|
2060 [amd_postorder], |
10003
2ea3110e15ed
Use M4 quoting for arguments to autoconf macros containing variables
Rik <rdrider0-list@yahoo.com>
parents:
9989
diff
changeset
|
2061 [], [don't use AMD library, disable some sparse matrix functionality]) |
5451 | 2062 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
2063 ### Check for CAMD library |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
2064 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2065 OCTAVE_CHECK_LIB(camd, CAMD, |
9571
263a8ed419b0
configure.in: style fixes for messages
John W. Eaton <jwe@octave.org>
parents:
9570
diff
changeset
|
2066 [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
|
2067 [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
|
2068 [camd_postorder], |
10003
2ea3110e15ed
Use M4 quoting for arguments to autoconf macros containing variables
Rik <rdrider0-list@yahoo.com>
parents:
9989
diff
changeset
|
2069 [], [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
|
2070 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
2071 ### Check for COLAMD library |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
2072 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2073 OCTAVE_CHECK_LIB(colamd, COLAMD, |
9571
263a8ed419b0
configure.in: style fixes for messages
John W. Eaton <jwe@octave.org>
parents:
9570
diff
changeset
|
2074 [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
|
2075 [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
|
2076 [colamd], |
10003
2ea3110e15ed
Use M4 quoting for arguments to autoconf macros containing variables
Rik <rdrider0-list@yahoo.com>
parents:
9989
diff
changeset
|
2077 [], [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
|
2078 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
2079 ### Check for CCOLAMD library |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
2080 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2081 OCTAVE_CHECK_LIB(ccolamd, CCOLAMD, |
9571
263a8ed419b0
configure.in: style fixes for messages
John W. Eaton <jwe@octave.org>
parents:
9570
diff
changeset
|
2082 [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
|
2083 [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
|
2084 [ccolamd], |
10003
2ea3110e15ed
Use M4 quoting for arguments to autoconf macros containing variables
Rik <rdrider0-list@yahoo.com>
parents:
9989
diff
changeset
|
2085 [], [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
|
2086 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
2087 ### Check for CHOLMOD library. |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2088 ### If your cholmod library requires cblas, then you will need to configure |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2089 ### with --with-cholmod="-lcholmod -lcblas". |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
2090 |
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
2091 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
|
2092 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
|
2093 OCTAVE_CHECK_LIB(cholmod, CHOLMOD, |
9571
263a8ed419b0
configure.in: style fixes for messages
John W. Eaton <jwe@octave.org>
parents:
9570
diff
changeset
|
2094 [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
|
2095 [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
|
2096 [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
|
2097 [], [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
|
2098 LIBS="$save_LIBS" |
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
2099 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
2100 ### Check for CXSparse library |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
2101 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2102 OCTAVE_CHECK_LIB(cxsparse, CXSparse, |
9571
263a8ed419b0
configure.in: style fixes for messages
John W. Eaton <jwe@octave.org>
parents:
9570
diff
changeset
|
2103 [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
|
2104 [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
|
2105 [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
|
2106 [C++], [don't use CXSparse library, disable some sparse matrix functionality]) |
6024 | 2107 |
25309
7d32780f4dea
avoid syntax error in configure if cxsparse is missing
John W. Eaton <jwe@octave.org>
parents:
25295
diff
changeset
|
2108 if test -z "$warn_cxsparse"; then |
7d32780f4dea
avoid syntax error in configure if cxsparse is missing
John W. Eaton <jwe@octave.org>
parents:
25295
diff
changeset
|
2109 ## Additional check for CXSparse version >= 2.2 |
7d32780f4dea
avoid syntax error in configure if cxsparse is missing
John W. Eaton <jwe@octave.org>
parents:
25295
diff
changeset
|
2110 if test $octave_cv_lib_cxsparse = yes; then |
7d32780f4dea
avoid syntax error in configure if cxsparse is missing
John W. Eaton <jwe@octave.org>
parents:
25295
diff
changeset
|
2111 OCTAVE_CHECK_CXSPARSE_VERSION_OK |
7d32780f4dea
avoid syntax error in configure if cxsparse is missing
John W. Eaton <jwe@octave.org>
parents:
25295
diff
changeset
|
2112 if test $octave_cv_cxsparse_version_ok = no; then |
7d32780f4dea
avoid syntax error in configure if cxsparse is missing
John W. Eaton <jwe@octave.org>
parents:
25295
diff
changeset
|
2113 AC_MSG_ERROR([CXSparse library is too old (< version 2.2). Upgrade CXSparse (SuiteSparse) or configure Octave with --disable-cxsparse"]) |
7d32780f4dea
avoid syntax error in configure if cxsparse is missing
John W. Eaton <jwe@octave.org>
parents:
25295
diff
changeset
|
2114 fi |
21160
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
2115 fi |
21023
ec532a439c6f
rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
20842
diff
changeset
|
2116 fi |
4626 | 2117 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
2118 ### Check for UMFPACK library. |
5226 | 2119 |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
2120 save_LIBS="$LIBS" |
9787
cc5bb7b5679f
use AMD_CPPFLAGS when checking for UMFPACK
David Grundberg <davidg@cs.umu.se>
parents:
9763
diff
changeset
|
2121 save_CPPFLAGS="$CPPFLAGS" |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
2122 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
|
2123 CPPFLAGS="$AMD_CPPFLAGS $CPPFLAGS" |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2124 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
|
2125 [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
|
2126 [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
|
2127 [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
|
2128 [], [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
|
2129 CPPFLAGS="$save_CPPFLAGS" |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
2130 LIBS="$save_LIBS" |
5512 | 2131 |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
2132 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
|
2133 ## 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
|
2134 $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
|
2135 $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
|
2136 save_LIBS="$LIBS" |
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
2137 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
|
2138 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
|
2139 [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
|
2140 [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
|
2141 [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
|
2142 [], [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
|
2143 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
|
2144 UMFPACK_LIBS="$UMFPACK_LIBS -lcblas" |
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
2145 fi |
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
2146 LIBS="$save_LIBS" |
6133 | 2147 fi |
5513 | 2148 |
23021
6094018f5e72
refactor configure checks for Sundials (bug #50003)
John W. Eaton <jwe@octave.org>
parents:
23018
diff
changeset
|
2149 ### Check for KLU library and header. |
6094018f5e72
refactor configure checks for Sundials (bug #50003)
John W. Eaton <jwe@octave.org>
parents:
23018
diff
changeset
|
2150 |
6094018f5e72
refactor configure checks for Sundials (bug #50003)
John W. Eaton <jwe@octave.org>
parents:
23018
diff
changeset
|
2151 OCTAVE_CHECK_LIB(klu, KLU, |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2152 [KLU library not found. This will result in some lack of functionality for sparse matrices.], |
23021
6094018f5e72
refactor configure checks for Sundials (bug #50003)
John W. Eaton <jwe@octave.org>
parents:
23018
diff
changeset
|
2153 [suitesparse/klu.h ufsparse/klu.h klu/klu.h klu.h], [klu_solve], |
6094018f5e72
refactor configure checks for Sundials (bug #50003)
John W. Eaton <jwe@octave.org>
parents:
23018
diff
changeset
|
2154 [], [don't use KLU library, disable some sparse matrix functionality]) |
6094018f5e72
refactor configure checks for Sundials (bug #50003)
John W. Eaton <jwe@octave.org>
parents:
23018
diff
changeset
|
2155 |
23990
6f56efc098bd
check for suitesparse config library before other suitesparse libraries
John W. Eaton <jwe@octave.org>
parents:
23989
diff
changeset
|
2156 ### SUITESPARSECONFIG_LIBS added to LIBS above. |
6f56efc098bd
check for suitesparse config library before other suitesparse libraries
John W. Eaton <jwe@octave.org>
parents:
23989
diff
changeset
|
2157 LIBS="$suitesparse_save_LIBS" |
5226 | 2158 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2159 ## Collections of flags. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2160 dnl These are here instead of just in the Makefile.am file because we |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2161 dnl substitute some of them into other source files like mkoctfile. |
23389
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
2162 |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
2163 ## Order matters, at least on some systems (Cygwin, for example). |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
2164 |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
2165 SPARSE_XCPPFLAGS="$CHOLMOD_CPPFLAGS $UMFPACK_CPPFLAGS $AMD_CPPFLAGS $CAMD_CPPFLAGS $COLAMD_CPPFLAGS $CCOLAMD_CPPFLAGS $CXSPARSE_CPPFLAGS" |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
2166 |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
2167 SPARSE_XLDFLAGS="$CHOLMOD_LDFLAGS $UMFPACK_LDFLAGS $AMD_LDFLAGS $CAMD_LDFLAGS $COLAMD_LDFLAGS $CCOLAMD_LDFLAGS $CXSPARSE_LDFLAGS" |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
2168 |
23990
6f56efc098bd
check for suitesparse config library before other suitesparse libraries
John W. Eaton <jwe@octave.org>
parents:
23989
diff
changeset
|
2169 SPARSE_XLIBS="$CHOLMOD_LIBS $UMFPACK_LIBS $AMD_LIBS $CAMD_LIBS $COLAMD_LIBS $CCOLAMD_LIBS $CXSPARSE_LIBS $SUITESPARSECONFIG_LIBS" |
23389
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
2170 |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
2171 AC_SUBST(SPARSE_XCPPFLAGS) |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
2172 AC_SUBST(SPARSE_XLDFLAGS) |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
2173 AC_SUBST(SPARSE_XLIBS) |
5226 | 2174 |
22501
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2175 ## Check for UMFPACK separately split complex matrix and RHS. |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2176 if test -n "$UMFPACK_LIBS"; then |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2177 save_CPPFLAGS="$CPPFLAGS" |
23389
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
2178 save_LDFLAGS="$LDFLAGS"; |
22501
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2179 save_LIBS="$LIBS"; |
23389
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
2180 |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
2181 CPPFLAGS="$SPARSE_XCPPFLAGS $CPPFLAGS" |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
2182 LDFLAGS="$SPARSE_XLDFLAGS $LDFLAGS" |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
2183 LIBS="$SPARSE_XLIBS $LAPACK_LIBS $BLAS_LIBS $FLIBS $LIBS $xtra_libs" |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
2184 |
22501
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2185 OCTAVE_UMFPACK_SEPARATE_SPLIT |
23389
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
2186 |
22501
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2187 CPPFLAGS="$save_CPPFLAGS" |
23389
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
2188 LDFLAGS="$save_LDFLAGS" |
22501
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2189 LIBS="$save_LIBS" |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2190 fi |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2191 |
23981
6420142ff32c
configure: fix capitalization of SUNDIALS, reword related terms
Mike Miller <mtmiller@octave.org>
parents:
23980
diff
changeset
|
2192 ### Check for SUNDIALS NVECTOR serial library and header. |
6420142ff32c
configure: fix capitalization of SUNDIALS, reword related terms
Mike Miller <mtmiller@octave.org>
parents:
23980
diff
changeset
|
2193 |
6420142ff32c
configure: fix capitalization of SUNDIALS, reword related terms
Mike Miller <mtmiller@octave.org>
parents:
23980
diff
changeset
|
2194 OCTAVE_CHECK_LIB(sundials_nvecserial, [SUNDIALS NVECTOR], |
6420142ff32c
configure: fix capitalization of SUNDIALS, reword related terms
Mike Miller <mtmiller@octave.org>
parents:
23980
diff
changeset
|
2195 [SUNDIALS NVECTOR serial library not found. Solvers ode15i and ode15s will be disabled.], |
23021
6094018f5e72
refactor configure checks for Sundials (bug #50003)
John W. Eaton <jwe@octave.org>
parents:
23018
diff
changeset
|
2196 [nvector/nvector_serial.h nvector_serial.h ], [N_VNew_Serial], |
23981
6420142ff32c
configure: fix capitalization of SUNDIALS, reword related terms
Mike Miller <mtmiller@octave.org>
parents:
23980
diff
changeset
|
2197 [], [don't use SUNDIALS NVECTOR library, solvers ode15i and ode15s will be disabled]) |
6420142ff32c
configure: fix capitalization of SUNDIALS, reword related terms
Mike Miller <mtmiller@octave.org>
parents:
23980
diff
changeset
|
2198 |
6420142ff32c
configure: fix capitalization of SUNDIALS, reword related terms
Mike Miller <mtmiller@octave.org>
parents:
23980
diff
changeset
|
2199 ### Check for SUNDIALS IDA library and header. |
23021
6094018f5e72
refactor configure checks for Sundials (bug #50003)
John W. Eaton <jwe@octave.org>
parents:
23018
diff
changeset
|
2200 |
6094018f5e72
refactor configure checks for Sundials (bug #50003)
John W. Eaton <jwe@octave.org>
parents:
23018
diff
changeset
|
2201 save_LIBS="$LIBS" |
23121
0fe35c34fdc2
use $KLU_LIBS in configure check for Sundials IDA library (bug #50167)
John W. Eaton <jwe@octave.org>
parents:
23028
diff
changeset
|
2202 LIBS="$SUNDIALS_NVECSERIAL_LIBS $KLU_LIBS $BLAS_LIBS $FLIBS $LIBS" |
23981
6420142ff32c
configure: fix capitalization of SUNDIALS, reword related terms
Mike Miller <mtmiller@octave.org>
parents:
23980
diff
changeset
|
2203 OCTAVE_CHECK_LIB(sundials_ida, [SUNDIALS IDA], |
6420142ff32c
configure: fix capitalization of SUNDIALS, reword related terms
Mike Miller <mtmiller@octave.org>
parents:
23980
diff
changeset
|
2204 [SUNDIALS IDA library not found. Solvers ode15i and ode15s will be disabled.], |
23021
6094018f5e72
refactor configure checks for Sundials (bug #50003)
John W. Eaton <jwe@octave.org>
parents:
23018
diff
changeset
|
2205 [ida/ida.h ida.h], [IDAInit], |
23981
6420142ff32c
configure: fix capitalization of SUNDIALS, reword related terms
Mike Miller <mtmiller@octave.org>
parents:
23980
diff
changeset
|
2206 [], [don't use SUNDIALS IDA library, solvers ode15i and ode15s will be disabled], |
23021
6094018f5e72
refactor configure checks for Sundials (bug #50003)
John W. Eaton <jwe@octave.org>
parents:
23018
diff
changeset
|
2207 [warn_sundials_ida= |
23980
eb6602171d59
configure: make SUNDIALS double precision test cross-compile-safe (bug #51904)
Mike Miller <mtmiller@octave.org>
parents:
23939
diff
changeset
|
2208 OCTAVE_CHECK_SUNDIALS_SIZEOF_REALTYPE |
26897
ee6300e77c92
Update detection of sundials in the build system (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26806
diff
changeset
|
2209 OCTAVE_CHECK_SUNDIALS_SUNLINSOL_DENSE |
ee6300e77c92
Update detection of sundials in the build system (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26806
diff
changeset
|
2210 OCTAVE_CHECK_SUNDIALS_SUNLINSOL_KLU]) |
23021
6094018f5e72
refactor configure checks for Sundials (bug #50003)
John W. Eaton <jwe@octave.org>
parents:
23018
diff
changeset
|
2211 LIBS="$save_LIBS" |
6094018f5e72
refactor configure checks for Sundials (bug #50003)
John W. Eaton <jwe@octave.org>
parents:
23018
diff
changeset
|
2212 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2213 dnl Define this way instead of with an #if in oct-conf-post.h so that |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2214 dnl the build features script will get the correct value. |
26906
73b141d5a888
improve configure checks for sundials (bug #55911)
John W. Eaton <jwe@octave.org>
parents:
26897
diff
changeset
|
2215 dnl |
73b141d5a888
improve configure checks for sundials (bug #55911)
John W. Eaton <jwe@octave.org>
parents:
26897
diff
changeset
|
2216 dnl The test on the sunlinsol_klu.h header is a bit of a kluge. |
73b141d5a888
improve configure checks for sundials (bug #55911)
John W. Eaton <jwe@octave.org>
parents:
26897
diff
changeset
|
2217 dnl How can we do a better job here? Do we need to disable sundials |
73b141d5a888
improve configure checks for sundials (bug #55911)
John W. Eaton <jwe@octave.org>
parents:
26897
diff
changeset
|
2218 dnl any tests fail, or can we fix __ode15__.cc so that it still partially |
73b141d5a888
improve configure checks for sundials (bug #55911)
John W. Eaton <jwe@octave.org>
parents:
26897
diff
changeset
|
2219 dnl works when some things are missing (for example, KLU)? |
23028
89bb27d4f32f
move definition of HAVE_SUNDIALS from oct-conf-post.h to config.h
John W. Eaton <jwe@octave.org>
parents:
23021
diff
changeset
|
2220 if test -n "$SUNDIALS_IDA_LIBS" \ |
89bb27d4f32f
move definition of HAVE_SUNDIALS from oct-conf-post.h to config.h
John W. Eaton <jwe@octave.org>
parents:
23021
diff
changeset
|
2221 && test -n "$SUNDIALS_NVECSERIAL_LIBS" \ |
26897
ee6300e77c92
Update detection of sundials in the build system (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26806
diff
changeset
|
2222 && test $octave_cv_sundials_sunlinsol_dense = yes \ |
23980
eb6602171d59
configure: make SUNDIALS double precision test cross-compile-safe (bug #51904)
Mike Miller <mtmiller@octave.org>
parents:
23939
diff
changeset
|
2223 && test $octave_cv_sundials_realtype_is_double = yes; then |
23981
6420142ff32c
configure: fix capitalization of SUNDIALS, reword related terms
Mike Miller <mtmiller@octave.org>
parents:
23980
diff
changeset
|
2224 AC_DEFINE(HAVE_SUNDIALS, 1, [Define to 1 if SUNDIALS is available.]) |
26906
73b141d5a888
improve configure checks for sundials (bug #55911)
John W. Eaton <jwe@octave.org>
parents:
26897
diff
changeset
|
2225 else |
73b141d5a888
improve configure checks for sundials (bug #55911)
John W. Eaton <jwe@octave.org>
parents:
26897
diff
changeset
|
2226 warn_sundials_disabled="disabling SUNDIALS because something is missing, solvers odee15i and ode15s will be disabled" |
73b141d5a888
improve configure checks for sundials (bug #55911)
John W. Eaton <jwe@octave.org>
parents:
26897
diff
changeset
|
2227 OCTAVE_CONFIGURE_WARNING([warn_sundials_disabled]) |
23021
6094018f5e72
refactor configure checks for Sundials (bug #50003)
John W. Eaton <jwe@octave.org>
parents:
23018
diff
changeset
|
2228 fi |
6094018f5e72
refactor configure checks for Sundials (bug #50003)
John W. Eaton <jwe@octave.org>
parents:
23018
diff
changeset
|
2229 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2230 ## Collections of flags. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2231 dnl These are here instead of just in the Makefile.am file because we |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2232 dnl substitute some of them into other source files like mkoctfile. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2233 |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2234 dnl Order matters, at least on some systems (Cygwin, for example). |
23389
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
2235 |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
2236 SUNDIALS_XCPPFLAGS="$SUNDIALS_IDA_CPPFLAGS $SUNDIALS_NVECSERIAL_CPPFLAGS $KLU_CPPFLAGS" |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
2237 |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
2238 SUNDIALS_XLDFLAGS="$SUNDIALS_IDA_LDFLAGS $SUNDIALS_NVECSERIAL_LDFLAGS $KLU_LDFLAGS" |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
2239 |
26906
73b141d5a888
improve configure checks for sundials (bug #55911)
John W. Eaton <jwe@octave.org>
parents:
26897
diff
changeset
|
2240 SUNDIALS_XLIBS="$SUNDIALS_IDA_LIBS $SUNDIALS_SUNLINSOL_KLU_LIBS $SUNDIALS_NVECSERIAL_LIBS $KLU_LIBS" |
23389
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
2241 |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
2242 AC_SUBST(SUNDIALS_XCPPFLAGS) |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
2243 AC_SUBST(SUNDIALS_XLDFLAGS) |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
2244 AC_SUBST(SUNDIALS_XLIBS) |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
2245 |
26906
73b141d5a888
improve configure checks for sundials (bug #55911)
John W. Eaton <jwe@octave.org>
parents:
26897
diff
changeset
|
2246 save_LIBS="$LIBS" |
73b141d5a888
improve configure checks for sundials (bug #55911)
John W. Eaton <jwe@octave.org>
parents:
26897
diff
changeset
|
2247 LIBS="$SUNDIALS_XLIBS $LIBS" |
73b141d5a888
improve configure checks for sundials (bug #55911)
John W. Eaton <jwe@octave.org>
parents:
26897
diff
changeset
|
2248 ## Current interface: |
73b141d5a888
improve configure checks for sundials (bug #55911)
John W. Eaton <jwe@octave.org>
parents:
26897
diff
changeset
|
2249 AC_CHECK_FUNCS([IDASetJacFn IDASetLinearSolver SUNLinSol_Dense SUNLinSol_KLU]) |
73b141d5a888
improve configure checks for sundials (bug #55911)
John W. Eaton <jwe@octave.org>
parents:
26897
diff
changeset
|
2250 ## Deprecated interface: |
73b141d5a888
improve configure checks for sundials (bug #55911)
John W. Eaton <jwe@octave.org>
parents:
26897
diff
changeset
|
2251 AC_CHECK_HEADERS([ida/ida_direct.h ida_direct.h]) |
73b141d5a888
improve configure checks for sundials (bug #55911)
John W. Eaton <jwe@octave.org>
parents:
26897
diff
changeset
|
2252 AC_CHECK_FUNCS([IDADlsSetJacFn IDADlsSetLinearSolver SUNDenseLinearSolver SUNKLU]) |
73b141d5a888
improve configure checks for sundials (bug #55911)
John W. Eaton <jwe@octave.org>
parents:
26897
diff
changeset
|
2253 LIBS="$save_LIBS" |
73b141d5a888
improve configure checks for sundials (bug #55911)
John W. Eaton <jwe@octave.org>
parents:
26897
diff
changeset
|
2254 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
2255 ### Check for ARPACK library. |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
2256 |
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
|
2257 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
|
2258 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
|
2259 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
|
2260 [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
|
2261 [], |
834df9f10963
remove ARPACK files from sources and restore configure checks for external ARPACK library
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
2262 [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
|
2263 [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
|
2264 [warn_arpack= |
24289
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
2265 OCTAVE_CHECK_LIB_ARPACK_OK_1( |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2266 [AC_DEFINE(HAVE_ARPACK, 1, [Define to 1 if ARPACK is available.])], |
24289
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
2267 [warn_arpack="ARPACK library found, but does not seem to work properly; disabling eigs function"]) |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
2268 if test -z "$warn_arpack"; then |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
2269 OCTAVE_CHECK_LIB_ARPACK_OK_2([], |
24329
740c6a7db92a
configure.ac: Fix regression in detecting ARPACK library in cset f52d91f6ef80.
Rik <rik@octave.org>
parents:
24289
diff
changeset
|
2270 [AC_MSG_WARN([ARPACK library found, but is buggy; upgrade library (>= v3.3.0) for better results])]) |
24289
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
2271 fi |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
2272 ]) |
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
|
2273 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
|
2274 |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2275 ### Check for Java. |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2276 |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2277 build_java=yes |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2278 AC_ARG_ENABLE([java], |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2279 [AS_HELP_STRING([--disable-java], |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2280 [disable Java interface])], |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2281 [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
|
2282 build_java=no |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2283 fi], |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2284 []) |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2285 |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2286 AC_ARG_WITH([java-homedir], |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2287 [AS_HELP_STRING([--with-java-homedir=DIR], |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2288 [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
|
2289 [JAVA_HOMEDIR="$withval"]) |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2290 |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2291 AC_ARG_WITH([java-includedir], |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2292 [AS_HELP_STRING([--with-java-includedir=DIR], |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2293 [look for java 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
|
2294 [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
|
2295 |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2296 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
|
2297 [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
|
2298 [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
|
2299 [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
|
2300 |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2301 ## 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
|
2302 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
|
2303 ## 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
|
2304 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
|
2305 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
|
2306 fi |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2307 JAVA= |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2308 JAVAC= |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2309 JAR= |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2310 JAVA_LIBS= |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2311 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2312 dnl Fake loop so that "break" can be used to skip code blocks. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2313 warn_java= |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2314 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
|
2315 do |
15780
f25101b1e37f
configure.ac: Use build_java as internal script variable rather than HAVE_JAVA.
Rik <rik@octave.org>
parents:
15779
diff
changeset
|
2316 ## 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
|
2317 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
|
2318 |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2319 ## 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
|
2320 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
|
2321 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
|
2322 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
|
2323 fi |
9f3656ada658
configure.ac: Add warning message if JAVA_HOME variable is not set.
Rik <rik@octave.org>
parents:
15756
diff
changeset
|
2324 |
15780
f25101b1e37f
configure.ac: Use build_java as internal script variable rather than HAVE_JAVA.
Rik <rik@octave.org>
parents:
15779
diff
changeset
|
2325 ## 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
|
2326 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
|
2327 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
|
2328 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
|
2329 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
|
2330 fi |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2331 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
|
2332 |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2333 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
|
2334 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
|
2335 break |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2336 fi |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2337 |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2338 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
|
2339 ## 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
|
2340 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
|
2341 ## 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
|
2342 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
|
2343 fi |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2344 |
18030
f0427ca399cc
configure.ac: Remove unused JAVA_HOME_NATIVE variable.
Rik <rik@octave.org>
parents:
18025
diff
changeset
|
2345 case $build_os in |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2346 mingw* | msdosmsvc) |
15846
605488d19cb3
configure.ac: Avoid non-portable sh technique of double-quoted, backtick expressions.
Rik <rik@octave.org>
parents:
15839
diff
changeset
|
2347 ## 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
|
2348 ## 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
|
2349 ## 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
|
2350 ## (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
|
2351 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
|
2352 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
|
2353 fi |
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2354 ;; |
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2355 esac |
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2356 |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2357 ## Amend search path for JAVAC and JAR. |
15836
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2358 if test -z "$JAVA_HOME"; then |
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2359 JAVA_PATH="$PATH" |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2360 else |
15836
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2361 JAVA_PATH="${JAVA_HOME}$PATH_SEPARATOR${JAVA_HOME}/bin$PATH_SEPARATOR${JAVA_HOME}/../bin$PATH_SEPARATOR${PATH}" |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2362 fi |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2363 |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2364 AC_PATH_PROG(JAVAC, javac, [], [$JAVA_PATH]) |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2365 AC_PATH_PROG(JAR, jar, [], [$JAVA_PATH]) |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2366 |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2367 if test -z "$JAVAC" || test -z "$JAR"; then |
18057
37a5e93d6cfd
configure.ac: add warning about disabling java to the final summary.
Carnë Draug <carandraug@octave.org>
parents:
18056
diff
changeset
|
2368 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
|
2369 break |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2370 fi |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2371 |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2372 ## Check Java version is recent enough. |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2373 AC_MSG_CHECKING([for Java version]) |
25078
523298448352
configure.ac: Remove characters after java version string with sed (bug #53531).
Rik <rik@octave.org>
parents:
25054
diff
changeset
|
2374 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
|
2375 AC_MSG_RESULT([$java_version]) |
17661
1978a6c76aa9
Use user-specified SED during build process (bug #40273).
Rik <rik@octave.org>
parents:
17640
diff
changeset
|
2376 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
|
2377 java_minor=[`echo $java_version | $SED -e 's/^\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*$/\2/'`] |
24389
295664c0c922
configure.ac: Fix test for Java version (bug #52617).
Rik <rik@octave.org>
parents:
24374
diff
changeset
|
2378 if test $java_major -gt 1 || (test $java_major -eq 1 && test $java_minor -ge 5); then |
295664c0c922
configure.ac: Fix test for Java version (bug #52617).
Rik <rik@octave.org>
parents:
24374
diff
changeset
|
2379 : # Version is OK. Do nothing. |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2380 else |
17844
e88a8fa25125
configure.ac: add warnings on checking for JAVA to the final summary.
Carnë Draug <carandraug@octave.org>
parents:
17836
diff
changeset
|
2381 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
|
2382 break |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2383 fi |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2384 |
17819
af924e6572cb
build: Don't search path at compile time for jvm on Win32 platforms.
Rik <rik@octave.org>
parents:
17816
diff
changeset
|
2385 ## 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
|
2386 ## 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
|
2387 ## 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
|
2388 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2389 msdosmsvc) |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2390 build_java=yes |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2391 JAVA_LIBS=-ladvapi32 |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2392 AC_DEFINE(HAVE_JAVA, 1, |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2393 [Define to 1 if Java is available and is at least version 1.5]) |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2394 break |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2395 ;; |
17819
af924e6572cb
build: Don't search path at compile time for jvm on Win32 platforms.
Rik <rik@octave.org>
parents:
17816
diff
changeset
|
2396 mingw* | cygwin*) |
af924e6572cb
build: Don't search path at compile time for jvm on Win32 platforms.
Rik <rik@octave.org>
parents:
17816
diff
changeset
|
2397 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
|
2398 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
|
2399 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
|
2400 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
|
2401 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
|
2402 else |
18276
508f67c72854
Fix native MinGW builds with spaces in JAVA_HOME (bug #41024).
Rik <rik@octave.org>
parents:
18273
diff
changeset
|
2403 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
|
2404 fi |
af924e6572cb
build: Don't search path at compile time for jvm on Win32 platforms.
Rik <rik@octave.org>
parents:
17816
diff
changeset
|
2405 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
|
2406 fi |
17819
af924e6572cb
build: Don't search path at compile time for jvm on Win32 platforms.
Rik <rik@octave.org>
parents:
17816
diff
changeset
|
2407 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
|
2408 [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
|
2409 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
|
2410 ;; |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2411 esac |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2412 |
20713
2469d78a1d8b
Consistently use 'filename' rather than 'file name' throughout code base.
Rik <rik@octave.org>
parents:
20712
diff
changeset
|
2413 ## 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
|
2414 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2415 darwin*) |
15777
b8bcb2c7f3e8
configure.ac: Search for jvm.dll on MingW/Cygwin platforms for Java.
Rik <rik@octave.org>
parents:
15769
diff
changeset
|
2416 jvmlib=libjvm.dylib |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2417 ;; |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2418 *) |
15777
b8bcb2c7f3e8
configure.ac: Search for jvm.dll on MingW/Cygwin platforms for Java.
Rik <rik@octave.org>
parents:
15769
diff
changeset
|
2419 jvmlib=libjvm.so |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2420 ;; |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2421 esac |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2422 |
15777
b8bcb2c7f3e8
configure.ac: Search for jvm.dll on MingW/Cygwin platforms for Java.
Rik <rik@octave.org>
parents:
15769
diff
changeset
|
2423 AC_MSG_CHECKING([for $jvmlib]) |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2424 |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2425 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
|
2426 ## 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
|
2427 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
|
2428 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
|
2429 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
|
2430 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
|
2431 JAVA_LDPATH=$dir |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2432 break |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2433 fi |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2434 done |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2435 fi |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2436 |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2437 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
|
2438 ## 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
|
2439 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
|
2440 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
|
2441 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
|
2442 if test -f "$dir/$jvmlib"; then |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2443 JAVA_LDPATH=$dir |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2444 break |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2445 fi |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2446 done |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2447 fi |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2448 |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2449 if test -z "$JAVA_LDPATH"; then |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2450 ## 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
|
2451 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
|
2452 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
|
2453 ## 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
|
2454 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
|
2455 ## 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
|
2456 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
|
2457 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
|
2458 if test -f "$dir/$jvmlib"; then |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2459 JAVA_LDPATH=$dir |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2460 break |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2461 fi |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2462 done |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2463 fi |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2464 |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2465 ## 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
|
2466 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
|
2467 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
|
2468 : # libjvm found |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2469 else |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2470 JAVA_LDPATH="" |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
2471 fi |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2472 fi |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2473 |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2474 if test -z "$JAVA_LDPATH"; then |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2475 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
|
2476 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
|
2477 break |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2478 else |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2479 AC_MSG_RESULT([$JAVA_LDPATH]) |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2480 fi |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2481 |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2482 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
|
2483 |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2484 ## 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
|
2485 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2486 darwin*) |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2487 if test -n "$JAVA_CPPFLAGS"; then |
24592
6c3b7ca0cb90
Fix Java >1.8 on macOS (Bug #9439)
Sebastian Schöps <sesc@gmx.de>
parents:
24556
diff
changeset
|
2488 JAVA_CPPFLAGS="-I${JAVA_CPPFLAGS} -I${JAVA_CPPFLAGS}/darwin" |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2489 else |
24592
6c3b7ca0cb90
Fix Java >1.8 on macOS (Bug #9439)
Sebastian Schöps <sesc@gmx.de>
parents:
24556
diff
changeset
|
2490 JAVA_CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/darwin" |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2491 fi |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2492 ;; |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2493 *) |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2494 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
|
2495 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
|
2496 else |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2497 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
|
2498 fi |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2499 ;; |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2500 esac |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2501 |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2502 ## 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
|
2503 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
|
2504 have_jni=no |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
2505 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
|
2506 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
|
2507 done |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2508 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
|
2509 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
|
2510 else |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2511 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
|
2512 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
|
2513 break |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2514 fi |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2515 |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2516 ## 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
|
2517 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
|
2518 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
|
2519 [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
|
2520 break |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2521 done |
17844
e88a8fa25125
configure.ac: add warnings on checking for JAVA to the final summary.
Carnë Draug <carandraug@octave.org>
parents:
17836
diff
changeset
|
2522 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
|
2523 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
|
2524 fi |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2525 |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2526 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
|
2527 AC_SUBST(JAVA) |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2528 AC_SUBST(JAVAC) |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2529 AC_SUBST(JAR) |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2530 AC_SUBST(JAVA_CPPFLAGS) |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2531 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
|
2532 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
|
2533 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
|
2534 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2535 ### Determine if documentation should and can be built. |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2536 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2537 ENABLE_DOCS=yes |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2538 AC_ARG_ENABLE([docs], |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2539 [AS_HELP_STRING([--disable-docs], [don't build documentation files])], |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2540 [if test "$enableval" = no; then |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2541 ENABLE_DOCS=no |
24623
f39ae754a7d8
configure: test that makeinfo supports the @sortas command
Mike Miller <mtmiller@octave.org>
parents:
24592
diff
changeset
|
2542 warn_docs="building documentation disabled; make dist will fail." |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2543 OCTAVE_CONFIGURE_WARNING([warn_docs]) |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2544 fi], []) |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2545 if test $ENABLE_DOCS = yes; then |
25589
c21edcb90cbf
support for osmesa removed (bug #50479)
John W. Eaton <jwe@octave.org>
parents:
25584
diff
changeset
|
2546 if test $opengl_graphics = no || test "$have_qt_opengl_offscreen" = no; then |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2547 if test -n "$warn_gnuplot"; then |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2548 ENABLE_DOCS=no |
24623
f39ae754a7d8
configure: test that makeinfo supports the @sortas command
Mike Miller <mtmiller@octave.org>
parents:
24592
diff
changeset
|
2549 warn_docs_graphics="building documentation disabled because no suitable graphics toolkit is available; make dist will fail." |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2550 OCTAVE_CONFIGURE_WARNING([warn_docs_graphics]) |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2551 fi |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2552 fi |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2553 if test -n "$warn_makeinfo"; then |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2554 ENABLE_DOCS=no |
24623
f39ae754a7d8
configure: test that makeinfo supports the @sortas command
Mike Miller <mtmiller@octave.org>
parents:
24592
diff
changeset
|
2555 warn_docs_makeinfo="building documentation disabled because makeinfo was not found or does not support @sortas; make dist will fail." |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2556 OCTAVE_CONFIGURE_WARNING([warn_docs_makeinfo]) |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2557 fi |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2558 fi |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2559 if test $ENABLE_DOCS = yes; then |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2560 AC_DEFINE(ENABLE_DOCS, 1, |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2561 [Define to 1 to build Octave documentation files.]) |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2562 fi |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2563 AM_CONDITIONAL([AMCOND_BUILD_DOCS], [test $ENABLE_DOCS = yes]) |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2564 |
24945
ba9d37893822
build: Don't built special Qt Help files when --without-qt used (bug #53394)
Rik <rik@octave.org>
parents:
24935
diff
changeset
|
2565 AM_CONDITIONAL([AMCOND_BUILD_QT_DOCS], |
ba9d37893822
build: Don't built special Qt Help files when --without-qt used (bug #53394)
Rik <rik@octave.org>
parents:
24935
diff
changeset
|
2566 [test $ENABLE_DOCS = yes && test $build_qt_gui = yes]) |
ba9d37893822
build: Don't built special Qt Help files when --without-qt used (bug #53394)
Rik <rik@octave.org>
parents:
24935
diff
changeset
|
2567 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2568 ### Determine whether Mercurial ID should be embedded in library binaries. |
24935
c27398f0601c
maint: revert inadvertent changes from merge revision ff80c319e664
Mike Miller <mtmiller@octave.org>
parents:
24927
diff
changeset
|
2569 |
24926
ff80c319e664
maint: Merge GSOC Specfun code into core
Rik <rik@octave.org>
parents:
24900
diff
changeset
|
2570 ENABLE_HG_ID=yes |
ff80c319e664
maint: Merge GSOC Specfun code into core
Rik <rik@octave.org>
parents:
24900
diff
changeset
|
2571 AC_ARG_ENABLE([hg-id], |
ff80c319e664
maint: Merge GSOC Specfun code into core
Rik <rik@octave.org>
parents:
24900
diff
changeset
|
2572 [AS_HELP_STRING([--disable-hg-id], |
ff80c319e664
maint: Merge GSOC Specfun code into core
Rik <rik@octave.org>
parents:
24900
diff
changeset
|
2573 [disable embedding of hg id in libraries])], |
ff80c319e664
maint: Merge GSOC Specfun code into core
Rik <rik@octave.org>
parents:
24900
diff
changeset
|
2574 [if test "$enableval" = no; then ENABLE_HG_ID=no; fi], []) |
ff80c319e664
maint: Merge GSOC Specfun code into core
Rik <rik@octave.org>
parents:
24900
diff
changeset
|
2575 AM_CONDITIONAL([AMCOND_ENABLE_HG_ID], [test $ENABLE_HG_ID = yes]) |
ff80c319e664
maint: Merge GSOC Specfun code into core
Rik <rik@octave.org>
parents:
24900
diff
changeset
|
2576 |
ff80c319e664
maint: Merge GSOC Specfun code into core
Rik <rik@octave.org>
parents:
24900
diff
changeset
|
2577 ### Determine whether to install build logs with Octave. |
ff80c319e664
maint: Merge GSOC Specfun code into core
Rik <rik@octave.org>
parents:
24900
diff
changeset
|
2578 |
ff80c319e664
maint: Merge GSOC Specfun code into core
Rik <rik@octave.org>
parents:
24900
diff
changeset
|
2579 install_build_logs=no |
ff80c319e664
maint: Merge GSOC Specfun code into core
Rik <rik@octave.org>
parents:
24900
diff
changeset
|
2580 AC_ARG_ENABLE([install-build-logs], |
ff80c319e664
maint: Merge GSOC Specfun code into core
Rik <rik@octave.org>
parents:
24900
diff
changeset
|
2581 [AS_HELP_STRING([--enable-install-build-logs], |
ff80c319e664
maint: Merge GSOC Specfun code into core
Rik <rik@octave.org>
parents:
24900
diff
changeset
|
2582 [install build logs (i.e. config.log) with Octave])], |
ff80c319e664
maint: Merge GSOC Specfun code into core
Rik <rik@octave.org>
parents:
24900
diff
changeset
|
2583 [if test "$enableval" = yes; then install_build_logs=yes; fi]) |
ff80c319e664
maint: Merge GSOC Specfun code into core
Rik <rik@octave.org>
parents:
24900
diff
changeset
|
2584 AM_CONDITIONAL([AMCOND_INSTALL_BUILD_LOGS], [test $install_build_logs = yes]) |
ff80c319e664
maint: Merge GSOC Specfun code into core
Rik <rik@octave.org>
parents:
24900
diff
changeset
|
2585 |
ff80c319e664
maint: Merge GSOC Specfun code into core
Rik <rik@octave.org>
parents:
24900
diff
changeset
|
2586 ### Add extra compiler flags now that feature testing is complete. |
ff80c319e664
maint: Merge GSOC Specfun code into core
Rik <rik@octave.org>
parents:
24900
diff
changeset
|
2587 |
ff80c319e664
maint: Merge GSOC Specfun code into core
Rik <rik@octave.org>
parents:
24900
diff
changeset
|
2588 ## Add warning flags |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2589 |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2590 dnl Don't add -Wshadow for GCC 4.x. |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2591 case "$GCC_VERSION" in |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2592 *4*) ;; |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2593 *) GCC_WSHADOW_OPTION=-Wshadow ;; |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2594 esac |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2595 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2596 GCC_EXTRA_FLAGS="-Wall -W $GCC_WSHADOW_OPTION -Wformat -Wpointer-arith -Wmissing-prototypes -Wstrict-prototypes -Wwrite-strings -Wcast-align -Wcast-qual" |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2597 GXX_EXTRA_FLAGS="-Wall -W $GCC_WSHADOW_OPTION -Wold-style-cast -Wformat -Wpointer-arith -Wwrite-strings -Wcast-align -Wcast-qual" |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2598 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2599 try_extra_warning_flags=yes |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2600 AC_ARG_ENABLE([extra-warning-flags], |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2601 [AS_HELP_STRING([--disable-extra-warning-flags], |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2602 [don't add -Wall, -W, -Wformat, -Wold-style-cast, and other warning options to CFLAGS and CXXFLAGS])], |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2603 [if test "$enableval" = no; then |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2604 try_extra_warning_flags=no |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2605 fi], |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2606 []) |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2607 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2608 if test $try_extra_warning_flags = yes; then |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2609 for flag in $GCC_EXTRA_FLAGS; do |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2610 OCTAVE_CC_FLAG([$flag], [ |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2611 WARN_CFLAGS="$WARN_CFLAGS $flag"; |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2612 AC_MSG_RESULT([adding $flag to WARN_CFLAGS])]) |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2613 done |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2614 for flag in $GXX_EXTRA_FLAGS; do |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2615 OCTAVE_CXX_FLAG([$flag], [ |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2616 WARN_CXXFLAGS="$WARN_CXXFLAGS $flag"; |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2617 AC_MSG_RESULT([adding $flag to WARN_CXXFLAGS])]) |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2618 done |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2619 fi |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2620 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2621 ## Add strict warning flags |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2622 GCC_STRICT_FLAGS="-Wconversion" |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2623 GXX_STRICT_FLAGS="-Wconversion -Weffc++" |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2624 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2625 try_strict_warning_flags=no |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2626 AC_ARG_ENABLE([strict-warning-flags], |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2627 [AS_HELP_STRING([--enable-strict-warning-flags], |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2628 [add extra strict warning options to CFLAGS and CXXFLAGS])], |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2629 [if test "$enableval" = yes; then |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2630 try_strict_warning_flags=yes |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2631 fi], |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2632 []) |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2633 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2634 if test $try_strict_warning_flags = yes; then |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2635 for flag in $GCC_STRICT_FLAGS; do |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2636 OCTAVE_CC_FLAG([$flag], [ |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2637 WARN_CFLAGS="$WARN_CFLAGS $flag"; |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2638 AC_MSG_RESULT([adding $flag to WARN_CFLAGS])]) |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2639 done |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2640 for flag in $GXX_STRICT_FLAGS; do |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2641 OCTAVE_CXX_FLAG([$flag], [ |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2642 WARN_CXXFLAGS="$WARN_CXXFLAGS $flag"; |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2643 AC_MSG_RESULT([adding $flag to WARN_CXXFLAGS])]) |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2644 done |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2645 fi |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2646 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2647 ## Add sanitizer flags |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2648 GCC_ADDRESS_SANITIZER_FLAGS="-fsanitize=address -fno-omit-frame-pointer" |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2649 GXX_ADDRESS_SANITIZER_FLAGS="-fsanitize=address -fno-omit-frame-pointer" |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2650 LD_ADDRESS_SANITIZER_FLAGS="-fsanitize=address" |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2651 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2652 try_address_sanitizer_flags=no |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2653 AC_ARG_ENABLE([address-sanitizer-flags], |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2654 [AS_HELP_STRING([--enable-address-sanitizer-flags], |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2655 [add extra -fsanitize=address and -fno-omit-frame-pointer options to CFLAGS, CXXFLAGS, and LDFLAGS])], |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2656 [if test "$enableval" = yes; then |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2657 try_address_sanitizer_flags=yes |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2658 fi], |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2659 []) |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2660 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2661 if test $try_address_sanitizer_flags = yes; then |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2662 ADDRESS_SANITIZER_OPTIONS="symbolize=1" |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2663 AC_SUBST(ADDRESS_SANITIZER_OPTIONS) |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2664 fi |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2665 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2666 AM_CONDITIONAL([AMCOND_ADDRESS_SANITIZER_ENABLED], |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2667 [test $try_address_sanitizer_flags = yes]) |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2668 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2669 if test $try_address_sanitizer_flags = yes; then |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2670 for flag in $GCC_ADDRESS_SANITIZER_FLAGS; do |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2671 OCTAVE_CC_FLAG([$flag], [ |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2672 WARN_CFLAGS="$WARN_CFLAGS $flag"; |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2673 AC_MSG_RESULT([adding $flag to WARN_CFLAGS])]) |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2674 done |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2675 for flag in $GXX_ADDRESS_SANITIZER_FLAGS; do |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2676 OCTAVE_CXX_FLAG([$flag], [ |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2677 WARN_CXXFLAGS="$WARN_CXXFLAGS $flag"; |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2678 AC_MSG_RESULT([adding $flag to WARN_CXXFLAGS])]) |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2679 done |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2680 dnl FIXME: do we really need an LD-specific test, or is this good enough? |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2681 for flag in $LD_ADDRESS_SANITIZER_FLAGS; do |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2682 OCTAVE_CC_FLAG([$flag], [ |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2683 WARN_LDFLAGS="$WARN_LDFLAGS $flag"; |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2684 AC_MSG_RESULT([adding $flag to WARN_LDFLAGS])]) |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2685 done |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2686 fi |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2687 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2688 AC_SUBST(WARN_CFLAGS) |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2689 AC_SUBST(WARN_CXXFLAGS) |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2690 AC_SUBST(WARN_LDFLAGS) |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2691 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2692 ### Check for GCC-specific pragmas to control warnings. |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2693 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2694 AC_CACHE_CHECK([for @%:@pragma GCC diagnostic push/pop/ignore], |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2695 [octave_cv_gcc_has_pragma_GCC_diagnostic], |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2696 [AC_LANG_PUSH(C++) |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2697 AC_TRY_COMPILE([], [ |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2698 #pragma GCC diagnostic push |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2699 #pragma GCC diagnostic ignore "-Wold-style-cast" |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2700 int three = (int) 3.1415926; |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2701 #pragma GCC diagnostic pop |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2702 ], |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2703 [octave_cv_gcc_has_pragma_GCC_diagnostic=yes], |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2704 [octave_cv_gcc_has_pragma_GCC_diagnostic=no]) |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2705 AC_LANG_POP(C++)], |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2706 ]) |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2707 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2708 if test $octave_cv_gcc_has_pragma_GCC_diagnostic = yes; then |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2709 AC_DEFINE(HAVE_PRAGMA_GCC_DIAGNOSTIC, 1, |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2710 [Define to 1 if GCC supports @%:@pragma GCC diagnostic ...]) |
24387
268d31e7aa4f
build: Silence compile warning about unknown GCC warning "-Wimplicit-fallthrough".
Rik <rik@octave.org>
parents:
24375
diff
changeset
|
2711 fi |
268d31e7aa4f
build: Silence compile warning about unknown GCC warning "-Wimplicit-fallthrough".
Rik <rik@octave.org>
parents:
24375
diff
changeset
|
2712 |
268d31e7aa4f
build: Silence compile warning about unknown GCC warning "-Wimplicit-fallthrough".
Rik <rik@octave.org>
parents:
24375
diff
changeset
|
2713 ## Check for one unusual warning used in pragmas that is not always available |
268d31e7aa4f
build: Silence compile warning about unknown GCC warning "-Wimplicit-fallthrough".
Rik <rik@octave.org>
parents:
24375
diff
changeset
|
2714 if test $octave_cv_gcc_has_pragma_GCC_diagnostic = yes; then |
268d31e7aa4f
build: Silence compile warning about unknown GCC warning "-Wimplicit-fallthrough".
Rik <rik@octave.org>
parents:
24375
diff
changeset
|
2715 OCTAVE_CC_FLAG([-Wimplicit-fallthrough], |
268d31e7aa4f
build: Silence compile warning about unknown GCC warning "-Wimplicit-fallthrough".
Rik <rik@octave.org>
parents:
24375
diff
changeset
|
2716 [AC_DEFINE(HAVE_WARN_IMPLICIT_FALLTHROUGH, 1, |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2717 [Define to 1 if GCC supports -Wimplicit-fallthrough warning])]) |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2718 fi |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2719 |
23661
21b2816820cf
update GNULIB_LINK_DEPS for recent changes
John W. Eaton <jwe@octave.org>
parents:
23657
diff
changeset
|
2720 ### These are recommended by the gnulib bootstrap script: |
21b2816820cf
update GNULIB_LINK_DEPS for recent changes
John W. Eaton <jwe@octave.org>
parents:
23657
diff
changeset
|
2721 |
23993
49e37560e0fe
configure: rely on gnulib for detection of clock_gettime
Mike Miller <mtmiller@octave.org>
parents:
23992
diff
changeset
|
2722 GNULIB_LINK_DEPS="$FREXPF_LIBM $FREXP_LIBM $GETHOSTNAME_LIB $LIBSOCKET $LIB_CLOCK_GETTIME $LIB_CRYPTO $LIB_GETLOGIN $LIB_NANOSLEEP $LIB_SELECT $LTLIBICONV $LTLIBINTL $LTLIBTHREAD" |
49e37560e0fe
configure: rely on gnulib for detection of clock_gettime
Mike Miller <mtmiller@octave.org>
parents:
23992
diff
changeset
|
2723 |
25581
9f422e49be15
transform libiconv.dll.a to -liconv for mkoctfile (bug #53920)
John W. Eaton <jwe@octave.org>
parents:
25559
diff
changeset
|
2724 ### FIXME: This is a kluge to transform $libdir/libiconv.dll.a to -liconv. |
9f422e49be15
transform libiconv.dll.a to -liconv for mkoctfile (bug #53920)
John W. Eaton <jwe@octave.org>
parents:
25559
diff
changeset
|
2725 ### It would probably be better to fix gnulib to not give us an absolute |
9f422e49be15
transform libiconv.dll.a to -liconv for mkoctfile (bug #53920)
John W. Eaton <jwe@octave.org>
parents:
25559
diff
changeset
|
2726 ### file name... |
9f422e49be15
transform libiconv.dll.a to -liconv for mkoctfile (bug #53920)
John W. Eaton <jwe@octave.org>
parents:
25559
diff
changeset
|
2727 |
9f422e49be15
transform libiconv.dll.a to -liconv for mkoctfile (bug #53920)
John W. Eaton <jwe@octave.org>
parents:
25559
diff
changeset
|
2728 case $host_os in |
9f422e49be15
transform libiconv.dll.a to -liconv for mkoctfile (bug #53920)
John W. Eaton <jwe@octave.org>
parents:
25559
diff
changeset
|
2729 mingw*) |
9f422e49be15
transform libiconv.dll.a to -liconv for mkoctfile (bug #53920)
John W. Eaton <jwe@octave.org>
parents:
25559
diff
changeset
|
2730 ## Don't use $libdir here because that's defined to be |
9f422e49be15
transform libiconv.dll.a to -liconv for mkoctfile (bug #53920)
John W. Eaton <jwe@octave.org>
parents:
25559
diff
changeset
|
2731 ## ${exec_prefix}/lib and at this point, ${exec_prefix} is "NONE"! |
9f422e49be15
transform libiconv.dll.a to -liconv for mkoctfile (bug #53920)
John W. Eaton <jwe@octave.org>
parents:
25559
diff
changeset
|
2732 tmp_libiconv_dll="$LIBICONV_PREFIX/lib/libiconv.dll.a" |
9f422e49be15
transform libiconv.dll.a to -liconv for mkoctfile (bug #53920)
John W. Eaton <jwe@octave.org>
parents:
25559
diff
changeset
|
2733 MKOCTFILE_LIBICONV=`echo $LIBICONV | sed "s|$tmp_libiconv_dll|-liconv|"` |
9f422e49be15
transform libiconv.dll.a to -liconv for mkoctfile (bug #53920)
John W. Eaton <jwe@octave.org>
parents:
25559
diff
changeset
|
2734 ;; |
9f422e49be15
transform libiconv.dll.a to -liconv for mkoctfile (bug #53920)
John W. Eaton <jwe@octave.org>
parents:
25559
diff
changeset
|
2735 *) |
9f422e49be15
transform libiconv.dll.a to -liconv for mkoctfile (bug #53920)
John W. Eaton <jwe@octave.org>
parents:
25559
diff
changeset
|
2736 MKOCTFILE_LIBICONV="$LIBICONV" |
9f422e49be15
transform libiconv.dll.a to -liconv for mkoctfile (bug #53920)
John W. Eaton <jwe@octave.org>
parents:
25559
diff
changeset
|
2737 ;; |
9f422e49be15
transform libiconv.dll.a to -liconv for mkoctfile (bug #53920)
John W. Eaton <jwe@octave.org>
parents:
25559
diff
changeset
|
2738 esac |
9f422e49be15
transform libiconv.dll.a to -liconv for mkoctfile (bug #53920)
John W. Eaton <jwe@octave.org>
parents:
25559
diff
changeset
|
2739 |
9f422e49be15
transform libiconv.dll.a to -liconv for mkoctfile (bug #53920)
John W. Eaton <jwe@octave.org>
parents:
25559
diff
changeset
|
2740 MKOCTFILE_GNULIB_LINK_DEPS="$FREXPF_LIBM $FREXP_LIBM $GETHOSTNAME_LIB $LIBSOCKET $LIB_CLOCK_GETTIME $LIB_CRYPTO $LIB_GETLOGIN $LIB_NANOSLEEP $LIB_SELECT $MKOCTFILE_LIBICONV $LIBINTL $LIBTHREAD" |
21412
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2741 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2742 AC_SUBST(GNULIB_LINK_DEPS) |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2743 |
23757
bba752b37f8e
use different definition for mkoctfile link deps
John W. Eaton <jwe@octave.org>
parents:
23709
diff
changeset
|
2744 BASE_LIBOCTAVE_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" |
bba752b37f8e
use different definition for mkoctfile link deps
John W. Eaton <jwe@octave.org>
parents:
23709
diff
changeset
|
2745 |
bba752b37f8e
use different definition for mkoctfile link deps
John W. Eaton <jwe@octave.org>
parents:
23709
diff
changeset
|
2746 LIBOCTAVE_LINK_DEPS="$BASE_LIBOCTAVE_LINK_DEPS $GNULIB_LINK_DEPS" |
bba752b37f8e
use different definition for mkoctfile link deps
John W. Eaton <jwe@octave.org>
parents:
23709
diff
changeset
|
2747 |
bba752b37f8e
use different definition for mkoctfile link deps
John W. Eaton <jwe@octave.org>
parents:
23709
diff
changeset
|
2748 MKOCTFILE_LIBOCTAVE_LINK_DEPS="$BASE_LIBOCTAVE_LINK_DEPS $MKOCTFILE_GNULIB_LINK_DEPS" |
21412
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2749 |
23005
8e9dd0d6e337
update check for pcre library to use pkg-config (bug #49993)
John W. Eaton <jwe@octave.org>
parents:
22995
diff
changeset
|
2750 LIBOCTAVE_LINK_OPTS="$CURL_LDFLAGS $SPARSE_XLDFLAGS $ARPACK_LDFLAGS $QRUPDATE_LDFLAGS $FFTW_XLDFLAGS $PCRE_LDFLAGS" |
21412
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2751 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2752 AC_SUBST(LIBOCTAVE_LINK_DEPS) |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2753 AC_SUBST(LIBOCTAVE_LINK_OPTS) |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2754 |
25885
22ee68edcf3a
require dynamic loading capabilities to build Octave
John W. Eaton <jwe@octave.org>
parents:
25847
diff
changeset
|
2755 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" |
21678
6586202b3a87
make __magick_read__ a built-in function (bug #41699)
John W. Eaton <jwe@octave.org>
parents:
21640
diff
changeset
|
2756 |
6586202b3a87
make __magick_read__ a built-in function (bug #41699)
John W. Eaton <jwe@octave.org>
parents:
21640
diff
changeset
|
2757 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
|
2758 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2759 OCTAVE_LINK_DEPS="" |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2760 OCTAVE_LINK_OPTS="" |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2761 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2762 OCT_LINK_DEPS="" |
25962
14e844f1459a
fix linking of __init_qt__.la on Windows systems (bug #54881)
John W. Eaton <jwe@octave.org>
parents:
25934
diff
changeset
|
2763 OCT_GUI_LINK_DEPS="" |
14e844f1459a
fix linking of __init_qt__.la on Windows systems (bug #54881)
John W. Eaton <jwe@octave.org>
parents:
25934
diff
changeset
|
2764 |
21412
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2765 OCT_LINK_OPTS="$LDFLAGS" |
25962
14e844f1459a
fix linking of __init_qt__.la on Windows systems (bug #54881)
John W. Eaton <jwe@octave.org>
parents:
25934
diff
changeset
|
2766 OCT_GUI_LINK_OPTS="$LDFLAGS" |
21412
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2767 |
25476
0e510279e3b9
* configure.ac: Don't use QT_LDFLAGS to decide whether to link with all deps.
John W. Eaton <jwe@octave.org>
parents:
25475
diff
changeset
|
2768 if test $link_all_deps = yes; then |
25492
7cdda3ad947f
fix .oct files link dependencies and options for --link-all-deps (bug #54168)
John W. Eaton <jwe@octave.org>
parents:
25488
diff
changeset
|
2769 OCT_LINK_DEPS="libinterp/liboctinterp.la liboctave/liboctave.la" |
25962
14e844f1459a
fix linking of __init_qt__.la on Windows systems (bug #54881)
John W. Eaton <jwe@octave.org>
parents:
25934
diff
changeset
|
2770 OCT_GUI_LINK_DEPS="libgui/liboctgui.la libinterp/liboctinterp.la liboctave/liboctave.la" |
25492
7cdda3ad947f
fix .oct files link dependencies and options for --link-all-deps (bug #54168)
John W. Eaton <jwe@octave.org>
parents:
25488
diff
changeset
|
2771 |
23757
bba752b37f8e
use different definition for mkoctfile link deps
John W. Eaton <jwe@octave.org>
parents:
23709
diff
changeset
|
2772 MKOCTFILE_OCTAVE_LINK_DEPS="$LIBOCTINTERP_LINK_DEPS $MKOCTFILE_LIBOCTAVE_LINK_DEPS" |
26366
16607f64eea1
Include -loctave -loctinterp and lib path to mkoctfile link command (bug #55033).
Ben Abbott <bpabbott@mac.com>
parents:
26273
diff
changeset
|
2773 MKOCTFILE_OCT_LINK_DEPS="$LIBOCTINTERP $LIBOCTAVE" |
23757
bba752b37f8e
use different definition for mkoctfile link deps
John W. Eaton <jwe@octave.org>
parents:
23709
diff
changeset
|
2774 |
21412
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2775 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
|
2776 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
|
2777 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2778 OCTAVE_LINK_DEPS="$LIBOCTINTERP_LINK_DEPS" |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2779 OCTAVE_LINK_OPTS="$LIBOCTINTERP_LINK_OPTS" |
25492
7cdda3ad947f
fix .oct files link dependencies and options for --link-all-deps (bug #54168)
John W. Eaton <jwe@octave.org>
parents:
25488
diff
changeset
|
2780 else |
7cdda3ad947f
fix .oct files link dependencies and options for --link-all-deps (bug #54168)
John W. Eaton <jwe@octave.org>
parents:
25488
diff
changeset
|
2781 case $host_os in |
7cdda3ad947f
fix .oct files link dependencies and options for --link-all-deps (bug #54168)
John W. Eaton <jwe@octave.org>
parents:
25488
diff
changeset
|
2782 mingw* | msdosmsvc) |
7cdda3ad947f
fix .oct files link dependencies and options for --link-all-deps (bug #54168)
John W. Eaton <jwe@octave.org>
parents:
25488
diff
changeset
|
2783 OCT_LINK_DEPS="libinterp/liboctinterp.la liboctave/liboctave.la" |
25962
14e844f1459a
fix linking of __init_qt__.la on Windows systems (bug #54881)
John W. Eaton <jwe@octave.org>
parents:
25934
diff
changeset
|
2784 OCT_GUI_LINK_DEPS="libgui/liboctgui.la libinterp/liboctinterp.la liboctave/liboctave.la" |
25492
7cdda3ad947f
fix .oct files link dependencies and options for --link-all-deps (bug #54168)
John W. Eaton <jwe@octave.org>
parents:
25488
diff
changeset
|
2785 ;; |
7cdda3ad947f
fix .oct files link dependencies and options for --link-all-deps (bug #54168)
John W. Eaton <jwe@octave.org>
parents:
25488
diff
changeset
|
2786 esac |
21412
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2787 fi |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2788 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2789 AC_SUBST(LIBOCTINTERP_LINK_DEPS) |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2790 AC_SUBST(LIBOCTINTERP_LINK_OPTS) |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2791 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2792 AC_SUBST(OCTAVE_LINK_DEPS) |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2793 AC_SUBST(OCTAVE_LINK_OPTS) |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2794 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2795 AC_SUBST(OCT_LINK_DEPS) |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2796 AC_SUBST(OCT_LINK_OPTS) |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2797 |
25962
14e844f1459a
fix linking of __init_qt__.la on Windows systems (bug #54881)
John W. Eaton <jwe@octave.org>
parents:
25934
diff
changeset
|
2798 AC_SUBST(OCT_GUI_LINK_DEPS) |
14e844f1459a
fix linking of __init_qt__.la on Windows systems (bug #54881)
John W. Eaton <jwe@octave.org>
parents:
25934
diff
changeset
|
2799 AC_SUBST(OCT_GUI_LINK_OPTS) |
14e844f1459a
fix linking of __init_qt__.la on Windows systems (bug #54881)
John W. Eaton <jwe@octave.org>
parents:
25934
diff
changeset
|
2800 |
23757
bba752b37f8e
use different definition for mkoctfile link deps
John W. Eaton <jwe@octave.org>
parents:
23709
diff
changeset
|
2801 AC_SUBST(MKOCTFILE_OCTAVE_LINK_DEPS) |
bba752b37f8e
use different definition for mkoctfile link deps
John W. Eaton <jwe@octave.org>
parents:
23709
diff
changeset
|
2802 AC_SUBST(MKOCTFILE_OCT_LINK_DEPS) |
bba752b37f8e
use different definition for mkoctfile link deps
John W. Eaton <jwe@octave.org>
parents:
23709
diff
changeset
|
2803 |
21412
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2804 LIBOCTGUI_LINK_DEPS="" |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2805 LIBOCTGUI_LINK_OPTS="" |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2806 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2807 OCTAVE_GUI_LINK_DEPS="" |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2808 OCTAVE_GUI_LINK_OPTS="" |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2809 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2810 if test $build_qt_gui = yes; then |
25934
332be8be16eb
dynamically load qt graphics
John W. Eaton <jwe@octave.org>
parents:
25885
diff
changeset
|
2811 LIBOCTGUI_LINK_DEPS="$QT_LIBS" |
21412
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2812 LIBOCTGUI_LINK_OPTS="$QT_LDFLAGS" |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2813 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2814 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
|
2815 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
|
2816 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
|
2817 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2818 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
|
2819 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
|
2820 fi |
15873
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2821 fi |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2822 |
21412
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2823 AC_SUBST(LIBOCTGUI_LINK_DEPS) |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2824 AC_SUBST(LIBOCTGUI_LINK_OPTS) |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2825 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2826 AC_SUBST(OCTAVE_GUI_LINK_DEPS) |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2827 AC_SUBST(OCTAVE_GUI_LINK_OPTS) |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2828 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2829 ############################################################################## |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2830 ### Configuration tests done |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2831 |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2832 ### Restore original compilation flags |
19839
d3dcc62512d7
do a better job of saving and restoring compiler flags (bug #44353)
John W. Eaton <jwe@octave.org>
parents:
19838
diff
changeset
|
2833 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
|
2834 CXXFLAGS="$original_octave_configure_CXXFLAGS" |
1304 | 2835 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2836 ### Add footer to config.h |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2837 |
16330
306e0ac231d0
move AH_BOTTOM output to separate header file
John W. Eaton <jwe@octave.org>
parents:
16329
diff
changeset
|
2838 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
|
2839 |
15779
4456ad3d8a56
configure.ac: Ensure that all AC_DEFINEs are captured by UGLY_DEFS variable.
Rik <rik@octave.org>
parents:
15777
diff
changeset
|
2840 ### Make all AC_DEFINES available to testif feature of test.m function. |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2841 dnl This must reside at the bottom of configure.ac after all AC_DEFINES |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2842 dnl have been made. |
15779
4456ad3d8a56
configure.ac: Ensure that all AC_DEFINEs are captured by UGLY_DEFS variable.
Rik <rik@octave.org>
parents:
15777
diff
changeset
|
2843 |
4456ad3d8a56
configure.ac: Ensure that all AC_DEFINEs are captured by UGLY_DEFS variable.
Rik <rik@octave.org>
parents:
15777
diff
changeset
|
2844 AC_OUTPUT_MAKE_DEFS |
3923 | 2845 |
21409
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
2846 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
|
2847 ## 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
|
2848 ## unexpanded (as explained and recommended by the autoconf manual). |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2849 ## But we store configuration info in files and expect whatever |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2850 ## is set at configure time to stay the same when Make is executed. |
21409
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
2851 ## 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
|
2852 ## |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
2853 ## 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
|
2854 ## 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
|
2855 ## |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
2856 ## 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
|
2857 |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
2858 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
|
2859 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
|
2860 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
|
2861 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
|
2862 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
|
2863 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
|
2864 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
|
2865 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
|
2866 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
|
2867 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
|
2868 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
|
2869 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
|
2870 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
|
2871 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
|
2872 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
|
2873 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
|
2874 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
|
2875 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
|
2876 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
|
2877 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
|
2878 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
|
2879 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
|
2880 |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
2881 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
|
2882 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
|
2883 |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
2884 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
|
2885 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
|
2886 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
|
2887 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
|
2888 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
|
2889 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
|
2890 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
|
2891 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
|
2892 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
|
2893 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
|
2894 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
|
2895 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
|
2896 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
|
2897 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
|
2898 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
|
2899 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
|
2900 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
|
2901 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
|
2902 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
|
2903 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
|
2904 eval octdatadir="\"$octdatadir\"" |
24876
7c7b60dd4d4c
Generate Qt compressed help and collection files for the manual (bug #53006)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24874
diff
changeset
|
2905 eval octdocdir="\"$octdocdir\"" |
24899
1a46d174a483
include a proper definition of Octave's private font fallback directory
Mike Miller <mtmiller@octave.org>
parents:
24890
diff
changeset
|
2906 eval octfontsdir="\"$octfontsdir\"" |
21409
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
2907 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
|
2908 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
|
2909 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
|
2910 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
|
2911 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
|
2912 |
a53f46577e39
Fix variable expansion in dynamic linking flags for macOS (bug #48215)
Mike Miller <mtmiller@octave.org>
parents:
21908
diff
changeset
|
2913 ## 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
|
2914 ## 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
|
2915 |
a53f46577e39
Fix variable expansion in dynamic linking flags for macOS (bug #48215)
Mike Miller <mtmiller@octave.org>
parents:
21908
diff
changeset
|
2916 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
|
2917 ]) |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
2918 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2919 ### Do substitutions in Makefiles and other files that hold configuration info. |
869 | 2920 |
21413
3fb2bdea47a5
check substituted variables against current make variables
John W. Eaton <jwe@octave.org>
parents:
21412
diff
changeset
|
2921 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
|
2922 |
3fb2bdea47a5
check substituted variables against current make variables
John W. Eaton <jwe@octave.org>
parents:
21412
diff
changeset
|
2923 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
|
2924 AC_SUBST(ac_config_files) |
9645 | 2925 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
|
2926 |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2927 AC_CONFIG_FILES([ |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
2928 Makefile |
21413
3fb2bdea47a5
check substituted variables against current make variables
John W. Eaton <jwe@octave.org>
parents:
21412
diff
changeset
|
2929 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
|
2930 doc/doxyhtml/Doxyfile |
25391
26070f36f1e7
Provide octave configuration files for pkg-config (bug #48775)
Carnë Draug <carandraug@octave.org>
parents:
25333
diff
changeset
|
2931 libgnu/Makefile |
26070f36f1e7
Provide octave configuration files for pkg-config (bug #48775)
Carnë Draug <carandraug@octave.org>
parents:
25333
diff
changeset
|
2932 liboctave/octave.pc:liboctave/octave.in.pc |
26070f36f1e7
Provide octave configuration files for pkg-config (bug #48775)
Carnë Draug <carandraug@octave.org>
parents:
25333
diff
changeset
|
2933 libinterp/octinterp.pc:libinterp/octinterp.in.pc]) |
21397
df859661e31e
generate default-qt-settings at configure time
John W. Eaton <jwe@octave.org>
parents:
21392
diff
changeset
|
2934 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2935 dnl We use a .in.h file for oct-conf-post.h simply to copy it to the build tree |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2936 dnl so that we don't have to add the -I${top_srcdir} to any CPPFLAGS variables. |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
2937 |
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
2938 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
|
2939 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
|
2940 [$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
|
2941 |
21397
df859661e31e
generate default-qt-settings at configure time
John W. Eaton <jwe@octave.org>
parents:
21392
diff
changeset
|
2942 OCTAVE_CONFIG_MOVE_IF_CHANGE_FILES([ |
23709
3b68aeeabc40
rename some build scripts for consistency and move them to where they are used
John W. Eaton <jwe@octave.org>
parents:
23669
diff
changeset
|
2943 libgui/mk-default-qt-settings.sh |
3b68aeeabc40
rename some build scripts for consistency and move them to where they are used
John W. Eaton <jwe@octave.org>
parents:
23669
diff
changeset
|
2944 liboctave/external/mk-f77-def.sh |
25397
2cf750f5cb7d
make version info accessible in liboctave
John W. Eaton <jwe@octave.org>
parents:
25391
diff
changeset
|
2945 liboctave/mk-version-h.sh |
23709
3b68aeeabc40
rename some build scripts for consistency and move them to where they are used
John W. Eaton <jwe@octave.org>
parents:
23669
diff
changeset
|
2946 libinterp/corefcn/mk-mxarray-h.sh |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
2947 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
|
2948 build-aux/subst-cross-config-vals.sh |
21413
3fb2bdea47a5
check substituted variables against current make variables
John W. Eaton <jwe@octave.org>
parents:
21412
diff
changeset
|
2949 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
|
2950 |
3887 | 2951 AC_OUTPUT |
1225 | 2952 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2953 ### Print a summary of the build configuration. |
1225 | 2954 |
5844 | 2955 AC_MSG_NOTICE([ |
1225 | 2956 |
2957 Octave is now configured for $canonical_host_type | |
2958 | |
22501
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2959 Source directory: $srcdir |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2960 Installation prefix: $prefix |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2961 C compiler: $CC $XTRA_CFLAGS $WARN_CFLAGS $CFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2962 C++ compiler: $CXX $XTRA_CXXFLAGS $WARN_CXXFLAGS $CXXFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2963 Fortran compiler: $F77 $FFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2964 Fortran libraries: $FLIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2965 Lex libraries: $LEXLIB |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2966 LIBS: $LIBS |
23370
e284cf4239bf
configure.ac: Print LDFLAGS in summary of config variables.
Rik <rik@octave.org>
parents:
23227
diff
changeset
|
2967 LDFLAGS: $LDFLAGS |
22501
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2968 Extra LDFLAGS: $WARN_LDFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2969 |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2970 AMD CPPFLAGS: $AMD_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2971 AMD LDFLAGS: $AMD_LDFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2972 AMD libraries: $AMD_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2973 ARPACK CPPFLAGS: $ARPACK_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2974 ARPACK LDFLAGS: $ARPACK_LDFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2975 ARPACK libraries: $ARPACK_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2976 BLAS libraries: $BLAS_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2977 BZ2 CPPFLAGS: $BZ2_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2978 BZ2 LDFLAGS: $BZ2_LDFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2979 BZ2 libraries: $BZ2_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2980 CAMD CPPFLAGS: $CAMD_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2981 CAMD LDFLAGS: $CAMD_LDFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2982 CAMD libraries: $CAMD_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2983 CARBON libraries: $CARBON_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2984 CCOLAMD CPPFLAGS: $CCOLAMD_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2985 CCOLAMD LDFLAGS: $CCOLAMD_LDFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2986 CCOLAMD libraries: $CCOLAMD_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2987 CHOLMOD CPPFLAGS: $CHOLMOD_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2988 CHOLMOD LDFLAGS: $CHOLMOD_LDFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2989 CHOLMOD libraries: $CHOLMOD_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2990 COLAMD CPPFLAGS: $COLAMD_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2991 COLAMD LDFLAGS: $COLAMD_LDFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2992 COLAMD libraries: $COLAMD_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2993 CURL CPPFLAGS: $CURL_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2994 CURL LDFLAGS: $CURL_LDFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2995 CURL libraries: $CURL_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2996 CXSPARSE CPPFLAGS: $CXSPARSE_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2997 CXSPARSE LDFLAGS: $CXSPARSE_LDFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2998 CXSPARSE libraries: $CXSPARSE_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2999 DL libraries: $DL_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3000 FFTW3 CPPFLAGS: $FFTW3_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3001 FFTW3 LDFLAGS: $FFTW3_LDFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3002 FFTW3 libraries: $FFTW3_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3003 FFTW3F CPPFLAGS: $FFTW3F_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3004 FFTW3F LDFLAGS: $FFTW3F_LDFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3005 FFTW3F libraries: $FFTW3F_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3006 FLTK CPPFLAGS: $FLTK_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3007 FLTK LDFLAGS: $FLTK_LDFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3008 FLTK libraries: $FLTK_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3009 fontconfig CPPFLAGS: $FONTCONFIG_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3010 fontconfig libraries: $FONTCONFIG_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3011 FreeType2 CPPFLAGS: $FT2_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3012 FreeType2 libraries: $FT2_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3013 GLPK CPPFLAGS: $GLPK_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3014 GLPK LDFLAGS: $GLPK_LDFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3015 GLPK libraries: $GLPK_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3016 HDF5 CPPFLAGS: $HDF5_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3017 HDF5 LDFLAGS: $HDF5_LDFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3018 HDF5 libraries: $HDF5_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3019 Java home: $JAVA_HOME |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3020 Java JVM path: $JAVA_LDPATH |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3021 Java CPPFLAGS: $JAVA_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3022 Java libraries: $JAVA_LIBS |
23121
0fe35c34fdc2
use $KLU_LIBS in configure check for Sundials IDA library (bug #50167)
John W. Eaton <jwe@octave.org>
parents:
23028
diff
changeset
|
3023 KLU CPPFLAGS: $KLU_CPPFLAGS |
0fe35c34fdc2
use $KLU_LIBS in configure check for Sundials IDA library (bug #50167)
John W. Eaton <jwe@octave.org>
parents:
23028
diff
changeset
|
3024 KLU LDFLAGS: $KLU_LDFLAGS |
0fe35c34fdc2
use $KLU_LIBS in configure check for Sundials IDA library (bug #50167)
John W. Eaton <jwe@octave.org>
parents:
23028
diff
changeset
|
3025 KLU libraries: $KLU_LIBS |
22501
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3026 LAPACK libraries: $LAPACK_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3027 LLVM CPPFLAGS: $LLVM_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3028 LLVM LDFLAGS: $LLVM_LDFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3029 LLVM libraries: $LLVM_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3030 Magick++ CPPFLAGS: $MAGICK_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3031 Magick++ LDFLAGS: $MAGICK_LDFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3032 Magick++ libraries: $MAGICK_LIBS |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
3033 OpenGL libraries: $OPENGL_LIBS |
22501
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3034 PCRE CPPFLAGS: $PCRE_CPPFLAGS |
23005
8e9dd0d6e337
update check for pcre library to use pkg-config (bug #49993)
John W. Eaton <jwe@octave.org>
parents:
22995
diff
changeset
|
3035 PCRE LDFLAGS: $PCRE_LDFLAGS |
22501
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3036 PCRE libraries: $PCRE_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3037 PortAudio CPPFLAGS: $PORTAUDIO_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3038 PortAudio LDFLAGS: $PORTAUDIO_LDFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3039 PortAudio libraries: $PORTAUDIO_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3040 PTHREAD flags: $PTHREAD_CFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3041 PTHREAD libraries: $PTHREAD_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3042 QHULL CPPFLAGS: $QHULL_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3043 QHULL LDFLAGS: $QHULL_LDFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3044 QHULL libraries: $QHULL_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3045 QRUPDATE CPPFLAGS: $QRUPDATE_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3046 QRUPDATE LDFLAGS: $QRUPDATE_LDFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3047 QRUPDATE libraries: $QRUPDATE_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3048 Qt CPPFLAGS: $QT_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3049 Qt LDFLAGS: $QT_LDFLAGS |
25934
332be8be16eb
dynamically load qt graphics
John W. Eaton <jwe@octave.org>
parents:
25885
diff
changeset
|
3050 Qt GUI libraries: $QT_LIBS |
332be8be16eb
dynamically load qt graphics
John W. Eaton <jwe@octave.org>
parents:
25885
diff
changeset
|
3051 Qt OpenGL libraries: $QT_OPENGL_LIBS |
22501
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3052 Qt moc: $MOC $MOCFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3053 Qt uic: $UIC $UICFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3054 Qt rcc: $RCC $RCCFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3055 Qt lrelease: $LRELEASE $LRELEASEFLAGS |
24876
7c7b60dd4d4c
Generate Qt compressed help and collection files for the manual (bug #53006)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24874
diff
changeset
|
3056 Qt qcollectiongenerator: $QCOLLECTIONGENERATOR $QCOLLECTIONGENERATORFLAGS |
24874
486bc22482ca
Improve Doxygen generation.
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24826
diff
changeset
|
3057 Qt qhelpgenerator: $QHELPGENERATOR $QHELPGENERATORFLAGS |
22501
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3058 READLINE libraries: $READLINE_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3059 Sndfile CPPFLAGS: $SNDFILE_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3060 Sndfile LDFLAGS: $SNDFILE_LDFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3061 Sndfile libraries: $SNDFILE_LIBS |
23990
6f56efc098bd
check for suitesparse config library before other suitesparse libraries
John W. Eaton <jwe@octave.org>
parents:
23989
diff
changeset
|
3062 SuiteSparse config libraries: $SUITESPARSECONFIG_LIBS |
23981
6420142ff32c
configure: fix capitalization of SUNDIALS, reword related terms
Mike Miller <mtmiller@octave.org>
parents:
23980
diff
changeset
|
3063 SUNDIALS IDA CPPFLAGS: $SUNDIALS_IDA_CPPFLAGS |
6420142ff32c
configure: fix capitalization of SUNDIALS, reword related terms
Mike Miller <mtmiller@octave.org>
parents:
23980
diff
changeset
|
3064 SUNDIALS IDA LDFLAGS: $SUNDIALS_IDA_LDFLAGS |
6420142ff32c
configure: fix capitalization of SUNDIALS, reword related terms
Mike Miller <mtmiller@octave.org>
parents:
23980
diff
changeset
|
3065 SUNDIALS IDA libraries: $SUNDIALS_IDA_LIBS |
6420142ff32c
configure: fix capitalization of SUNDIALS, reword related terms
Mike Miller <mtmiller@octave.org>
parents:
23980
diff
changeset
|
3066 SUNDIALS NVECTOR CPPFLAGS: $SUNDIALS_NVECSERIAL_CPPFLAGS |
6420142ff32c
configure: fix capitalization of SUNDIALS, reword related terms
Mike Miller <mtmiller@octave.org>
parents:
23980
diff
changeset
|
3067 SUNDIALS NVECTOR LDFLAGS: $SUNDIALS_NVECSERIAL_LDFLAGS |
6420142ff32c
configure: fix capitalization of SUNDIALS, reword related terms
Mike Miller <mtmiller@octave.org>
parents:
23980
diff
changeset
|
3068 SUNDIALS NVECTOR libraries: $SUNDIALS_NVECSERIAL_LIBS |
22501
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3069 TERM libraries: $TERM_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3070 UMFPACK CPPFLAGS: $UMFPACK_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3071 UMFPACK LDFLAGS: $UMFPACK_LDFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3072 UMFPACK libraries: $UMFPACK_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3073 X11 include flags: $X11_INCFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3074 X11 libraries: $X11_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3075 Z CPPFLAGS: $Z_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3076 Z LDFLAGS: $Z_LDFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3077 Z libraries: $Z_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3078 |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3079 Default pager: $DEFAULT_PAGER |
26074
658153e1976d
Fix failing BIST tests and oddities when gnuplot is not present (bug #55023).
Rik <rik@octave.org>
parents:
25846
diff
changeset
|
3080 gnuplot: $GNUPLOT_BINARY |
1664 | 3081 |
25097
cc21f66ecb1c
display more info in configure summary about Qt version and missing features
John W. Eaton <jwe@octave.org>
parents:
25078
diff
changeset
|
3082 Build Octave Qt GUI: $BUILD_QT_SUMMARY_MSG |
22992
7d5c56e38801
report BLAS integer size in less alarming way
John W. Eaton <jwe@octave.org>
parents:
22986
diff
changeset
|
3083 JIT compiler for loops: $ENABLE_JIT |
7d5c56e38801
report BLAS integer size in less alarming way
John W. Eaton <jwe@octave.org>
parents:
22986
diff
changeset
|
3084 Build Java interface: $build_java |
7d5c56e38801
report BLAS integer size in less alarming way
John W. Eaton <jwe@octave.org>
parents:
22986
diff
changeset
|
3085 Build static libraries: $STATIC_LIBS |
7d5c56e38801
report BLAS integer size in less alarming way
John W. Eaton <jwe@octave.org>
parents:
22986
diff
changeset
|
3086 Build shared libraries: $SHARED_LIBS |
25885
22ee68edcf3a
require dynamic loading capabilities to build Octave
John W. Eaton <jwe@octave.org>
parents:
25847
diff
changeset
|
3087 Dynamic Linking API: $DL_API_MSG |
22992
7d5c56e38801
report BLAS integer size in less alarming way
John W. Eaton <jwe@octave.org>
parents:
22986
diff
changeset
|
3088 Include support for GNU readline: $USE_READLINE |
7d5c56e38801
report BLAS integer size in less alarming way
John W. Eaton <jwe@octave.org>
parents:
22986
diff
changeset
|
3089 64-bit array dims and indexing: $ENABLE_64 |
7d5c56e38801
report BLAS integer size in less alarming way
John W. Eaton <jwe@octave.org>
parents:
22986
diff
changeset
|
3090 64-bit BLAS array dims and indexing: $HAVE_64_BIT_BLAS |
7d5c56e38801
report BLAS integer size in less alarming way
John W. Eaton <jwe@octave.org>
parents:
22986
diff
changeset
|
3091 OpenMP SMP multithreading: $ENABLE_OPENMP |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
3092 Truncate intermediate FP results: $ENABLE_FLOAT_TRUNCATE |
22992
7d5c56e38801
report BLAS integer size in less alarming way
John W. Eaton <jwe@octave.org>
parents:
22986
diff
changeset
|
3093 Build cross tools: $cross_tools |
7d5c56e38801
report BLAS integer size in less alarming way
John W. Eaton <jwe@octave.org>
parents:
22986
diff
changeset
|
3094 Build docs: $ENABLE_DOCS |
1225 | 3095 ]) |
3105 | 3096 |
3097 warn_msg_printed=false | |
3098 | |
14605
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
3099 OCTAVE_CONFIGURE_WARNING_SUMMARY |
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
3100 |
21378
172479a97e6c
configure.ac: Remove overquoting in shell variables tests.
Rik <rik@octave.org>
parents:
21374
diff
changeset
|
3101 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
|
3102 AC_MSG_WARN([]) |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
3103 AC_MSG_WARN([The libraries needed for OpenGL graphics were not found.]) |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
3104 AC_MSG_WARN([Creating plots is still possible if gnuplot is installed.]) |
10011
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3105 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
|
3106 fi |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3107 |
21131
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
3108 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
|
3109 AC_MSG_WARN([]) |
18584
89b7bd7d0b83
configure.ac: Use atomic reference counting by default for Qt toolkit.
Rik <rik@octave.org>
parents:
18551
diff
changeset
|
3110 AC_MSG_WARN([atomic reference counting disabled.]) |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
3111 AC_MSG_WARN([This feature allows safe access to Octave data from another thread,]) |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
3112 AC_MSG_WARN([and is required when using the GUI's Qt toolkit for plotting.]) |
18584
89b7bd7d0b83
configure.ac: Use atomic reference counting by default for Qt toolkit.
Rik <rik@octave.org>
parents:
18551
diff
changeset
|
3113 fi |
13985
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
3114 |
6191 | 3115 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
|
3116 AC_MSG_NOTICE([]) |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
3117 AC_MSG_NOTICE([NOTE: Libraries or auxiliary programs may be skipped if they are not found]) |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
3118 AC_MSG_NOTICE([NOTE: OR if they are missing required features on your system.]) |
6161 | 3119 fi |
3120 | |
3105 | 3121 ### End of configure. |