Mercurial > octave
annotate configure.ac @ 32195:9cb43336c3b3
audiowrite: Allow writing mp3 through libsndfile API (bug #64388).
* m4/acinclude.m4 (OCTAVE_CHECK_LIB_SNDFILE_FORMATS): New function that checks
if libsndfile is able to write specific audio formats (currently MPEG audio
formats, including mp3).
* configure.ac: Call OCTAVE_CHECK_LIB_SNDFILE_FORMATS if libsndfile can be used.
* libinterp/dldfcn/audioread.cc (extension_to_format): Add m1a lookup.
(audiowrite): For file extenstions .mp1, .mp2, or .mp3, explicitly assign
corresponding format and MPEG layer.
* etc/NEWS.9.md: Add note about new feature.
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Thu, 06 Jul 2023 11:56:37 -0400 |
parents | 1c99c8f020f7 |
children | 1ce1c922a34b |
rev | line source |
---|---|
5 | 1 dnl Process this file with autoconf to produce a configure script. |
2 dnl | |
27923
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
3 ######################################################################## |
29357
bbbe4dcc7200
use the same comment style for copyright headers in .m files and shell scripts
John W. Eaton <jwe@octave.org>
parents:
29114
diff
changeset
|
4 ## |
31706
597f3ee61a48
update Octave Project Developers copyright for the new year
John W. Eaton <jwe@octave.org>
parents:
31436
diff
changeset
|
5 ## Copyright (C) 1993-2023 The Octave Project Developers |
29357
bbbe4dcc7200
use the same comment style for copyright headers in .m files and shell scripts
John W. Eaton <jwe@octave.org>
parents:
29114
diff
changeset
|
6 ## |
bbbe4dcc7200
use the same comment style for copyright headers in .m files and shell scripts
John W. Eaton <jwe@octave.org>
parents:
29114
diff
changeset
|
7 ## See the file COPYRIGHT.md in the top-level directory of this |
bbbe4dcc7200
use the same comment style for copyright headers in .m files and shell scripts
John W. Eaton <jwe@octave.org>
parents:
29114
diff
changeset
|
8 ## distribution or <https://octave.org/copyright/>. |
bbbe4dcc7200
use the same comment style for copyright headers in .m files and shell scripts
John W. Eaton <jwe@octave.org>
parents:
29114
diff
changeset
|
9 ## |
bbbe4dcc7200
use the same comment style for copyright headers in .m files and shell scripts
John W. Eaton <jwe@octave.org>
parents:
29114
diff
changeset
|
10 ## This file is part of Octave. |
bbbe4dcc7200
use the same comment style for copyright headers in .m files and shell scripts
John W. Eaton <jwe@octave.org>
parents:
29114
diff
changeset
|
11 ## |
bbbe4dcc7200
use the same comment style for copyright headers in .m files and shell scripts
John W. Eaton <jwe@octave.org>
parents:
29114
diff
changeset
|
12 ## Octave is free software: you can redistribute it and/or modify it |
bbbe4dcc7200
use the same comment style for copyright headers in .m files and shell scripts
John W. Eaton <jwe@octave.org>
parents:
29114
diff
changeset
|
13 ## under the terms of the GNU General Public License as published by |
bbbe4dcc7200
use the same comment style for copyright headers in .m files and shell scripts
John W. Eaton <jwe@octave.org>
parents:
29114
diff
changeset
|
14 ## the Free Software Foundation, either version 3 of the License, or |
bbbe4dcc7200
use the same comment style for copyright headers in .m files and shell scripts
John W. Eaton <jwe@octave.org>
parents:
29114
diff
changeset
|
15 ## (at your option) any later version. |
bbbe4dcc7200
use the same comment style for copyright headers in .m files and shell scripts
John W. Eaton <jwe@octave.org>
parents:
29114
diff
changeset
|
16 ## |
bbbe4dcc7200
use the same comment style for copyright headers in .m files and shell scripts
John W. Eaton <jwe@octave.org>
parents:
29114
diff
changeset
|
17 ## Octave is distributed in the hope that it will be useful, but |
bbbe4dcc7200
use the same comment style for copyright headers in .m files and shell scripts
John W. Eaton <jwe@octave.org>
parents:
29114
diff
changeset
|
18 ## WITHOUT ANY WARRANTY; without even the implied warranty of |
bbbe4dcc7200
use the same comment style for copyright headers in .m files and shell scripts
John W. Eaton <jwe@octave.org>
parents:
29114
diff
changeset
|
19 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
bbbe4dcc7200
use the same comment style for copyright headers in .m files and shell scripts
John W. Eaton <jwe@octave.org>
parents:
29114
diff
changeset
|
20 ## GNU General Public License for more details. |
bbbe4dcc7200
use the same comment style for copyright headers in .m files and shell scripts
John W. Eaton <jwe@octave.org>
parents:
29114
diff
changeset
|
21 ## |
bbbe4dcc7200
use the same comment style for copyright headers in .m files and shell scripts
John W. Eaton <jwe@octave.org>
parents:
29114
diff
changeset
|
22 ## You should have received a copy of the GNU General Public License |
bbbe4dcc7200
use the same comment style for copyright headers in .m files and shell scripts
John W. Eaton <jwe@octave.org>
parents:
29114
diff
changeset
|
23 ## along with Octave; see the file COPYING. If not, see |
bbbe4dcc7200
use the same comment style for copyright headers in .m files and shell scripts
John W. Eaton <jwe@octave.org>
parents:
29114
diff
changeset
|
24 ## <https://www.gnu.org/licenses/>. |
bbbe4dcc7200
use the same comment style for copyright headers in .m files and shell scripts
John W. Eaton <jwe@octave.org>
parents:
29114
diff
changeset
|
25 ## |
27923
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
26 ######################################################################## |
869 | 27 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
28 ### Initialize Autoconf |
23505
021d0ea8fa00
* configure.ac (AC_PREREQ): Require autoconf version 2.65.
John W. Eaton <jwe@octave.org>
parents:
23495
diff
changeset
|
29 AC_PREREQ([2.65]) |
31438
9436924b09a2
maint: Bump versions to begin active development of Octave 9.
Rik <rik@octave.org>
parents:
31436
diff
changeset
|
30 AC_INIT([GNU Octave], [9.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
|
31 [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
|
32 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
33 ### Declare version numbers |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
34 |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
35 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
|
36 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
|
37 |
25590
02766a14c461
add info about version numbers in etc/HACKING.md file
John W. Eaton <jwe@octave.org>
parents:
25589
diff
changeset
|
38 ## 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
|
39 ## 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
|
40 ## versions. |
02766a14c461
add info about version numbers in etc/HACKING.md file
John W. Eaton <jwe@octave.org>
parents:
25589
diff
changeset
|
41 |
31438
9436924b09a2
maint: Bump versions to begin active development of Octave 9.
Rik <rik@octave.org>
parents:
31436
diff
changeset
|
42 OCTAVE_MAJOR_VERSION=9 |
25145
dfc6ccc2a3e8
set dev branch version to 5.0.0
John W. Eaton <jwe@octave.org>
parents:
25141
diff
changeset
|
43 OCTAVE_MINOR_VERSION=0 |
31438
9436924b09a2
maint: Bump versions to begin active development of Octave 9.
Rik <rik@octave.org>
parents:
31436
diff
changeset
|
44 OCTAVE_PATCH_VERSION=0 |
18229
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
45 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
46 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
|
47 OCTAVE_VERSION="$PACKAGE_VERSION" |
18229
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
48 |
31706
597f3ee61a48
update Octave Project Developers copyright for the new year
John W. Eaton <jwe@octave.org>
parents:
31436
diff
changeset
|
49 OCTAVE_COPYRIGHT="Copyright (C) 1993-2023 The Octave Project Developers." |
30334
8f8fab4c93ae
maint: Bump version for pre-release (see etc/HACKING.md)
John W. Eaton <jwe@octave.org>
parents:
30305
diff
changeset
|
50 |
32017 | 51 OCTAVE_RELEASE_DATE="2023-04-13" |
18229
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
52 |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
53 ## 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
|
54 ## 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
|
55 ## 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
|
56 ## library versioning, but not all systems support it. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
57 ## |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
58 ## 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
|
59 ## 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
|
60 ## 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
|
61 ## macros instead. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
62 dnl |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
63 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
|
64 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
|
65 dnl in some way instead of setting it independently here. |
31890 | 66 OCTAVE_API_VERSION="api-v58" |
18229
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
67 |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
68 AC_SUBST(OCTAVE_MAJOR_VERSION) |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
69 AC_SUBST(OCTAVE_MINOR_VERSION) |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
70 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
|
71 AC_SUBST(OCTAVE_VERSION) |
18229
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
72 AC_SUBST(OCTAVE_COPYRIGHT) |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
73 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
|
74 AC_SUBST(OCTAVE_API_VERSION) |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
75 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
76 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
|
77 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
|
78 dnl AC_REVISION($Revision: 1.603 $) |
15195 | 79 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
|
80 AC_CONFIG_HEADERS([config.h:config.in.h]) |
9946 | 81 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
|
82 AC_CONFIG_MACRO_DIR([m4]) |
869 | 83 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
84 ### Initialize Automake |
24162
312c00dd723a
use markdown for README and etc/HACKING files
John W. Eaton <jwe@octave.org>
parents:
24150
diff
changeset
|
85 AM_INIT_AUTOMAKE([1.14 -Wno-portability -Wno-override tar-ustar subdir-objects dist-lzip dist-xz]) |
9946 | 86 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
87 ## 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
|
88 AM_SILENT_RULES([yes]) |
17375
bc018154e46a
build: Support optional Automake silent rules
Mike Miller <mtmiller@ieee.org>
parents:
17330
diff
changeset
|
89 |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
90 OCTAVE_CANONICAL_HOST |
5844 | 91 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
92 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
|
93 |
9091
45c832e9976d
configure.in: require autoconf 2.60; eliminate some obsolete macros
John W. Eaton <jwe@octave.org>
parents:
9090
diff
changeset
|
94 AC_USE_SYSTEM_EXTENSIONS |
1667 | 95 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
96 ### 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
|
97 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
98 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
|
99 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
|
100 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
101 ### Set default file locations. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
102 |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
103 ## 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
|
104 ## architecture-dependent binaries. |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
105 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
|
106 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
107 ## 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
|
108 ## 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
|
109 ## that configurations for multiple versions of Octave may be installed at once. |
30305
c13204f823a6
build: Install all octave binaries to bindir on Windows.
Markus Mützel <markus.muetzel@gmx.de>
parents:
30290
diff
changeset
|
110 ## Windows search paths and relocation oddities require all binaries must be |
c13204f823a6
build: Install all octave binaries to bindir on Windows.
Markus Mützel <markus.muetzel@gmx.de>
parents:
30290
diff
changeset
|
111 ## installed in the same directory. |
c13204f823a6
build: Install all octave binaries to bindir on Windows.
Markus Mützel <markus.muetzel@gmx.de>
parents:
30290
diff
changeset
|
112 case $host_os in |
c13204f823a6
build: Install all octave binaries to bindir on Windows.
Markus Mützel <markus.muetzel@gmx.de>
parents:
30290
diff
changeset
|
113 mingw* | msdosmsvc) |
c13204f823a6
build: Install all octave binaries to bindir on Windows.
Markus Mützel <markus.muetzel@gmx.de>
parents:
30290
diff
changeset
|
114 OCTAVE_SET_DEFAULT([archlibdir], '${bindir}') ;; |
c13204f823a6
build: Install all octave binaries to bindir on Windows.
Markus Mützel <markus.muetzel@gmx.de>
parents:
30290
diff
changeset
|
115 *) |
c13204f823a6
build: Install all octave binaries to bindir on Windows.
Markus Mützel <markus.muetzel@gmx.de>
parents:
30290
diff
changeset
|
116 OCTAVE_SET_DEFAULT([archlibdir], |
c13204f823a6
build: Install all octave binaries to bindir on Windows.
Markus Mützel <markus.muetzel@gmx.de>
parents:
30290
diff
changeset
|
117 '${libexecdir}/octave/${version}/exec/${canonical_host_type}') ;; |
c13204f823a6
build: Install all octave binaries to bindir on Windows.
Markus Mützel <markus.muetzel@gmx.de>
parents:
30290
diff
changeset
|
118 esac |
21392
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
119 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
120 ## 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
|
121 ## 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
|
122 OCTAVE_SET_DEFAULT([localarchlibdir], |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
123 '${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
|
124 |
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
|
125 OCTAVE_SET_DEFAULT([localapiarchlibdir], |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
126 '${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
|
127 |
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
|
128 OCTAVE_SET_DEFAULT([localverarchlibdir], |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
129 '${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
|
130 |
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
131 ## 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
|
132 ## 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
|
133 ## 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
|
134 OCTAVE_SET_DEFAULT([octfiledir], |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
135 '${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
|
136 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
137 ## Directories that Octave should search for object files that will be |
31153
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
138 ## dynamically loaded and that are specific to this site (i.e., customizations), |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
139 ## 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
|
140 ## 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
|
141 OCTAVE_SET_DEFAULT([localoctfiledir], |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
142 '${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
|
143 |
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
|
144 OCTAVE_SET_DEFAULT([localapioctfiledir], |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
145 '${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
|
146 |
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
|
147 OCTAVE_SET_DEFAULT([localveroctfiledir], |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
148 '${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
|
149 |
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
150 ## 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
|
151 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
|
152 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
153 ## Where to install the function files distributed with Octave. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
154 ## 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
|
155 ## 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
|
156 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
|
157 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
158 ## Directories that Octave should search for function files specific to this |
31153
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
159 ## site (i.e., customizations), before consulting ${fcnfiledir}. |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
160 ## 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
|
161 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
|
162 |
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
|
163 OCTAVE_SET_DEFAULT([localapifcnfiledir], |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
164 '${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
|
165 |
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
166 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
|
167 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
168 ## 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
|
169 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
|
170 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
171 ## 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
|
172 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
|
173 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
174 ## 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
|
175 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
|
176 |
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
177 ## 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
|
178 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
|
179 |
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
180 ## 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
|
181 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
|
182 |
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
183 ## 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
|
184 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
|
185 |
bd0fcc69e48a
maint: eliminate unnecessary explicit Makefile variable substitutions
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
186 ## 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
|
187 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
|
188 |
24875
7c7b60dd4d4c
Generate Qt compressed help and collection files for the manual (bug #53006)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24873
diff
changeset
|
189 ## 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:
24873
diff
changeset
|
190 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:
24873
diff
changeset
|
191 |
24899
1a46d174a483
include a proper definition of Octave's private font fallback directory
Mike Miller <mtmiller@octave.org>
parents:
24890
diff
changeset
|
192 ## 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
|
193 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
|
194 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
195 ## Where Octave will look for startup files. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
196 OCTAVE_SET_DEFAULT([startupfiledir], '${fcnfiledir}/startup') |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
197 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
|
198 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
199 ## 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
|
200 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
|
201 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
|
202 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
|
203 |
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 ### 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
|
205 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
206 ## Programs used in configuring Octave. |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
207 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
|
208 PKG_PROG_PKG_CONFIG |
25391
26070f36f1e7
Provide octave configuration files for pkg-config (bug #48775)
Carnë Draug <carandraug@octave.org>
parents:
25333
diff
changeset
|
209 ## 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
|
210 PKG_INSTALLDIR |
26070f36f1e7
Provide octave configuration files for pkg-config (bug #48775)
Carnë Draug <carandraug@octave.org>
parents:
25333
diff
changeset
|
211 AC_SUBST([liboctave_pkgconfigdir], [$pkgconfigdir]) |
26070f36f1e7
Provide octave configuration files for pkg-config (bug #48775)
Carnë Draug <carandraug@octave.org>
parents:
25333
diff
changeset
|
212 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
|
213 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
214 ## 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
|
215 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
|
216 AC_PROG_GREP |
31344
989ebec75ff0
build: Use Autoconf macro to find egrep executable.
Rik <rik@octave.org>
parents:
31163
diff
changeset
|
217 AC_PROG_EGREP |
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
|
218 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
|
219 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
|
220 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
|
221 |
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 ## 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
|
223 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
|
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 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
|
226 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
|
227 |
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 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
|
229 |
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_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
|
231 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
|
232 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
|
233 |
24077
e483dcb5777d
build the source distribution archives reproducibly
Mike Miller <mtmiller@octave.org>
parents:
23993
diff
changeset
|
234 OCTAVE_PROG_TAR_REPRODUCIBLE |
e483dcb5777d
build the source distribution archives reproducibly
Mike Miller <mtmiller@octave.org>
parents:
23993
diff
changeset
|
235 |
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
|
236 ## 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
|
237 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
|
238 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
|
239 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
240 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
|
241 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
|
242 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
|
243 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
244 ## 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
|
245 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
|
246 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
|
247 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
|
248 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
|
249 |
19744
1687269e31e4
build: Generate Octave logo icons from SVG source (bug #37062)
Mike Miller <mtmiller@ieee.org>
parents:
19733
diff
changeset
|
250 ## 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
|
251 OCTAVE_PROG_ICOTOOL |
1687269e31e4
build: Generate Octave logo icons from SVG source (bug #37062)
Mike Miller <mtmiller@ieee.org>
parents:
19733
diff
changeset
|
252 OCTAVE_PROG_RSVG_CONVERT |
1687269e31e4
build: Generate Octave logo icons from SVG source (bug #37062)
Mike Miller <mtmiller@ieee.org>
parents:
19733
diff
changeset
|
253 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
|
254 [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
|
255 |
31153
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
256 ### Determine 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
|
257 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
258 sepchar=':' |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
259 AC_ARG_WITH([sepchar], |
5842 | 260 [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
|
261 [use <char> as the path separation character])]) |
5451 | 262 case $with_sepchar in |
263 yes | "") | |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
264 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
265 mingw* | msdosmsvc) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
266 sepchar=';' ;; |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
267 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
|
268 ;; |
5451 | 269 no) |
270 AC_MSG_ERROR([You are required to define a path separation character]) | |
271 ;; | |
272 *) | |
273 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
|
274 ;; |
5451 | 275 esac |
276 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
|
277 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
|
278 [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
|
279 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
|
280 [Define this to be the path separator for your system, as a string.]) |
5451 | 281 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
282 ### Define the path to the shell on the host system. |
31153
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
283 dnl Most systems will ensure /bin/sh is the default shell so this can be safely |
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
284 dnl ignored by almost everyone. However, there are exceptions, such as |
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
285 dnl Android, where 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
|
286 SHELL_PATH=/bin/sh |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
287 AC_ARG_WITH([shell], |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
288 [AS_HELP_STRING([--with-shell=SHELL], |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
289 [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
|
290 case $with_shell in |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
291 no) |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
292 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
|
293 ;; |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
294 yes | "") |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
295 ;; |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
296 *) |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
297 SHELL_PATH=$with_shell |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
298 ;; |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
299 esac |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
300 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
|
301 [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
|
302 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
303 ### Determine which C++ compiler to use (we expect to find g++). |
869 | 304 |
405 | 305 AC_PROG_CXX |
306 AC_PROG_CXXCPP | |
869 | 307 |
30671
9c98df2035a3
build: Check for compiler option to enable GNU extensions (bug #61812).
Markus Mützel <markus.muetzel@gmx.de>
parents:
30618
diff
changeset
|
308 ENABLE_STD_PMR_POLYMORPHIC_ALLOCATOR=no |
9c98df2035a3
build: Check for compiler option to enable GNU extensions (bug #61812).
Markus Mützel <markus.muetzel@gmx.de>
parents:
30618
diff
changeset
|
309 AC_ARG_ENABLE(std-pmr-polymorphic-allocator, |
9c98df2035a3
build: Check for compiler option to enable GNU extensions (bug #61812).
Markus Mützel <markus.muetzel@gmx.de>
parents:
30618
diff
changeset
|
310 [AS_HELP_STRING([--enable-std-pmr-polymorphic-allocator], |
31153
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
311 [build libraries requiring std::pmr::polymorphic_allocator if possible. This allows more efficient transfer of arrays at the .mex file interface. That also means that all libraries including Octave headers (e.g., .oct files) must be able to compile with that C++17 feature.])], |
30671
9c98df2035a3
build: Check for compiler option to enable GNU extensions (bug #61812).
Markus Mützel <markus.muetzel@gmx.de>
parents:
30618
diff
changeset
|
312 [case $enableval in |
9c98df2035a3
build: Check for compiler option to enable GNU extensions (bug #61812).
Markus Mützel <markus.muetzel@gmx.de>
parents:
30618
diff
changeset
|
313 yes) ENABLE_STD_PMR_POLYMORPHIC_ALLOCATOR=yes ;; |
9c98df2035a3
build: Check for compiler option to enable GNU extensions (bug #61812).
Markus Mützel <markus.muetzel@gmx.de>
parents:
30618
diff
changeset
|
314 no) ENABLE_STD_PMR_POLYMORPHIC_ALLOCATOR=no ;; |
9c98df2035a3
build: Check for compiler option to enable GNU extensions (bug #61812).
Markus Mützel <markus.muetzel@gmx.de>
parents:
30618
diff
changeset
|
315 *) AC_MSG_ERROR([bad value $enableval for --enable-std-pmr-polymorphic-allocator]) ;; |
9c98df2035a3
build: Check for compiler option to enable GNU extensions (bug #61812).
Markus Mützel <markus.muetzel@gmx.de>
parents:
30618
diff
changeset
|
316 esac]) |
9c98df2035a3
build: Check for compiler option to enable GNU extensions (bug #61812).
Markus Mützel <markus.muetzel@gmx.de>
parents:
30618
diff
changeset
|
317 |
31153
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
318 ### Determine compiler capabilities. |
30671
9c98df2035a3
build: Check for compiler option to enable GNU extensions (bug #61812).
Markus Mützel <markus.muetzel@gmx.de>
parents:
30618
diff
changeset
|
319 |
9c98df2035a3
build: Check for compiler option to enable GNU extensions (bug #61812).
Markus Mützel <markus.muetzel@gmx.de>
parents:
30618
diff
changeset
|
320 if test $ENABLE_STD_PMR_POLYMORPHIC_ALLOCATOR = yes; then |
30674
3ca33008c4a9
build: Don't force adding compiler flags to select a C++ dialect (bug #61812).
Markus Mützel <markus.muetzel@gmx.de>
parents:
30671
diff
changeset
|
321 ## Test for flags to fully support C++17. |
3ca33008c4a9
build: Don't force adding compiler flags to select a C++ dialect (bug #61812).
Markus Mützel <markus.muetzel@gmx.de>
parents:
30671
diff
changeset
|
322 ## Preferably with GNU extensions if flags are required. |
3ca33008c4a9
build: Don't force adding compiler flags to select a C++ dialect (bug #61812).
Markus Mützel <markus.muetzel@gmx.de>
parents:
30671
diff
changeset
|
323 AX_CXX_COMPILE_STDCXX(17, [], []) |
30671
9c98df2035a3
build: Check for compiler option to enable GNU extensions (bug #61812).
Markus Mützel <markus.muetzel@gmx.de>
parents:
30618
diff
changeset
|
324 else |
9c98df2035a3
build: Check for compiler option to enable GNU extensions (bug #61812).
Markus Mützel <markus.muetzel@gmx.de>
parents:
30618
diff
changeset
|
325 HAVE_CXX17=0 |
9c98df2035a3
build: Check for compiler option to enable GNU extensions (bug #61812).
Markus Mützel <markus.muetzel@gmx.de>
parents:
30618
diff
changeset
|
326 fi |
9c98df2035a3
build: Check for compiler option to enable GNU extensions (bug #61812).
Markus Mützel <markus.muetzel@gmx.de>
parents:
30618
diff
changeset
|
327 if test "$HAVE_CXX17" = 0; then |
30674
3ca33008c4a9
build: Don't force adding compiler flags to select a C++ dialect (bug #61812).
Markus Mützel <markus.muetzel@gmx.de>
parents:
30671
diff
changeset
|
328 ## Ensure that the C++ compiler fully supports C++11. |
3ca33008c4a9
build: Don't force adding compiler flags to select a C++ dialect (bug #61812).
Markus Mützel <markus.muetzel@gmx.de>
parents:
30671
diff
changeset
|
329 ## Preferably with GNU extensions if flags are required. |
3ca33008c4a9
build: Don't force adding compiler flags to select a C++ dialect (bug #61812).
Markus Mützel <markus.muetzel@gmx.de>
parents:
30671
diff
changeset
|
330 AX_CXX_COMPILE_STDCXX(11, [], mandatory) |
30671
9c98df2035a3
build: Check for compiler option to enable GNU extensions (bug #61812).
Markus Mützel <markus.muetzel@gmx.de>
parents:
30618
diff
changeset
|
331 fi |
9c98df2035a3
build: Check for compiler option to enable GNU extensions (bug #61812).
Markus Mützel <markus.muetzel@gmx.de>
parents:
30618
diff
changeset
|
332 |
9c98df2035a3
build: Check for compiler option to enable GNU extensions (bug #61812).
Markus Mützel <markus.muetzel@gmx.de>
parents:
30618
diff
changeset
|
333 if test $ENABLE_STD_PMR_POLYMORPHIC_ALLOCATOR = yes; then |
9c98df2035a3
build: Check for compiler option to enable GNU extensions (bug #61812).
Markus Mützel <markus.muetzel@gmx.de>
parents:
30618
diff
changeset
|
334 OCTAVE_CHECK_STD_PMR_POLYMORPHIC_ALLOCATOR |
9c98df2035a3
build: Check for compiler option to enable GNU extensions (bug #61812).
Markus Mützel <markus.muetzel@gmx.de>
parents:
30618
diff
changeset
|
335 fi |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
336 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
337 ### Determine which C compiler to use (we expect to find gcc). |
869 | 338 |
5 | 339 AC_PROG_CC |
405 | 340 AC_PROG_CPP |
832 | 341 AC_PROG_GCC_TRADITIONAL |
869 | 342 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
343 ## Save and restore CFLAGS and CXXFLAGS globally. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
344 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
|
345 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
|
346 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
|
347 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
|
348 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
|
349 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
|
350 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
|
351 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
352 ## Check for MSVC |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
353 have_msvc=no |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
354 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
355 msdosmsvc) |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
356 have_msvc=yes |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
357 ;; |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
358 mingw*) |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
359 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
|
360 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
|
361 #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
|
362 #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
|
363 #endif |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
364 ]])], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
365 have_msvc=yes, have_msvc=no) |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
366 AC_MSG_RESULT([$have_msvc]) |
405 | 367 ;; |
5 | 368 esac |
869 | 369 |
15142
f4684192158e
configure.ac: Split gnulib initialization into 2 parts to match recommended usage.
Rik <rik@octave.org>
parents:
15141
diff
changeset
|
370 ### gnulib initialization: part 1 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
371 dnl Must take place immediately after a compiler is determined |
9946 | 372 |
373 gl_EARLY | |
374 | |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
375 ### Check version number when using g++. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
376 |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
377 GXX_VERSION= |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
378 if test "$GXX" = yes; then |
31123
1d819b308578
build: cache Java, g++, and gcc compiler version numbers in configure (bug #62715)
Rik <rik@octave.org>
parents:
31122
diff
changeset
|
379 AC_CACHE_CHECK([g++ compiler version number], |
1d819b308578
build: cache Java, g++, and gcc compiler version numbers in configure (bug #62715)
Rik <rik@octave.org>
parents:
31122
diff
changeset
|
380 [octave_cv_gxx_version], |
1d819b308578
build: cache Java, g++, and gcc compiler version numbers in configure (bug #62715)
Rik <rik@octave.org>
parents:
31122
diff
changeset
|
381 [octave_cv_gxx_version=[`$CXX -v 2>&1 | $GREP "^.*g.. version" | $SED -e 's/^.*g.. version *//' -e 's/cygnus-//' -e 's/egcs-//' -e 's/ .*//'`] |
1d819b308578
build: cache Java, g++, and gcc compiler version numbers in configure (bug #62715)
Rik <rik@octave.org>
parents:
31122
diff
changeset
|
382 ]) |
1d819b308578
build: cache Java, g++, and gcc compiler version numbers in configure (bug #62715)
Rik <rik@octave.org>
parents:
31122
diff
changeset
|
383 |
1d819b308578
build: cache Java, g++, and gcc compiler version numbers in configure (bug #62715)
Rik <rik@octave.org>
parents:
31122
diff
changeset
|
384 AX_COMPARE_VERSION([$octave_cv_gxx_version], [lt], [4.1], |
1d819b308578
build: cache Java, g++, and gcc compiler version numbers in configure (bug #62715)
Rik <rik@octave.org>
parents:
31122
diff
changeset
|
385 [warn_gxx_version="g++ version $octave_cv_gxx_version is likely to cause problems" |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
386 OCTAVE_CONFIGURE_WARNING([warn_gxx_version])]) |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
387 |
31123
1d819b308578
build: cache Java, g++, and gcc compiler version numbers in configure (bug #62715)
Rik <rik@octave.org>
parents:
31122
diff
changeset
|
388 GXX_VERSION=$octave_cv_gxx_version |
2108 | 389 fi |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
390 AC_SUBST(GXX_VERSION) |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
391 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
392 ### Check version number when using gcc. |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
393 dnl It might be different from the g++ version number. |
869 | 394 |
15167
1c711a646fa7
Deprecate configure variables CC_VERSION, CXX_VERSION.
Rik <rik@octave.org>
parents:
15166
diff
changeset
|
395 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
|
396 if test "$GCC" = yes; then |
31123
1d819b308578
build: cache Java, g++, and gcc compiler version numbers in configure (bug #62715)
Rik <rik@octave.org>
parents:
31122
diff
changeset
|
397 AC_CACHE_CHECK([gcc compiler version number], |
1d819b308578
build: cache Java, g++, and gcc compiler version numbers in configure (bug #62715)
Rik <rik@octave.org>
parents:
31122
diff
changeset
|
398 [octave_cv_gcc_version], |
1d819b308578
build: cache Java, g++, and gcc compiler version numbers in configure (bug #62715)
Rik <rik@octave.org>
parents:
31122
diff
changeset
|
399 [octave_cv_gcc_version=[`$CC -v 2>&1 | $GREP "^.*gcc version" | $SED -e 's/^.*g.. version *//' -e 's/cygnus-//' -e 's/egcs-//' -e 's/ .*//'`] |
1d819b308578
build: cache Java, g++, and gcc compiler version numbers in configure (bug #62715)
Rik <rik@octave.org>
parents:
31122
diff
changeset
|
400 ]) |
1d819b308578
build: cache Java, g++, and gcc compiler version numbers in configure (bug #62715)
Rik <rik@octave.org>
parents:
31122
diff
changeset
|
401 |
1d819b308578
build: cache Java, g++, and gcc compiler version numbers in configure (bug #62715)
Rik <rik@octave.org>
parents:
31122
diff
changeset
|
402 AX_COMPARE_VERSION([$octave_cv_gcc_version], [lt], [3], |
1d819b308578
build: cache Java, g++, and gcc compiler version numbers in configure (bug #62715)
Rik <rik@octave.org>
parents:
31122
diff
changeset
|
403 [warn_gcc_version="gcc version $octave_cv_gcc_version is likely to cause problems" |
15170
a44ff4f0a20b
Add AX_COMPARE_VERSION.m4 macro m4/ dir to make configure.ac simpler.
Rik <rik@octave.org>
parents:
15168
diff
changeset
|
404 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
|
405 |
31123
1d819b308578
build: cache Java, g++, and gcc compiler version numbers in configure (bug #62715)
Rik <rik@octave.org>
parents:
31122
diff
changeset
|
406 GCC_VERSION=$octave_cv_gcc_version |
1894 | 407 fi |
17877
540d1c122b08
* configure.ac: Also check for g++ version.
John W. Eaton <jwe@octave.org>
parents:
17844
diff
changeset
|
408 AC_SUBST(GCC_VERSION) |
1894 | 409 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
410 ## 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
|
411 ## 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
|
412 ## just disable them for all platforms. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
413 |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
414 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
|
415 AC_DEFINE(__NO_MATH_INLINES, 1, |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
416 [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
|
417 |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
418 ### Determine the compiler flag necessary to create dependencies. |
3775 | 419 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
420 ## Assume GCC. |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
421 INCLUDE_DEPS=yes |
3775 | 422 DEPEND_FLAGS="-M" |
423 DEPEND_EXTRA_SED_PATTERN="" | |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
424 if test "$GCC" != yes; then |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
425 case $canonical_host_type in |
6087 | 426 sparc-sun-solaris2* | i386-pc-solaris2*) |
3775 | 427 DEPEND_FLAGS="-xM1" |
428 DEPEND_EXTRA_SED_PATTERN="-e '/\/opt\/SUNWspro/d'" | |
6087 | 429 ;; |
7451 | 430 *-*-msdosmsvc) |
431 ;; | |
10123
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
432 *-*-mingw*) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
433 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
|
434 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
|
435 fi |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
436 ;; |
6087 | 437 *) |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
438 INCLUDE_DEPS=no |
6087 | 439 ;; |
440 esac | |
441 fi | |
442 AC_SUBST(INCLUDE_DEPS) | |
3775 | 443 AC_SUBST(DEPEND_FLAGS) |
444 AC_SUBST(DEPEND_EXTRA_SED_PATTERN) | |
445 | |
25552
5f9fa229cc8a
configure.ac: Reorder tests so that FPICFLAG is correctly set on Solaris (bug #54235).
Rik <rik@octave.org>
parents:
25519
diff
changeset
|
446 ### 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
|
447 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
|
448 |
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 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
|
450 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
|
451 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
|
452 |
31153
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
453 ### Determine the Fortran compiler and how to invoke it. |
25552
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 ## 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
|
456 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
|
457 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
|
458 ## 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
|
459 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
|
460 fi |
5f9fa229cc8a
configure.ac: Reorder tests so that FPICFLAG is correctly set on Solaris (bug #54235).
Rik <rik@octave.org>
parents:
25519
diff
changeset
|
461 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
|
462 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
|
463 fi |
5f9fa229cc8a
configure.ac: Reorder tests so that FPICFLAG is correctly set on Solaris (bug #54235).
Rik <rik@octave.org>
parents:
25519
diff
changeset
|
464 |
5f9fa229cc8a
configure.ac: Reorder tests so that FPICFLAG is correctly set on Solaris (bug #54235).
Rik <rik@octave.org>
parents:
25519
diff
changeset
|
465 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
|
466 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
|
467 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
|
468 else |
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(no) |
25559
4fe32753cb56
move some fortran and dynamic linking configure checks to separate macros
John W. Eaton <jwe@octave.org>
parents:
25552
diff
changeset
|
470 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
|
471 fi |
5f9fa229cc8a
configure.ac: Reorder tests so that FPICFLAG is correctly set on Solaris (bug #54235).
Rik <rik@octave.org>
parents:
25519
diff
changeset
|
472 |
5f9fa229cc8a
configure.ac: Reorder tests so that FPICFLAG is correctly set on Solaris (bug #54235).
Rik <rik@octave.org>
parents:
25519
diff
changeset
|
473 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
|
474 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
|
475 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
|
476 |
31153
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
477 ## Must appear after checks for Fortran compiler. |
25559
4fe32753cb56
move some fortran and dynamic linking configure checks to separate macros
John W. Eaton <jwe@octave.org>
parents:
25552
diff
changeset
|
478 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
|
479 |
31153
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
480 ## Must appear after checks for all compilers. |
25559
4fe32753cb56
move some fortran and dynamic linking configure checks to separate macros
John W. Eaton <jwe@octave.org>
parents:
25552
diff
changeset
|
481 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
|
482 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
483 ### Use a 64-bit integer type for array dimensions and indexing, if possible. |
5275 | 484 |
29688
b36e83cdbf05
ensure idx_vector(int) constructor is defined (bug #60531)
John W. Eaton <jwe@octave.org>
parents:
29687
diff
changeset
|
485 AC_CHECK_SIZEOF([int]) |
b36e83cdbf05
ensure idx_vector(int) constructor is defined (bug #60531)
John W. Eaton <jwe@octave.org>
parents:
29687
diff
changeset
|
486 AC_DEFINE_UNQUOTED(OCTAVE_SIZEOF_INT, [$ac_cv_sizeof_int], |
b36e83cdbf05
ensure idx_vector(int) constructor is defined (bug #60531)
John W. Eaton <jwe@octave.org>
parents:
29687
diff
changeset
|
487 [Define to the size of int.]) |
b36e83cdbf05
ensure idx_vector(int) constructor is defined (bug #60531)
John W. Eaton <jwe@octave.org>
parents:
29687
diff
changeset
|
488 |
22986
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
489 AC_CHECK_SIZEOF([void *]) |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
490 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
|
491 ENABLE_64=yes |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
492 else |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
493 ENABLE_64=no |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
494 fi |
23563
614d71cdf614
maint: Strip trailing whitespace from files.
John W. Eaton <jwe@octave.org>
parents:
23505
diff
changeset
|
495 |
5275 | 496 AC_ARG_ENABLE(64, |
22986
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
497 [AS_HELP_STRING([--disable-64], |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
498 [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
|
499 [case $enableval in |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
500 yes) ENABLE_64=yes ;; |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
501 no) ENABLE_64=no ;; |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
502 *) 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
|
503 esac]) |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
504 |
21131
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
505 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
|
506 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
|
507 OCTAVE_IDX_TYPE=int64_t |
5275 | 508 else |
22986
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
509 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
|
510 OCTAVE_CONFIGURE_WARNING([warn_64_bit]) |
22986
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
511 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
|
512 ENABLE_64=no |
5275 | 513 fi |
22995
5fdf29cb4ab8
set OCTAVE_IDX_TYPE correctly when using --disable-64 (bug #49985)
John W. Eaton <jwe@octave.org>
parents:
22992
diff
changeset
|
514 else |
5fdf29cb4ab8
set OCTAVE_IDX_TYPE correctly when using --disable-64 (bug #49985)
John W. Eaton <jwe@octave.org>
parents:
22992
diff
changeset
|
515 OCTAVE_IDX_TYPE=int32_t |
5275 | 516 fi |
22986
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
517 |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
518 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
|
519 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
|
520 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
|
521 AC_DEFINE(OCTAVE_ENABLE_64, 1, |
23009
624f76f2ca51
configure.ac: Use a common style for messages.
Rik <rik@octave.org>
parents:
23007
diff
changeset
|
522 [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
|
523 else |
7a9313d27cea
define macros for size of idx_type and f77_int_type
John W. Eaton <jwe@octave.org>
parents:
23010
diff
changeset
|
524 octave_sizeof_octave_idx_type=4 |
5275 | 525 fi |
22986
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
526 |
23014
7a9313d27cea
define macros for size of idx_type and f77_int_type
John W. Eaton <jwe@octave.org>
parents:
23010
diff
changeset
|
527 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
|
528 [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
|
529 |
5275 | 530 AC_SUBST(OCTAVE_IDX_TYPE) |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
531 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
|
532 [Define to the type of octave_idx_type (64 or 32 bit signed integer).]) |
5275 | 533 |
31982
86eb373a6c64
build: Check whether using STL from LLVM or Apple (bug #63930).
Markus Mützel <markus.muetzel@gmx.de>
parents:
31953
diff
changeset
|
534 ### Check for LLVM or Apple libc++ library. |
86eb373a6c64
build: Check whether using STL from LLVM or Apple (bug #63930).
Markus Mützel <markus.muetzel@gmx.de>
parents:
31953
diff
changeset
|
535 |
86eb373a6c64
build: Check whether using STL from LLVM or Apple (bug #63930).
Markus Mützel <markus.muetzel@gmx.de>
parents:
31953
diff
changeset
|
536 OCTAVE_LLVM_LIBCXX |
86eb373a6c64
build: Check whether using STL from LLVM or Apple (bug #63930).
Markus Mützel <markus.muetzel@gmx.de>
parents:
31953
diff
changeset
|
537 |
31153
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
538 ### Check for pthread library. |
22398
1442ae783e1f
check for pthread and openmp libs before shared lib support (bug #48786)
John W. Eaton <jwe@octave.org>
parents:
22345
diff
changeset
|
539 |
1442ae783e1f
check for pthread and openmp libs before shared lib support (bug #48786)
John W. Eaton <jwe@octave.org>
parents:
22345
diff
changeset
|
540 AX_PTHREAD |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
541 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
|
542 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
|
543 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
|
544 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
|
545 XTRA_CXXFLAGS="$XTRA_CXXFLAGS $PTHREAD_CFLAGS" |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
546 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
|
547 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
|
548 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
|
549 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
|
550 |
28527
9e7b2625e574
ov-java.cc: Set reaper thread to use default stack size (bug #58641).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28269
diff
changeset
|
551 dnl Check if glibc uses wrong stack size |
9e7b2625e574
ov-java.cc: Set reaper thread to use default stack size (bug #58641).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28269
diff
changeset
|
552 OCTAVE_CHECK_BROKEN_PTHREAD_STACKSIZE |
9e7b2625e574
ov-java.cc: Set reaper thread to use default stack size (bug #58641).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28269
diff
changeset
|
553 AM_CONDITIONAL([OCTAVE_CHECK_BROKEN_PTHREAD_STACKSIZE], |
9e7b2625e574
ov-java.cc: Set reaper thread to use default stack size (bug #58641).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28269
diff
changeset
|
554 [test $octave_cv_broken_pthread_stacksize = yes]) |
9e7b2625e574
ov-java.cc: Set reaper thread to use default stack size (bug #58641).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28269
diff
changeset
|
555 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
556 ### Test whether the compiler supports OpenMP. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
557 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
|
558 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
|
559 |
1442ae783e1f
check for pthread and openmp libs before shared lib support (bug #48786)
John W. Eaton <jwe@octave.org>
parents:
22345
diff
changeset
|
560 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
|
561 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
|
562 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
|
563 [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
|
564 [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
|
565 [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
|
566 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
|
567 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
|
568 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
|
569 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
|
570 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
|
571 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
|
572 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
|
573 fi |
1442ae783e1f
check for pthread and openmp libs before shared lib support (bug #48786)
John W. Eaton <jwe@octave.org>
parents:
22345
diff
changeset
|
574 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
575 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
|
576 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
|
577 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
|
578 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
|
579 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
580 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
|
581 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
|
582 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
|
583 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
|
584 AC_CHECK_FUNCS([omp_get_num_threads]) |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
585 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
|
586 fi |
1442ae783e1f
check for pthread and openmp libs before shared lib support (bug #48786)
John W. Eaton <jwe@octave.org>
parents:
22345
diff
changeset
|
587 |
31153
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
588 ### Start determination of shared vs. static libraries. |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
589 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
590 ## 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
|
591 case $canonical_host_type in |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
592 alpha*-dec-osf1.3) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
593 LD_STATIC_FLAG=-static |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
594 ;; |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
595 esac |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
596 if test -n "$LD_STATIC_FLAG"; then |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
597 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
|
598 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
599 AC_SUBST(LD_STATIC_FLAG) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
600 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
601 ## 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
|
602 OCTAVE_PROG_AR |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
603 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
604 ifdef([LT_INIT], [], [ |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
605 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
|
606 ]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
607 m4exit([1])]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
608 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
609 LT_PREREQ([2.2.2]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
610 LT_INIT([disable-static dlopen win32-dll]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
611 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
612 if test $enable_shared = yes; then |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
613 SHARED_LIBS=yes |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
614 else |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
615 SHARED_LIBS=no |
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(SHARED_LIBS) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
618 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
619 if test $enable_static = yes; then |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
620 STATIC_LIBS=yes |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
621 else |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
622 STATIC_LIBS=no |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
623 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
624 AC_SUBST(STATIC_LIBS) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
625 |
23434
f4d4d83f15c5
maint: rename cruft/ directory to external/
Rik <rik@octave.org>
parents:
23426
diff
changeset
|
626 XTRA_EXTERNAL_SH_LDFLAGS= |
29239
f6058c6e1b18
Visibility: Compile with visibility attributes for Windows (patch #8919).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29129
diff
changeset
|
627 case $host_os in |
31325
52ccba0f1af9
build: Use .def file for symbols exported from libexternal also for Cygwin.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31323
diff
changeset
|
628 msdosmsvc | mingw* | cygwin*) |
29239
f6058c6e1b18
Visibility: Compile with visibility attributes for Windows (patch #8919).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29129
diff
changeset
|
629 FLIBS="$FLIBS -lkernel32" |
f6058c6e1b18
Visibility: Compile with visibility attributes for Windows (patch #8919).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29129
diff
changeset
|
630 XTRA_EXTERNAL_SH_LDFLAGS="-Wl,liboctave/external/external.def" |
f6058c6e1b18
Visibility: Compile with visibility attributes for Windows (patch #8919).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29129
diff
changeset
|
631 ;; |
f6058c6e1b18
Visibility: Compile with visibility attributes for Windows (patch #8919).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29129
diff
changeset
|
632 esac |
23434
f4d4d83f15c5
maint: rename cruft/ directory to external/
Rik <rik@octave.org>
parents:
23426
diff
changeset
|
633 AC_SUBST(XTRA_EXTERNAL_SH_LDFLAGS) |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
634 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
635 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
|
636 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
|
637 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
638 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
639 ### More configure argument checking related to linking |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
640 |
29588
b4cb9d04f3cf
build: Use dynamic symbol lookup for functions in libraries on macOS (bug #53627).
Andrew Janke <andrew@apjanke.net>
parents:
29555
diff
changeset
|
641 case $host_os in |
31323
5c897507d9ed
build: Add Cygwin to the platforms that require -no-undefined when linking.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31166
diff
changeset
|
642 msdosmsvc | mingw* | cygwin* | AIX | BeOS | OS/2 ) |
29588
b4cb9d04f3cf
build: Use dynamic symbol lookup for functions in libraries on macOS (bug #53627).
Andrew Janke <andrew@apjanke.net>
parents:
29555
diff
changeset
|
643 DEFAULT_NO_UNDEFINED_LDFLAG="-no-undefined" |
b4cb9d04f3cf
build: Use dynamic symbol lookup for functions in libraries on macOS (bug #53627).
Andrew Janke <andrew@apjanke.net>
parents:
29555
diff
changeset
|
644 ;; |
b4cb9d04f3cf
build: Use dynamic symbol lookup for functions in libraries on macOS (bug #53627).
Andrew Janke <andrew@apjanke.net>
parents:
29555
diff
changeset
|
645 *) |
b4cb9d04f3cf
build: Use dynamic symbol lookup for functions in libraries on macOS (bug #53627).
Andrew Janke <andrew@apjanke.net>
parents:
29555
diff
changeset
|
646 DEFAULT_NO_UNDEFINED_LDFLAG="" |
b4cb9d04f3cf
build: Use dynamic symbol lookup for functions in libraries on macOS (bug #53627).
Andrew Janke <andrew@apjanke.net>
parents:
29555
diff
changeset
|
647 ;; |
b4cb9d04f3cf
build: Use dynamic symbol lookup for functions in libraries on macOS (bug #53627).
Andrew Janke <andrew@apjanke.net>
parents:
29555
diff
changeset
|
648 esac |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
649 AC_ARG_ENABLE([no-undefined], |
29588
b4cb9d04f3cf
build: Use dynamic symbol lookup for functions in libraries on macOS (bug #53627).
Andrew Janke <andrew@apjanke.net>
parents:
29555
diff
changeset
|
650 [AS_HELP_STRING([--enable-no-undefined], |
31323
5c897507d9ed
build: Add Cygwin to the platforms that require -no-undefined when linking.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31166
diff
changeset
|
651 [pass -no-undefined to libtool when linking Octave and its shared libraries. This is done by default for msdosmsvc, mingw*, cygwin*, AIX, BeOS, or OS/2 hosts.])], |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
652 [case $enableval in |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
653 yes) NO_UNDEFINED_LDFLAG="-no-undefined" ;; |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
654 no) NO_UNDEFINED_LDFLAG="" ;; |
29588
b4cb9d04f3cf
build: Use dynamic symbol lookup for functions in libraries on macOS (bug #53627).
Andrew Janke <andrew@apjanke.net>
parents:
29555
diff
changeset
|
655 *) AC_MSG_ERROR([bad value $enableval for --enable-no-undefined]) ;; |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
656 esac], |
29588
b4cb9d04f3cf
build: Use dynamic symbol lookup for functions in libraries on macOS (bug #53627).
Andrew Janke <andrew@apjanke.net>
parents:
29555
diff
changeset
|
657 [NO_UNDEFINED_LDFLAG="$DEFAULT_NO_UNDEFINED_LDFLAG"]) |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
658 AC_SUBST(NO_UNDEFINED_LDFLAG) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
659 |
31331
900c7d9f7fdd
build: Default to link all dependencies for Cygwin and macOS hosts (bug #55367).
Markus Mützel <markus.muetzel@gmx.de>
parents:
31325
diff
changeset
|
660 case $host_os in |
31359
ee03da4812fd
build: Revert defaulting to link all dependencies for macOS hosts (bug #55367).
Markus Mützel <markus.muetzel@gmx.de>
parents:
31345
diff
changeset
|
661 cygwin* ) |
31331
900c7d9f7fdd
build: Default to link all dependencies for Cygwin and macOS hosts (bug #55367).
Markus Mützel <markus.muetzel@gmx.de>
parents:
31325
diff
changeset
|
662 DEFAULT_LINK_ALL_DEPS="yes" |
900c7d9f7fdd
build: Default to link all dependencies for Cygwin and macOS hosts (bug #55367).
Markus Mützel <markus.muetzel@gmx.de>
parents:
31325
diff
changeset
|
663 ;; |
900c7d9f7fdd
build: Default to link all dependencies for Cygwin and macOS hosts (bug #55367).
Markus Mützel <markus.muetzel@gmx.de>
parents:
31325
diff
changeset
|
664 *) |
900c7d9f7fdd
build: Default to link all dependencies for Cygwin and macOS hosts (bug #55367).
Markus Mützel <markus.muetzel@gmx.de>
parents:
31325
diff
changeset
|
665 DEFAULT_LINK_ALL_DEPS="no" |
900c7d9f7fdd
build: Default to link all dependencies for Cygwin and macOS hosts (bug #55367).
Markus Mützel <markus.muetzel@gmx.de>
parents:
31325
diff
changeset
|
666 ;; |
900c7d9f7fdd
build: Default to link all dependencies for Cygwin and macOS hosts (bug #55367).
Markus Mützel <markus.muetzel@gmx.de>
parents:
31325
diff
changeset
|
667 esac |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
668 AC_ARG_ENABLE([link-all-dependencies], |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
669 [AS_HELP_STRING([--enable-link-all-dependencies], |
31331
900c7d9f7fdd
build: Default to link all dependencies for Cygwin and macOS hosts (bug #55367).
Markus Mützel <markus.muetzel@gmx.de>
parents:
31325
diff
changeset
|
670 [link Octave and its shared libraries with all dependencies, not just those immediately referenced (should not be needed on most systems). This is done by default for cygwin* or darwin* hosts.])], |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
671 [case $enableval in |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
672 yes) link_all_deps=yes ;; |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
673 no) link_all_deps=no ;; |
29588
b4cb9d04f3cf
build: Use dynamic symbol lookup for functions in libraries on macOS (bug #53627).
Andrew Janke <andrew@apjanke.net>
parents:
29555
diff
changeset
|
674 *) AC_MSG_ERROR([bad value $enableval for --enable-link-all-dependencies]) |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
675 ;; |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
676 esac], |
31331
900c7d9f7fdd
build: Default to link all dependencies for Cygwin and macOS hosts (bug #55367).
Markus Mützel <markus.muetzel@gmx.de>
parents:
31325
diff
changeset
|
677 [link_all_deps="$DEFAULT_LINK_ALL_DEPS"]) |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
678 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
|
679 |
31153
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
680 ### Check for BLAS and LAPACK libraries. |
22986
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
681 |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
682 ## 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
|
683 save_FFLAGS="$FFLAGS" |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
684 FFLAGS="$FFLAGS $F77_INTEGER_8_FLAG" |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
685 |
31129
4dc326899f65
build: simplify BLAS library detection in configure (bug #62715)
Rik <rik@octave.org>
parents:
31125
diff
changeset
|
686 OCTAVE_BLAS |
27488
3fe26656e73c
ensure that HAVE_BLAS and HAVE_LAPACK are defined (bug #57042)
John W. Eaton <jwe@octave.org>
parents:
27486
diff
changeset
|
687 AX_LAPACK |
22986
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
688 |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
689 ## Restore FFLAGS. |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
690 FFLAGS="$save_FFLAGS" |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
691 |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
692 ## If necessary, try again with -ff2c in FFLAGS |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
693 if test $ax_blas_ok = no; then |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
694 save_FFLAGS="$FFLAGS" |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
695 FFLAGS="-ff2c $FFLAGS $F77_INTEGER_8_FLAG" |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
696 |
31129
4dc326899f65
build: simplify BLAS library detection in configure (bug #62715)
Rik <rik@octave.org>
parents:
31125
diff
changeset
|
697 OCTAVE_BLAS |
27488
3fe26656e73c
ensure that HAVE_BLAS and HAVE_LAPACK are defined (bug #57042)
John W. Eaton <jwe@octave.org>
parents:
27486
diff
changeset
|
698 AX_LAPACK |
22986
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
699 |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
700 ## Restore FFLAGS, with -ff2c if that was helpful |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
701 if test $ax_blas_ok = yes; then |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
702 FFLAGS="-ff2c $save_FFLAGS" |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
703 else |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
704 FFLAGS="$save_FFLAGS" |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
705 fi |
22345
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
706 fi |
22986
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
707 |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
708 ## 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
|
709 if test $ax_blas_ok = no; then |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
710 case $host_os in |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
711 darwin*) |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
712 ## test if wrapper functions help |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
713 octave_blaswrap_save_CFLAGS="$CFLAGS" |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
714 CFLAGS="$CFLAGS -DUSE_BLASWRAP" |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
715 AC_LANG_PUSH(C) |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
716 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
|
717 #include "liboctave/util/blaswrap.c" |
22986
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
718 ]])], |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
719 [mv conftest.$ac_objext blaswrap.$ac_objext |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
720 octave_blaswrap_save_BLAS_LIBS="$BLAS_LIBS" |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
721 BLAS_LIBS="blaswrap.$ac_objext -framework vecLib" |
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 save_FFLAGS="$FFLAGS" |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
724 FFLAGS="$FFLAGS $F77_INTEGER_8_FLAG" |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
725 |
31129
4dc326899f65
build: simplify BLAS library detection in configure (bug #62715)
Rik <rik@octave.org>
parents:
31125
diff
changeset
|
726 OCTAVE_BLAS |
27488
3fe26656e73c
ensure that HAVE_BLAS and HAVE_LAPACK are defined (bug #57042)
John W. Eaton <jwe@octave.org>
parents:
27486
diff
changeset
|
727 AX_LAPACK |
22986
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
728 |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
729 ## Restore FFLAGS. |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
730 FFLAGS="$save_FFLAGS" |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
731 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
732 dnl remove temp file |
22986
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
733 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
|
734 [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
|
735 AC_LANG_POP(C) |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
736 CFLAGS="$octave_blaswrap_save_CFLAGS" |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
737 |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
738 if test $ax_blas_ok = no; then |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
739 BLAS_LIBS="$octave_blaswrap_save_BLAS_LIBS" |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
740 else |
23426
58d56f52d50a
move contents of liboctave/cruft/misc to liboctave/util
John W. Eaton <jwe@octave.org>
parents:
23389
diff
changeset
|
741 ## 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
|
742 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
|
743 AC_DEFINE(USE_BLASWRAP, 1, |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
744 [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
|
745 fi |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
746 ;; |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
747 esac |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
748 fi |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
749 |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
750 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
|
751 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
|
752 fi |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
753 |
31122
1077a1c277fb
build: Use caching for Fortran values in configure.
Rik <rik@octave.org>
parents:
31095
diff
changeset
|
754 case $ax_cv_blas_integer_size in |
22992
7d5c56e38801
report BLAS integer size in less alarming way
John W. Eaton <jwe@octave.org>
parents:
22986
diff
changeset
|
755 4) |
7d5c56e38801
report BLAS integer size in less alarming way
John W. Eaton <jwe@octave.org>
parents:
22986
diff
changeset
|
756 HAVE_64_BIT_BLAS=no |
7d5c56e38801
report BLAS integer size in less alarming way
John W. Eaton <jwe@octave.org>
parents:
22986
diff
changeset
|
757 ;; |
7d5c56e38801
report BLAS integer size in less alarming way
John W. Eaton <jwe@octave.org>
parents:
22986
diff
changeset
|
758 8) |
7d5c56e38801
report BLAS integer size in less alarming way
John W. Eaton <jwe@octave.org>
parents:
22986
diff
changeset
|
759 HAVE_64_BIT_BLAS=yes |
22986
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
760 ;; |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
761 *) |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
762 AC_MSG_ERROR([unrecognized BLAS library integer size]) |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
763 ;; |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
764 esac |
22345
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
765 |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
766 OCTAVE_CHECK_SIZEOF_FORTRAN_INTEGER |
31122
1077a1c277fb
build: Use caching for Fortran values in configure.
Rik <rik@octave.org>
parents:
31095
diff
changeset
|
767 if test $octave_cv_sizeof_fortran_integer -ne $ax_cv_blas_integer_size; then |
1077a1c277fb
build: Use caching for Fortran values in configure.
Rik <rik@octave.org>
parents:
31095
diff
changeset
|
768 if test $ax_cv_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
|
769 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
|
770 *gfortran*) |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
771 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
|
772 *-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
|
773 ;; |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
774 *) |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
775 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
|
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 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
|
778 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
|
779 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
|
780 ;; |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
781 *) |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
782 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
|
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 ## 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
|
785 $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
|
786 ;; |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
787 esac |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
788 ;; |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
789 esac |
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 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
|
793 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
|
794 fi |
22986
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
795 fi |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
796 ## 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
|
797 ## Fortran integer size is 8 but BLAS appears to use 4-byte integers. |
31122
1077a1c277fb
build: Use caching for Fortran values in configure.
Rik <rik@octave.org>
parents:
31095
diff
changeset
|
798 if test $octave_cv_sizeof_fortran_integer -ne $ax_cv_blas_integer_size; then |
1077a1c277fb
build: Use caching for Fortran values in configure.
Rik <rik@octave.org>
parents:
31095
diff
changeset
|
799 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_cv_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
|
800 fi |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
801 fi |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
802 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
|
803 |
22986
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
804 case $octave_cv_sizeof_fortran_integer in |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
805 8) |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
806 OCTAVE_F77_INT_TYPE=int64_t |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
807 ;; |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
808 4) |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
809 OCTAVE_F77_INT_TYPE=int32_t |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
810 ;; |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
811 esac |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
812 AC_SUBST(OCTAVE_F77_INT_TYPE) |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22985
diff
changeset
|
813 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
|
814 [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
|
815 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
|
816 [$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
|
817 [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
|
818 |
22345
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
819 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
|
820 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
|
821 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
|
822 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
|
823 ]) |
752d79f86781
fix ordering of fortran compiler check in configure script (bug #48815)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
824 |
25778
4e658452f6c7
add -std=legacy to FFLAGS if GNU compiler accepts it (bug #54390)
John W. Eaton <jwe@octave.org>
parents:
25772
diff
changeset
|
825 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:
25772
diff
changeset
|
826 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:
25772
diff
changeset
|
827 fi |
4e658452f6c7
add -std=legacy to FFLAGS if GNU compiler accepts it (bug #54390)
John W. Eaton <jwe@octave.org>
parents:
25772
diff
changeset
|
828 |
25487
fbc270aeb55d
* interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions.
John W. Eaton <jwe@octave.org>
parents:
25331
diff
changeset
|
829 BUILD_EXTERNAL_LIBXERBLA= |
fbc270aeb55d
* interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions.
John W. Eaton <jwe@octave.org>
parents:
25331
diff
changeset
|
830 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
|
831 msdosmsvc | mingw*) |
fbc270aeb55d
* interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions.
John W. Eaton <jwe@octave.org>
parents:
25331
diff
changeset
|
832 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
|
833 ;; |
fbc270aeb55d
* interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions.
John W. Eaton <jwe@octave.org>
parents:
25331
diff
changeset
|
834 esac |
fbc270aeb55d
* interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions.
John W. Eaton <jwe@octave.org>
parents:
25331
diff
changeset
|
835 |
fbc270aeb55d
* interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions.
John W. Eaton <jwe@octave.org>
parents:
25331
diff
changeset
|
836 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
|
837 [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
|
838 |
31153
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
839 ### Set options for dynamic linking if enabled. |
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
840 dnl Options set only only if we are building shared libs and some API for |
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
841 dnl dynamic linking has been detected. |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
842 |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
843 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
|
844 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
|
845 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
846 RDYNAMIC_FLAG= |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
847 DL_API_MSG="" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
848 dlopen_api=no |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
849 loadlibrary_api=no |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
850 |
25882
22ee68edcf3a
require dynamic loading capabilities to build Octave
John W. Eaton <jwe@octave.org>
parents:
25844
diff
changeset
|
851 case $lt_cv_dlopen in |
22ee68edcf3a
require dynamic loading capabilities to build Octave
John W. Eaton <jwe@octave.org>
parents:
25844
diff
changeset
|
852 dlopen) |
22ee68edcf3a
require dynamic loading capabilities to build Octave
John W. Eaton <jwe@octave.org>
parents:
25844
diff
changeset
|
853 dlopen_api=yes |
22ee68edcf3a
require dynamic loading capabilities to build Octave
John W. Eaton <jwe@octave.org>
parents:
25844
diff
changeset
|
854 DL_API_MSG="dlopen" |
22ee68edcf3a
require dynamic loading capabilities to build Octave
John W. Eaton <jwe@octave.org>
parents:
25844
diff
changeset
|
855 AC_DEFINE(HAVE_DLOPEN_API, 1, |
22ee68edcf3a
require dynamic loading capabilities to build Octave
John W. Eaton <jwe@octave.org>
parents:
25844
diff
changeset
|
856 [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:
25844
diff
changeset
|
857 OCTAVE_CXX_FLAG([-rdynamic], [RDYNAMIC_FLAG=-rdynamic]) |
22ee68edcf3a
require dynamic loading capabilities to build Octave
John W. Eaton <jwe@octave.org>
parents:
25844
diff
changeset
|
858 ;; |
22ee68edcf3a
require dynamic loading capabilities to build Octave
John W. Eaton <jwe@octave.org>
parents:
25844
diff
changeset
|
859 LoadLibrary) |
22ee68edcf3a
require dynamic loading capabilities to build Octave
John W. Eaton <jwe@octave.org>
parents:
25844
diff
changeset
|
860 loadlibrary_api=yes |
22ee68edcf3a
require dynamic loading capabilities to build Octave
John W. Eaton <jwe@octave.org>
parents:
25844
diff
changeset
|
861 DL_API_MSG="LoadLibrary" |
22ee68edcf3a
require dynamic loading capabilities to build Octave
John W. Eaton <jwe@octave.org>
parents:
25844
diff
changeset
|
862 AC_DEFINE(HAVE_LOADLIBRARY_API, 1, |
22ee68edcf3a
require dynamic loading capabilities to build Octave
John W. Eaton <jwe@octave.org>
parents:
25844
diff
changeset
|
863 [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:
25844
diff
changeset
|
864 ;; |
22ee68edcf3a
require dynamic loading capabilities to build Octave
John W. Eaton <jwe@octave.org>
parents:
25844
diff
changeset
|
865 *) |
22ee68edcf3a
require dynamic loading capabilities to build Octave
John W. Eaton <jwe@octave.org>
parents:
25844
diff
changeset
|
866 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:
25844
diff
changeset
|
867 ;; |
22ee68edcf3a
require dynamic loading capabilities to build Octave
John W. Eaton <jwe@octave.org>
parents:
25844
diff
changeset
|
868 esac |
22ee68edcf3a
require dynamic loading capabilities to build Octave
John W. Eaton <jwe@octave.org>
parents:
25844
diff
changeset
|
869 |
22ee68edcf3a
require dynamic loading capabilities to build Octave
John W. Eaton <jwe@octave.org>
parents:
25844
diff
changeset
|
870 DL_LIBS="$lt_cv_dlopen_libs" |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
871 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
872 if test $SHARED_LIBS = yes; then |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
873 LIBOCTINTERP="-loctinterp" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
874 LIBOCTAVE="-loctave" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
875 else |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
876 LIBOCTINTERP="${top_builddir}/libinterp/liboctinterp.a" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
877 LIBOCTAVE="${top_builddir}/liboctave/liboctave.a" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
878 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
879 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
880 AC_SUBST(RDYNAMIC_FLAG) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
881 AC_SUBST(LIBOCTINTERP) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
882 AC_SUBST(LIBOCTAVE) |
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 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
|
885 CROSS_TOOL_PREFIX="$ac_tool_prefix" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
886 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
|
887 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
|
888 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
|
889 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
|
890 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
|
891 else |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
892 MKOCTFILE_AR="$AR" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
893 MKOCTFILE_CC="$CC" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
894 MKOCTFILE_CXX="$CXX" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
895 MKOCTFILE_F77="$F77" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
896 MKOCTFILE_RANLIB="$RANLIB" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
897 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
898 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
|
899 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
|
900 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
|
901 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
|
902 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
|
903 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
|
904 AC_SUBST(CROSS_TOOL_PREFIX) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
905 AC_SUBST(MKOCTFILE_AR) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
906 AC_SUBST(MKOCTFILE_CC) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
907 AC_SUBST(MKOCTFILE_CXX) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
908 AC_SUBST(MKOCTFILE_F77) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
909 AC_SUBST(MKOCTFILE_RANLIB) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22233
diff
changeset
|
910 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
911 ### 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
|
912 |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
913 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
|
914 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
|
915 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
|
916 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
|
917 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
|
918 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
|
919 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
|
920 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
|
921 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
|
922 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
|
923 ENABLE_FLOAT_TRUNCATE=yes |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
924 AC_ARG_ENABLE([float-truncate], |
19965
d20dd211cc89
Enable float truncation by default for octave builds.
Rik <rik@octave.org>
parents:
19964
diff
changeset
|
925 [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
|
926 [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
|
927 [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
|
928 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
|
929 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
|
930 [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
|
931 fi |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
932 |
31865
f3a6f41314ed
new configure option, --enable-internal-checks (patch #10226)
Petter Tomner <tomner@kth.se>
parents:
31806
diff
changeset
|
933 ### Enable internal checks |
f3a6f41314ed
new configure option, --enable-internal-checks (patch #10226)
Petter Tomner <tomner@kth.se>
parents:
31806
diff
changeset
|
934 |
f3a6f41314ed
new configure option, --enable-internal-checks (patch #10226)
Petter Tomner <tomner@kth.se>
parents:
31806
diff
changeset
|
935 ## The checks slow down the execution and are redundant, |
f3a6f41314ed
new configure option, --enable-internal-checks (patch #10226)
Petter Tomner <tomner@kth.se>
parents:
31806
diff
changeset
|
936 ## but useful for debugging or verifying GNU Octave. |
f3a6f41314ed
new configure option, --enable-internal-checks (patch #10226)
Petter Tomner <tomner@kth.se>
parents:
31806
diff
changeset
|
937 ENABLE_INTERNAL_CHECKS=no |
f3a6f41314ed
new configure option, --enable-internal-checks (patch #10226)
Petter Tomner <tomner@kth.se>
parents:
31806
diff
changeset
|
938 AC_ARG_ENABLE([internal-checks], |
f3a6f41314ed
new configure option, --enable-internal-checks (patch #10226)
Petter Tomner <tomner@kth.se>
parents:
31806
diff
changeset
|
939 [AS_HELP_STRING([--enable-internal-checks], |
f3a6f41314ed
new configure option, --enable-internal-checks (patch #10226)
Petter Tomner <tomner@kth.se>
parents:
31806
diff
changeset
|
940 [Enable internal checks that are redundant but useful to debug or verify GNU Octave])], |
f3a6f41314ed
new configure option, --enable-internal-checks (patch #10226)
Petter Tomner <tomner@kth.se>
parents:
31806
diff
changeset
|
941 [if test "$enableval" = yes; then ENABLE_INTERNAL_CHECKS=yes; fi], []) |
f3a6f41314ed
new configure option, --enable-internal-checks (patch #10226)
Petter Tomner <tomner@kth.se>
parents:
31806
diff
changeset
|
942 if test $ENABLE_INTERNAL_CHECKS = yes; then |
f3a6f41314ed
new configure option, --enable-internal-checks (patch #10226)
Petter Tomner <tomner@kth.se>
parents:
31806
diff
changeset
|
943 AC_DEFINE(OCTAVE_ENABLE_INTERNAL_CHECKS, 1, |
f3a6f41314ed
new configure option, --enable-internal-checks (patch #10226)
Petter Tomner <tomner@kth.se>
parents:
31806
diff
changeset
|
944 [Define to 1 to enable internal checks.]) |
f3a6f41314ed
new configure option, --enable-internal-checks (patch #10226)
Petter Tomner <tomner@kth.se>
parents:
31806
diff
changeset
|
945 fi |
f3a6f41314ed
new configure option, --enable-internal-checks (patch #10226)
Petter Tomner <tomner@kth.se>
parents:
31806
diff
changeset
|
946 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
947 ### 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
|
948 |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
949 ## 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
|
950 ## support for IEEE floating point. |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
951 ## |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
952 ## On Alpha/OSF systems, we require -mieee or -ieee for full support. |
869 | 953 |
3126 | 954 ieee_fp_flag= |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
955 case $canonical_host_type in |
3887 | 956 i[[3456789]]86-*-*) |
5076 | 957 if test "$GCC" = yes; then |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
958 OCTAVE_CC_FLAG([-mieee-fp], [ |
5076 | 959 ieee_fp_flag=-mieee-fp |
960 XTRA_CFLAGS="$XTRA_CFLAGS -mieee-fp" | |
5844 | 961 AC_MSG_NOTICE([adding -mieee-fp to XTRA_CFLAGS])]) |
5076 | 962 fi |
963 if test "$GXX" = yes; then | |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
964 OCTAVE_CXX_FLAG([-mieee-fp], [ |
12451 | 965 ieee_fp_flag=-mieee-fp |
966 XTRA_CXXFLAGS="$XTRA_CXXFLAGS -mieee-fp" | |
967 AC_MSG_NOTICE([adding -mieee-fp to XTRA_CXXFLAGS])]) | |
5076 | 968 fi |
324 | 969 ;; |
3127 | 970 alpha*-*-*) |
4284 | 971 if test "$GCC" = yes; then |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
972 OCTAVE_CC_FLAG([-mieee], [ |
12451 | 973 ieee_fp_flag=-mieee |
974 XTRA_CFLAGS="$XTRA_CFLAGS -mieee" | |
975 AC_MSG_NOTICE([adding -mieee to XTRA_CFLAGS])]) | |
5076 | 976 else |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
977 OCTAVE_CC_FLAG([-ieee], [ |
12451 | 978 ieee_fp_flag=-ieee |
979 XTRA_CFLAGS="$XTRA_CFLAGS -ieee" | |
980 AC_MSG_NOTICE([adding -ieee to XTRA_CFLAGS])]) | |
5076 | 981 fi |
982 if test "$GXX" = yes; then | |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
983 OCTAVE_CXX_FLAG([-mieee], [ |
12451 | 984 ieee_fp_flag=-mieee |
985 XTRA_CXXFLAGS="$XTRA_CXXFLAGS -mieee" | |
986 AC_MSG_NOTICE([adding -mieee to XTRA_CXXFLAGS])]) | |
4284 | 987 else |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
988 OCTAVE_CXX_FLAG([-ieee], [ |
12451 | 989 ieee_fp_flag=-ieee |
990 XTRA_CXXFLAGS="$XTRA_CXXFLAGS -ieee" | |
991 AC_MSG_NOTICE([adding -ieee to XTRA_CXXFLAGS])]) | |
4284 | 992 fi |
2020 | 993 ;; |
3176 | 994 *ibm-aix4*) |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
995 OCTAVE_CC_FLAG([-mminimal-toc], [ |
3351 | 996 XTRA_CFLAGS="$XTRA_CFLAGS -mminimal-toc"]) |
3176 | 997 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
998 OCTAVE_CXX_FLAG([-mminimal-toc], [ |
3351 | 999 XTRA_CXXFLAGS="$XTRA_CXXFLAGS -mminimal-toc"]) |
3176 | 1000 ;; |
324 | 1001 esac |
3126 | 1002 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1003 AC_SUBST(XTRA_CFLAGS) |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1004 AC_SUBST(XTRA_CXXFLAGS) |
31806
3641b742d8aa
configure.ac: Add sanitizer compilation flags to XTRA_XXXFLAGS rather than WARN_XXXFLAGS (bug #63712).
Rik <rik@octave.org>
parents:
31769
diff
changeset
|
1005 AC_SUBST(XTRA_LDFLAGS) |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1006 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1007 ### Defaults for cross compiling. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1008 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
|
1009 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
|
1010 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
|
1011 dnl override these. |
4094 | 1012 |
1013 if test "$cross_compiling" = yes; then | |
1014 BUILD_CC="gcc" | |
1015 BUILD_CFLAGS="-O2 -g" | |
1016 BUILD_CXX="g++" | |
22883
7cf0b9654d44
cross-tools: enable std=c++11 for default cross g++ CXXFLAGS (Bug #49822)
John D
parents:
22842
diff
changeset
|
1017 BUILD_CXXFLAGS="-O2 -g -std=c++11" |
4298 | 1018 BUILD_LDFLAGS="" |
4098 | 1019 BUILD_EXEEXT="" |
4094 | 1020 else |
21409
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
1021 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
|
1022 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
|
1023 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
|
1024 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
|
1025 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
|
1026 BUILD_EXEEXT="${EXEEXT}" |
4094 | 1027 fi |
1028 | |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1029 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
|
1030 [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
|
1031 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
|
1032 [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
|
1033 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
|
1034 [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
|
1035 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
|
1036 [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
|
1037 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
|
1038 [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
|
1039 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
|
1040 [build system executable extension (used if cross compiling)]) |
3222 | 1041 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1042 ### 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
|
1043 |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1044 cross_tools=no |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1045 AC_ARG_ENABLE([cross-tools], |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1046 [AS_HELP_STRING([--enable-cross-tools], |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1047 [build cross tools (mkoctfile, octave-config) if cross compiling])], |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1048 [if test "$enableval" = yes; then cross_tools=yes; fi]) |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1049 |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1050 if test "$cross_tools" = yes; then |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1051 if test "$cross_compiling" = no; then |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1052 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
|
1053 cross_tools=no |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1054 fi |
11208
a44ba1cdfbb5
handle --without-opengl configure option
John W. Eaton <jwe@octave.org>
parents:
11119
diff
changeset
|
1055 fi |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1056 AM_CONDITIONAL([AMCOND_CROSS_TOOLS], [test $cross_tools = yes]) |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1057 |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1058 ### Check compiler characteristics. |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1059 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
|
1060 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1061 ## 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
|
1062 OCTAVE_CXX_DYNAMIC_AUTO_ARRAYS |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1063 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1064 ## 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
|
1065 OCTAVE_IEEE754_DATA_FORMAT |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1066 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1067 ## 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
|
1068 OCTAVE_CXX_BITWISE_OP_TEMPLATES |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1069 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1070 ## 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
|
1071 OCTAVE_CXX_COMPLEX_SETTERS |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1072 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1073 ## 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
|
1074 OCTAVE_CXX_COMPLEX_REFERENCE_ACCESSORS |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1075 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1076 ## 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
|
1077 AC_FUNC_ALLOCA |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1078 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1079 ## 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
|
1080 AM_PROG_CC_C_O |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1081 |
29129
3b1d005aabbf
configure.ac: Set target Windows version early.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29116
diff
changeset
|
1082 ## Set the target Windows version early so that gnulib can use all functions |
3b1d005aabbf
configure.ac: Set target Windows version early.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29116
diff
changeset
|
1083 ## that are available in that version. |
3b1d005aabbf
configure.ac: Set target Windows version early.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29116
diff
changeset
|
1084 case $host_os in |
3b1d005aabbf
configure.ac: Set target Windows version early.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29116
diff
changeset
|
1085 msdosmsvc | mingw*) |
3b1d005aabbf
configure.ac: Set target Windows version early.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29116
diff
changeset
|
1086 AC_MSG_CHECKING([for required _WIN32_WINNT]) |
3b1d005aabbf
configure.ac: Set target Windows version early.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29116
diff
changeset
|
1087 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
3b1d005aabbf
configure.ac: Set target Windows version early.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29116
diff
changeset
|
1088 #include <windows.h> |
29354
6c2fa2293242
Increase Windows API version to Windows 7 (bug #60014).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29313
diff
changeset
|
1089 #if _WIN32_WINNT < 0x0601 |
29129
3b1d005aabbf
configure.ac: Set target Windows version early.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29116
diff
changeset
|
1090 #error "Wrong version" |
3b1d005aabbf
configure.ac: Set target Windows version early.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29116
diff
changeset
|
1091 #endif |
3b1d005aabbf
configure.ac: Set target Windows version early.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29116
diff
changeset
|
1092 ]], [])], |
3b1d005aabbf
configure.ac: Set target Windows version early.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29116
diff
changeset
|
1093 [AC_MSG_RESULT([none])], |
29354
6c2fa2293242
Increase Windows API version to Windows 7 (bug #60014).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29313
diff
changeset
|
1094 [AC_DEFINE(_WIN32_WINNT, 0x0601, |
6c2fa2293242
Increase Windows API version to Windows 7 (bug #60014).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29313
diff
changeset
|
1095 [Define to 0x0601 to access SetCurrentProcessExplicitAppUserModelID.]) |
6c2fa2293242
Increase Windows API version to Windows 7 (bug #60014).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29313
diff
changeset
|
1096 AC_MSG_RESULT([0x0601])]) |
29129
3b1d005aabbf
configure.ac: Set target Windows version early.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29116
diff
changeset
|
1097 ;; |
3b1d005aabbf
configure.ac: Set target Windows version early.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29116
diff
changeset
|
1098 esac |
3b1d005aabbf
configure.ac: Set target Windows version early.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29116
diff
changeset
|
1099 |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1100 ### gnulib initialization: part 2 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1101 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
|
1102 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
|
1103 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
|
1104 dnl external library dependencies. |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1105 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1106 gl_INIT |
8185
69c5cce38c29
implement 64-bit arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents:
8169
diff
changeset
|
1107 |
869 | 1108 ### Checks for header files. |
1109 | |
1377 | 1110 AC_HEADER_SYS_WAIT |
2097 | 1111 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1112 ## C headers |
4051 | 1113 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1114 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
|
1115 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
|
1116 AC_CHECK_HEADERS([ieeefp.h pthread.h pwd.h sys/ioctl.h]) |
29408
f4cf798e6d8f
check for stropts.h (bug #60163)
John W. Eaton <jwe@octave.org>
parents:
29379
diff
changeset
|
1117 AC_CHECK_HEADERS([stropts.h sys/stropts.h]) |
4051 | 1118 |
27448
b47705865de7
fall back to system-dependent functions if compiling stdatomic.h fails
John W. Eaton <jwe@octave.org>
parents:
27427
diff
changeset
|
1119 ## Some versions of GCC fail when using -fopenmp and including |
b47705865de7
fall back to system-dependent functions if compiling stdatomic.h fails
John W. Eaton <jwe@octave.org>
parents:
27427
diff
changeset
|
1120 ## stdatomic.h, so we try to work around that. Use the compile_ifelse |
b47705865de7
fall back to system-dependent functions if compiling stdatomic.h fails
John W. Eaton <jwe@octave.org>
parents:
27427
diff
changeset
|
1121 ## macro because we are trying to test the case of the header file |
b47705865de7
fall back to system-dependent functions if compiling stdatomic.h fails
John W. Eaton <jwe@octave.org>
parents:
27427
diff
changeset
|
1122 ## existing but not being usable. The default warning from the |
b47705865de7
fall back to system-dependent functions if compiling stdatomic.h fails
John W. Eaton <jwe@octave.org>
parents:
27427
diff
changeset
|
1123 ## check_headers macro is not appropriate here. |
b47705865de7
fall back to system-dependent functions if compiling stdatomic.h fails
John W. Eaton <jwe@octave.org>
parents:
27427
diff
changeset
|
1124 AC_CACHE_CHECK([whether stdatomic.h can be compiled], |
b47705865de7
fall back to system-dependent functions if compiling stdatomic.h fails
John W. Eaton <jwe@octave.org>
parents:
27427
diff
changeset
|
1125 [octave_cv_stdatomic_h_ok], |
b47705865de7
fall back to system-dependent functions if compiling stdatomic.h fails
John W. Eaton <jwe@octave.org>
parents:
27427
diff
changeset
|
1126 [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ |
b47705865de7
fall back to system-dependent functions if compiling stdatomic.h fails
John W. Eaton <jwe@octave.org>
parents:
27427
diff
changeset
|
1127 #include <stdatomic.h> |
b47705865de7
fall back to system-dependent functions if compiling stdatomic.h fails
John W. Eaton <jwe@octave.org>
parents:
27427
diff
changeset
|
1128 ]])], |
b47705865de7
fall back to system-dependent functions if compiling stdatomic.h fails
John W. Eaton <jwe@octave.org>
parents:
27427
diff
changeset
|
1129 octave_cv_stdatomic_h_ok=yes, |
b47705865de7
fall back to system-dependent functions if compiling stdatomic.h fails
John W. Eaton <jwe@octave.org>
parents:
27427
diff
changeset
|
1130 octave_cv_stdatomic_h_ok=no) |
b47705865de7
fall back to system-dependent functions if compiling stdatomic.h fails
John W. Eaton <jwe@octave.org>
parents:
27427
diff
changeset
|
1131 ]) |
b47705865de7
fall back to system-dependent functions if compiling stdatomic.h fails
John W. Eaton <jwe@octave.org>
parents:
27427
diff
changeset
|
1132 if test $octave_cv_stdatomic_h_ok = yes; then |
b47705865de7
fall back to system-dependent functions if compiling stdatomic.h fails
John W. Eaton <jwe@octave.org>
parents:
27427
diff
changeset
|
1133 AC_DEFINE(OCTAVE_STDATOMIC_H_OK, 1, |
b47705865de7
fall back to system-dependent functions if compiling stdatomic.h fails
John W. Eaton <jwe@octave.org>
parents:
27427
diff
changeset
|
1134 [Define to 1 if stdatomic.h can be compiled.]) |
b47705865de7
fall back to system-dependent functions if compiling stdatomic.h fails
John W. Eaton <jwe@octave.org>
parents:
27427
diff
changeset
|
1135 fi |
b47705865de7
fall back to system-dependent functions if compiling stdatomic.h fails
John W. Eaton <jwe@octave.org>
parents:
27427
diff
changeset
|
1136 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1137 ## Find a termio header to include. |
1901 | 1138 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1139 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
|
1140 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
|
1141 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
|
1142 AC_CHECK_HEADERS([conio.h], have_conio_h=yes, have_conio_h=no) |
3249 | 1143 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1144 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
|
1145 && test $have_termio_h != yes \ |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1146 && test $have_sgtty_h != yes; then |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1147 AC_MSG_WARN([couldn't find one of termios.h, termio.h, or sgtty.h!]) |
832 | 1148 fi |
869 | 1149 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1150 ## 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
|
1151 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
|
1152 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
|
1153 fi |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1154 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1155 ### Determine types and size of types. |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1156 |
15172
c7d466a02065
configure.ac: Add checks for a few missing types.
Rik <rik@octave.org>
parents:
15170
diff
changeset
|
1157 AC_TYPE_INT64_T |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1158 AC_TYPE_MODE_T |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1159 AC_TYPE_OFF_T |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1160 AC_TYPE_PID_T |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1161 AC_TYPE_SIZE_T |
15172
c7d466a02065
configure.ac: Add checks for a few missing types.
Rik <rik@octave.org>
parents:
15170
diff
changeset
|
1162 AC_TYPE_SSIZE_T |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1163 AC_TYPE_UID_T |
15172
c7d466a02065
configure.ac: Add checks for a few missing types.
Rik <rik@octave.org>
parents:
15170
diff
changeset
|
1164 AC_TYPE_UINT64_T |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1165 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
|
1166 AC_CHECK_TYPES([ptrdiff_t]) |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1167 |
21354
06d15e4e611a
move public data type macros to octave-config.h
John W. Eaton <jwe@octave.org>
parents:
21306
diff
changeset
|
1168 AC_CHECK_TYPES([long long int]) |
21378
172479a97e6c
configure.ac: Remove overquoting in shell variables tests.
Rik <rik@octave.org>
parents:
21374
diff
changeset
|
1169 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
|
1170 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
|
1171 [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
|
1172 fi |
06d15e4e611a
move public data type macros to octave-config.h
John W. Eaton <jwe@octave.org>
parents:
21306
diff
changeset
|
1173 |
06d15e4e611a
move public data type macros to octave-config.h
John W. Eaton <jwe@octave.org>
parents:
21306
diff
changeset
|
1174 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
|
1175 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
|
1176 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
|
1177 [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
|
1178 fi |
06d15e4e611a
move public data type macros to octave-config.h
John W. Eaton <jwe@octave.org>
parents:
21306
diff
changeset
|
1179 |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1180 ## 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
|
1181 AC_CHECK_SIZEOF([long double]) |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1182 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1183 ### 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
|
1184 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1185 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
|
1186 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
|
1187 AC_CHECK_MEMBERS([struct group.gr_passwd]) |
3887 | 1188 |
1186 | 1189 AC_STRUCT_TIMEZONE |
8998
a48fba01e4ac
optimize isnan/isinf/isfinite mappers
Jaroslav Hajek <highegg@gmail.com>
parents:
8940
diff
changeset
|
1190 |
21235
b48d65c5df5b
Disable char/int8_t function overloads where not permitted (bug #45411)
Mike Miller <mtmiller@octave.org>
parents:
21105
diff
changeset
|
1191 ## 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
|
1192 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
|
1193 [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
|
1194 [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
|
1195 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
|
1196 #include <stdint.h> |
b48d65c5df5b
Disable char/int8_t function overloads where not permitted (bug #45411)
Mike Miller <mtmiller@octave.org>
parents:
21105
diff
changeset
|
1197 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
|
1198 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
|
1199 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
|
1200 ]])], |
b48d65c5df5b
Disable char/int8_t function overloads where not permitted (bug #45411)
Mike Miller <mtmiller@octave.org>
parents:
21105
diff
changeset
|
1201 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
|
1202 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
|
1203 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
|
1204 ]) |
b48d65c5df5b
Disable char/int8_t function overloads where not permitted (bug #45411)
Mike Miller <mtmiller@octave.org>
parents:
21105
diff
changeset
|
1205 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
|
1206 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
|
1207 [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
|
1208 fi |
b48d65c5df5b
Disable char/int8_t function overloads where not permitted (bug #45411)
Mike Miller <mtmiller@octave.org>
parents:
21105
diff
changeset
|
1209 |
29365
e9b7ac7031fb
Compute with NA correctly on MIPS architecture (bug #59830).
Rik <rik@octave.org>
parents:
29361
diff
changeset
|
1210 ## Check for MIPS-specific non-standard encoding of NaN value |
e9b7ac7031fb
Compute with NA correctly on MIPS architecture (bug #59830).
Rik <rik@octave.org>
parents:
29361
diff
changeset
|
1211 OCTAVE_MIPS_NAN |
e9b7ac7031fb
Compute with NA correctly on MIPS architecture (bug #59830).
Rik <rik@octave.org>
parents:
29361
diff
changeset
|
1212 |
1788 | 1213 ### Checks for functions and variables. |
869 | 1214 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1215 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
|
1216 dnl valid implementations for many common problematic functions. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1217 |
15452
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
1218 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
|
1219 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
|
1220 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
|
1221 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
|
1222 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
|
1223 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
|
1224 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
|
1225 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
|
1226 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
|
1227 AC_CHECK_FUNCS([realpath resolvepath]) |
21949
baeffde5c87d
fix build for Windows systems
John W. Eaton <jwe@octave.org>
parents:
21945
diff
changeset
|
1228 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
|
1229 AC_CHECK_FUNCS([tcgetattr tcsetattr toascii]) |
17946 | 1230 AC_CHECK_FUNCS([umask waitpid]) |
20786
a8ee668e7fd7
Fix kbhit and pause on Windows systems.
Rik <rik@octave.org>
parents:
20640
diff
changeset
|
1231 AC_CHECK_FUNCS([_getch _kbhit]) |
15452
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
1232 |
15852
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
1233 ## 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
|
1234 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
|
1235 [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
|
1236 [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
|
1237 #include <math.h> |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
1238 ]], [[ |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
1239 double x = M_LN2;]])], |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
1240 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
|
1241 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
|
1242 ]) |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
1243 |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
1244 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
|
1245 ## 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
|
1246 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
|
1247 [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
|
1248 [save_CPPFLAGS="$CPPFLAGS" |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
1249 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
|
1250 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
|
1251 #include <math.h> |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
1252 ]], [[ |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
1253 double x = M_LN2;]])], |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
1254 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
|
1255 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
|
1256 CPPFLAGS="$save_CPPFLAGS" |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
1257 ]) |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
1258 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
|
1259 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
|
1260 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
|
1261 [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
|
1262 CPPFLAGS="$CPPFLAGS -D_USE_MATH_DEFINES" |
1978 | 1263 fi |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
1264 fi |
15852
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
1265 |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
1266 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
|
1267 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
|
1268 [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
|
1269 else |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
1270 AC_MSG_ERROR([MATH DEFINES in math.h such as M_PI are required to build Octave]) |
4163 | 1271 fi |
1272 | |
29540
b6f80b1d448f
Windows: Support non-ASCII characters in command line arguments.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29511
diff
changeset
|
1273 ## Use Unicode aware functions on Windows |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
1274 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
1275 msdosmsvc | mingw*) |
29540
b6f80b1d448f
Windows: Support non-ASCII characters in command line arguments.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29511
diff
changeset
|
1276 AC_DEFINE(_UNICODE, 1, [Use Unicode CRT functions on Windows by default.]) |
b6f80b1d448f
Windows: Support non-ASCII characters in command line arguments.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29511
diff
changeset
|
1277 AC_DEFINE(UNICODE, 1, [Use Windows Unicode API by default.]) |
956 | 1278 ;; |
1279 esac | |
1280 | |
29540
b6f80b1d448f
Windows: Support non-ASCII characters in command line arguments.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29511
diff
changeset
|
1281 OCTAVE_UNICODE_EXE_LDFLAGS="" |
b6f80b1d448f
Windows: Support non-ASCII characters in command line arguments.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29511
diff
changeset
|
1282 case $host_os in |
b6f80b1d448f
Windows: Support non-ASCII characters in command line arguments.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29511
diff
changeset
|
1283 mingw*) |
b6f80b1d448f
Windows: Support non-ASCII characters in command line arguments.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29511
diff
changeset
|
1284 OCTAVE_UNICODE_EXE_LDFLAGS="-municode" |
b6f80b1d448f
Windows: Support non-ASCII characters in command line arguments.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29511
diff
changeset
|
1285 ;; |
b6f80b1d448f
Windows: Support non-ASCII characters in command line arguments.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29511
diff
changeset
|
1286 esac |
b6f80b1d448f
Windows: Support non-ASCII characters in command line arguments.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29511
diff
changeset
|
1287 |
b6f80b1d448f
Windows: Support non-ASCII characters in command line arguments.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29511
diff
changeset
|
1288 AC_SUBST(OCTAVE_UNICODE_EXE_LDFLAGS) |
b6f80b1d448f
Windows: Support non-ASCII characters in command line arguments.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29511
diff
changeset
|
1289 |
15452
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
1290 ## Windows-specific use of functions |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
1291 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
1292 msdosmsvc | mingw*) |
15452
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
1293 AC_CHECK_FUNCS([setvbuf], [], |
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
1294 [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
|
1295 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1296 ## 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
|
1297 ## the function and library? |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1298 LIBS="-lgdi32 $LIBS" |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1299 ;; |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1300 esac |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1301 |
24678
aa9c29f48718
configure.ac: Only check for psapi library when compiling for Windows.
Rik <rik@octave.org>
parents:
24653
diff
changeset
|
1302 ## 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
|
1303 case $host_os in |
aa9c29f48718
configure.ac: Only check for psapi library when compiling for Windows.
Rik <rik@octave.org>
parents:
24653
diff
changeset
|
1304 msdosmsvc | mingw*) |
24719
9af783c01c7f
Fix cross-building for win32 target (bug #50463).
Markus Mützel <markus.muetzel@gmx.de>
parents:
24678
diff
changeset
|
1305 AC_CHECK_HEADERS([psapi.h], |
29745
6c76819255cb
build: Avoid linking to wrapper for EnumProcessModules on Windows (bug #60746).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29742
diff
changeset
|
1306 [CPPFLAGS="-DPSAPI_VERSION=2 $CPPFLAGS"], |
24719
9af783c01c7f
Fix cross-building for win32 target (bug #50463).
Markus Mützel <markus.muetzel@gmx.de>
parents:
24678
diff
changeset
|
1307 [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
|
1308 [#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
|
1309 ;; |
15452
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
1310 esac |
3130 | 1311 |
28053
b70b9eaaf751
Actually canonicalize UNC paths (bug #57439).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28031
diff
changeset
|
1312 ## Windows-specific module used for canonical UNC paths |
b70b9eaaf751
Actually canonicalize UNC paths (bug #57439).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28031
diff
changeset
|
1313 case $host_os in |
b70b9eaaf751
Actually canonicalize UNC paths (bug #57439).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28031
diff
changeset
|
1314 msdosmsvc | mingw*) |
b70b9eaaf751
Actually canonicalize UNC paths (bug #57439).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28031
diff
changeset
|
1315 AC_CHECK_HEADERS([shlwapi.h], |
b70b9eaaf751
Actually canonicalize UNC paths (bug #57439).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28031
diff
changeset
|
1316 [LIBS="-lshlwapi $LIBS"], |
b70b9eaaf751
Actually canonicalize UNC paths (bug #57439).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28031
diff
changeset
|
1317 [AC_MSG_ERROR([Missing SHLWAPI required to build for Windows target.])], |
b70b9eaaf751
Actually canonicalize UNC paths (bug #57439).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28031
diff
changeset
|
1318 [#include <windows.h>]) |
b70b9eaaf751
Actually canonicalize UNC paths (bug #57439).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28031
diff
changeset
|
1319 ;; |
b70b9eaaf751
Actually canonicalize UNC paths (bug #57439).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28031
diff
changeset
|
1320 esac |
b70b9eaaf751
Actually canonicalize UNC paths (bug #57439).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28031
diff
changeset
|
1321 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1322 ## Cygwin kluge for getrusage. |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1323 AC_CHECK_FUNCS([getrusage]) |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
1324 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
1325 cygwin*) |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1326 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
|
1327 [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
|
1328 ;; |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1329 esac |
869 | 1330 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1331 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
|
1332 |
1388 | 1333 AC_FUNC_CLOSEDIR_VOID |
1225 | 1334 |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1335 ## Check return type of matherr |
15143
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
1336 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
|
1337 [octave_cv_func_matherr_type], |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
1338 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
1339 #include <math.h> |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
1340 ]], [[ |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
1341 struct exception *x; |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
1342 x->type; |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
1343 x->name; |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
1344 ]])], |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
1345 octave_cv_func_matherr_type=yes, |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
1346 octave_cv_func_matherr_type=no) |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
1347 ]) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1348 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
|
1349 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
|
1350 [Define to 1 if math.h declares struct exception for matherr.]) |
2488 | 1351 fi |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
1352 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1353 ## Signal stuff. |
869 | 1354 |
5844 | 1355 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
|
1356 [[#include <signal.h> |
5844 | 1357 /* NetBSD declares sys_siglist in unistd.h. */ |
1358 #if HAVE_UNISTD_H | |
1359 # include <unistd.h> | |
1360 #endif | |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1361 ]]) |
2633 | 1362 |
31151
60f32b7455e3
configure.ac: Add new option "--disable-vm-evaluator"
Rik <rik@octave.org>
parents:
31129
diff
changeset
|
1363 ### Configure Bison as push or pull parser. |
60f32b7455e3
configure.ac: Add new option "--disable-vm-evaluator"
Rik <rik@octave.org>
parents:
31129
diff
changeset
|
1364 |
60f32b7455e3
configure.ac: Add new option "--disable-vm-evaluator"
Rik <rik@octave.org>
parents:
31129
diff
changeset
|
1365 ENABLE_COMMAND_LINE_PUSH_PARSER=yes |
60f32b7455e3
configure.ac: Add new option "--disable-vm-evaluator"
Rik <rik@octave.org>
parents:
31129
diff
changeset
|
1366 AC_ARG_ENABLE([command-line-push-parser], |
60f32b7455e3
configure.ac: Add new option "--disable-vm-evaluator"
Rik <rik@octave.org>
parents:
31129
diff
changeset
|
1367 [AS_HELP_STRING([--disable-command-line-push-parser], |
60f32b7455e3
configure.ac: Add new option "--disable-vm-evaluator"
Rik <rik@octave.org>
parents:
31129
diff
changeset
|
1368 [don't use Bison's push parser interface in the command line REPL])], |
60f32b7455e3
configure.ac: Add new option "--disable-vm-evaluator"
Rik <rik@octave.org>
parents:
31129
diff
changeset
|
1369 [if test "$enableval" = no; then ENABLE_COMMAND_LINE_PUSH_PARSER=no; fi], []) |
60f32b7455e3
configure.ac: Add new option "--disable-vm-evaluator"
Rik <rik@octave.org>
parents:
31129
diff
changeset
|
1370 if test $ENABLE_COMMAND_LINE_PUSH_PARSER = yes; then |
60f32b7455e3
configure.ac: Add new option "--disable-vm-evaluator"
Rik <rik@octave.org>
parents:
31129
diff
changeset
|
1371 AC_DEFINE(OCTAVE_ENABLE_COMMAND_LINE_PUSH_PARSER, 1, |
60f32b7455e3
configure.ac: Add new option "--disable-vm-evaluator"
Rik <rik@octave.org>
parents:
31129
diff
changeset
|
1372 [Define to 1 to use Bison's push parser interface in the command line REPL.]) |
60f32b7455e3
configure.ac: Add new option "--disable-vm-evaluator"
Rik <rik@octave.org>
parents:
31129
diff
changeset
|
1373 fi |
60f32b7455e3
configure.ac: Add new option "--disable-vm-evaluator"
Rik <rik@octave.org>
parents:
31129
diff
changeset
|
1374 |
31153
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
1375 ### Configure compilation of *experimental* Virtual Machine evaluator. |
31151
60f32b7455e3
configure.ac: Add new option "--disable-vm-evaluator"
Rik <rik@octave.org>
parents:
31129
diff
changeset
|
1376 |
60f32b7455e3
configure.ac: Add new option "--disable-vm-evaluator"
Rik <rik@octave.org>
parents:
31129
diff
changeset
|
1377 ENABLE_VM_EVALUATOR=yes |
60f32b7455e3
configure.ac: Add new option "--disable-vm-evaluator"
Rik <rik@octave.org>
parents:
31129
diff
changeset
|
1378 AC_ARG_ENABLE([vm-evaluator], |
60f32b7455e3
configure.ac: Add new option "--disable-vm-evaluator"
Rik <rik@octave.org>
parents:
31129
diff
changeset
|
1379 [AS_HELP_STRING([--disable-vm-evaluator], |
60f32b7455e3
configure.ac: Add new option "--disable-vm-evaluator"
Rik <rik@octave.org>
parents:
31129
diff
changeset
|
1380 [don't compile *experimental* virtual machine evaluator])], |
60f32b7455e3
configure.ac: Add new option "--disable-vm-evaluator"
Rik <rik@octave.org>
parents:
31129
diff
changeset
|
1381 [if test "$enableval" = no; then ENABLE_VM_EVALUATOR=no; fi], []) |
60f32b7455e3
configure.ac: Add new option "--disable-vm-evaluator"
Rik <rik@octave.org>
parents:
31129
diff
changeset
|
1382 if test $ENABLE_VM_EVALUATOR = yes; then |
60f32b7455e3
configure.ac: Add new option "--disable-vm-evaluator"
Rik <rik@octave.org>
parents:
31129
diff
changeset
|
1383 AC_DEFINE(OCTAVE_ENABLE_VM_EVALUATOR, 1, |
60f32b7455e3
configure.ac: Add new option "--disable-vm-evaluator"
Rik <rik@octave.org>
parents:
31129
diff
changeset
|
1384 [Define to 1 to build experimental Virtual Machine evaluator.]) |
60f32b7455e3
configure.ac: Add new option "--disable-vm-evaluator"
Rik <rik@octave.org>
parents:
31129
diff
changeset
|
1385 fi |
60f32b7455e3
configure.ac: Add new option "--disable-vm-evaluator"
Rik <rik@octave.org>
parents:
31129
diff
changeset
|
1386 |
31424
d1165473e4b0
allow Octave to use PCRE2 (bug #61542)
Rafael Laboissiere <rafael@laboissiere.net>
parents:
31415
diff
changeset
|
1387 ### Check for PCRE2 or PCRE regex library, requiring one to exist. |
d1165473e4b0
allow Octave to use PCRE2 (bug #61542)
Rafael Laboissiere <rafael@laboissiere.net>
parents:
31415
diff
changeset
|
1388 |
d1165473e4b0
allow Octave to use PCRE2 (bug #61542)
Rafael Laboissiere <rafael@laboissiere.net>
parents:
31415
diff
changeset
|
1389 have_pcre2=no |
d1165473e4b0
allow Octave to use PCRE2 (bug #61542)
Rafael Laboissiere <rafael@laboissiere.net>
parents:
31415
diff
changeset
|
1390 have_pcre=no |
d1165473e4b0
allow Octave to use PCRE2 (bug #61542)
Rafael Laboissiere <rafael@laboissiere.net>
parents:
31415
diff
changeset
|
1391 save_CPPLAGS="$CPPFLAGS" |
d1165473e4b0
allow Octave to use PCRE2 (bug #61542)
Rafael Laboissiere <rafael@laboissiere.net>
parents:
31415
diff
changeset
|
1392 CPPFLAGS="-DPCRE2_CODE_UNIT_WIDTH=8 $CPPFLAGS" |
d1165473e4b0
allow Octave to use PCRE2 (bug #61542)
Rafael Laboissiere <rafael@laboissiere.net>
parents:
31415
diff
changeset
|
1393 OCTAVE_CHECK_LIB(pcre2, PCRE2, |
d1165473e4b0
allow Octave to use PCRE2 (bug #61542)
Rafael Laboissiere <rafael@laboissiere.net>
parents:
31415
diff
changeset
|
1394 [], [pcre2.h pcre2/pcre2.h], [pcre2_compile_8], [], [], |
d1165473e4b0
allow Octave to use PCRE2 (bug #61542)
Rafael Laboissiere <rafael@laboissiere.net>
parents:
31415
diff
changeset
|
1395 [OCTAVE_CHECK_LIB_PCRE2_OK([have_pcre2=yes], |
d1165473e4b0
allow Octave to use PCRE2 (bug #61542)
Rafael Laboissiere <rafael@laboissiere.net>
parents:
31415
diff
changeset
|
1396 [AC_MSG_ERROR([PCRE2 library must be built with UTF support (--enable-utf)])])], |
d1165473e4b0
allow Octave to use PCRE2 (bug #61542)
Rafael Laboissiere <rafael@laboissiere.net>
parents:
31415
diff
changeset
|
1397 [libpcre2-8]) |
d1165473e4b0
allow Octave to use PCRE2 (bug #61542)
Rafael Laboissiere <rafael@laboissiere.net>
parents:
31415
diff
changeset
|
1398 CPPFLAGS="$save_CPPFLAGS" |
d1165473e4b0
allow Octave to use PCRE2 (bug #61542)
Rafael Laboissiere <rafael@laboissiere.net>
parents:
31415
diff
changeset
|
1399 |
d1165473e4b0
allow Octave to use PCRE2 (bug #61542)
Rafael Laboissiere <rafael@laboissiere.net>
parents:
31415
diff
changeset
|
1400 if test $have_pcre2 = no; then |
d1165473e4b0
allow Octave to use PCRE2 (bug #61542)
Rafael Laboissiere <rafael@laboissiere.net>
parents:
31415
diff
changeset
|
1401 OCTAVE_CHECK_LIB(pcre, PCRE, |
d1165473e4b0
allow Octave to use PCRE2 (bug #61542)
Rafael Laboissiere <rafael@laboissiere.net>
parents:
31415
diff
changeset
|
1402 [], [pcre.h pcre/pcre.h], [pcre_compile], [], [], |
d1165473e4b0
allow Octave to use PCRE2 (bug #61542)
Rafael Laboissiere <rafael@laboissiere.net>
parents:
31415
diff
changeset
|
1403 [OCTAVE_CHECK_LIB_PCRE_OK([have_pcre=yes], |
d1165473e4b0
allow Octave to use PCRE2 (bug #61542)
Rafael Laboissiere <rafael@laboissiere.net>
parents:
31415
diff
changeset
|
1404 [AC_MSG_ERROR([PCRE library must be built with UTF support (--enable-utf)])])], |
d1165473e4b0
allow Octave to use PCRE2 (bug #61542)
Rafael Laboissiere <rafael@laboissiere.net>
parents:
31415
diff
changeset
|
1405 [libpcre]) |
d1165473e4b0
allow Octave to use PCRE2 (bug #61542)
Rafael Laboissiere <rafael@laboissiere.net>
parents:
31415
diff
changeset
|
1406 fi |
d1165473e4b0
allow Octave to use PCRE2 (bug #61542)
Rafael Laboissiere <rafael@laboissiere.net>
parents:
31415
diff
changeset
|
1407 |
d1165473e4b0
allow Octave to use PCRE2 (bug #61542)
Rafael Laboissiere <rafael@laboissiere.net>
parents:
31415
diff
changeset
|
1408 if test $have_pcre2 = yes; then |
d1165473e4b0
allow Octave to use PCRE2 (bug #61542)
Rafael Laboissiere <rafael@laboissiere.net>
parents:
31415
diff
changeset
|
1409 AC_DEFINE(HAVE_PCRE2, 1, [Define to 1 if PCRE2 is available.]) |
d1165473e4b0
allow Octave to use PCRE2 (bug #61542)
Rafael Laboissiere <rafael@laboissiere.net>
parents:
31415
diff
changeset
|
1410 |
d1165473e4b0
allow Octave to use PCRE2 (bug #61542)
Rafael Laboissiere <rafael@laboissiere.net>
parents:
31415
diff
changeset
|
1411 ## Only one of PCRE2 or PCRE is used, so avoid having to define and use |
d1165473e4b0
allow Octave to use PCRE2 (bug #61542)
Rafael Laboissiere <rafael@laboissiere.net>
parents:
31415
diff
changeset
|
1412 ## both PCRE2_* and PCRE_* variables everywhere. |
d1165473e4b0
allow Octave to use PCRE2 (bug #61542)
Rafael Laboissiere <rafael@laboissiere.net>
parents:
31415
diff
changeset
|
1413 |
d1165473e4b0
allow Octave to use PCRE2 (bug #61542)
Rafael Laboissiere <rafael@laboissiere.net>
parents:
31415
diff
changeset
|
1414 PCRE_CPPFLAGS="$PCRE2_CPPFLAGS" |
d1165473e4b0
allow Octave to use PCRE2 (bug #61542)
Rafael Laboissiere <rafael@laboissiere.net>
parents:
31415
diff
changeset
|
1415 PCRE_LDFLAGS="$PCRE2_LDFLAGS" |
d1165473e4b0
allow Octave to use PCRE2 (bug #61542)
Rafael Laboissiere <rafael@laboissiere.net>
parents:
31415
diff
changeset
|
1416 PCRE_LIBS="$PCRE2_LIBS" |
d1165473e4b0
allow Octave to use PCRE2 (bug #61542)
Rafael Laboissiere <rafael@laboissiere.net>
parents:
31415
diff
changeset
|
1417 |
d1165473e4b0
allow Octave to use PCRE2 (bug #61542)
Rafael Laboissiere <rafael@laboissiere.net>
parents:
31415
diff
changeset
|
1418 elif test $have_pcre = yes; then |
d1165473e4b0
allow Octave to use PCRE2 (bug #61542)
Rafael Laboissiere <rafael@laboissiere.net>
parents:
31415
diff
changeset
|
1419 AC_DEFINE(HAVE_PCRE, 1, [Define to 1 if PCRE is available.]) |
d1165473e4b0
allow Octave to use PCRE2 (bug #61542)
Rafael Laboissiere <rafael@laboissiere.net>
parents:
31415
diff
changeset
|
1420 else |
d1165473e4b0
allow Octave to use PCRE2 (bug #61542)
Rafael Laboissiere <rafael@laboissiere.net>
parents:
31415
diff
changeset
|
1421 AC_MSG_ERROR([to build Octave, you must have the PCRE or PCRE2 library and header files installed]) |
d1165473e4b0
allow Octave to use PCRE2 (bug #61542)
Rafael Laboissiere <rafael@laboissiere.net>
parents:
31415
diff
changeset
|
1422 fi |
31153
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
1423 |
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
1424 ### Check for Qhull library. |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
1425 |
29638
75556567592e
build: restore original QHULL make variables (bug #60016)
Mike Miller <mtmiller@octave.org>
parents:
29629
diff
changeset
|
1426 QHULL_CPPFLAGS= |
75556567592e
build: restore original QHULL make variables (bug #60016)
Mike Miller <mtmiller@octave.org>
parents:
29629
diff
changeset
|
1427 QHULL_LDFLAGS= |
75556567592e
build: restore original QHULL make variables (bug #60016)
Mike Miller <mtmiller@octave.org>
parents:
29629
diff
changeset
|
1428 QHULL_LIBS= |
29629
93c8df989ea0
qhull: Use reentrant libqhull_r (bug #60016).
Stefan Brüns <stefan.bruens@rwth-aachen.de>
parents:
29588
diff
changeset
|
1429 OCTAVE_CHECK_LIB(qhull_r, QHull, |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1430 [Qhull library not found. This will result in loss of functionality for some geometry functions.], |
29629
93c8df989ea0
qhull: Use reentrant libqhull_r (bug #60016).
Stefan Brüns <stefan.bruens@rwth-aachen.de>
parents:
29588
diff
changeset
|
1431 [libqhull_r/libqhull_r.h libqhull_r.h], |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1432 [qh_qhull], [], [], |
29629
93c8df989ea0
qhull: Use reentrant libqhull_r (bug #60016).
Stefan Brüns <stefan.bruens@rwth-aachen.de>
parents:
29588
diff
changeset
|
1433 [warn_qhull_r= |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1434 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
|
1435 OCTAVE_CHECK_LIB_QHULL_OK( |
29638
75556567592e
build: restore original QHULL make variables (bug #60016)
Mike Miller <mtmiller@octave.org>
parents:
29629
diff
changeset
|
1436 [AC_DEFINE(HAVE_QHULL, 1, [Define to 1 if Qhull is available.]) |
75556567592e
build: restore original QHULL make variables (bug #60016)
Mike Miller <mtmiller@octave.org>
parents:
29629
diff
changeset
|
1437 QHULL_CPPFLAGS="$QHULL_R_CPPFLAGS" |
75556567592e
build: restore original QHULL make variables (bug #60016)
Mike Miller <mtmiller@octave.org>
parents:
29629
diff
changeset
|
1438 QHULL_LDFLAGS="$QHULL_R_LDFLAGS" |
75556567592e
build: restore original QHULL make variables (bug #60016)
Mike Miller <mtmiller@octave.org>
parents:
29629
diff
changeset
|
1439 QHULL_LIBS="$QHULL_R_LIBS"], |
29629
93c8df989ea0
qhull: Use reentrant libqhull_r (bug #60016).
Stefan Brüns <stefan.bruens@rwth-aachen.de>
parents:
29588
diff
changeset
|
1440 [warn_qhull_r="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."])]) |
29638
75556567592e
build: restore original QHULL make variables (bug #60016)
Mike Miller <mtmiller@octave.org>
parents:
29629
diff
changeset
|
1441 AC_SUBST(QHULL_CPPFLAGS) |
75556567592e
build: restore original QHULL make variables (bug #60016)
Mike Miller <mtmiller@octave.org>
parents:
29629
diff
changeset
|
1442 AC_SUBST(QHULL_LDFLAGS) |
75556567592e
build: restore original QHULL make variables (bug #60016)
Mike Miller <mtmiller@octave.org>
parents:
29629
diff
changeset
|
1443 AC_SUBST(QHULL_LIBS) |
6855 | 1444 |
31153
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
1445 ### Check for RapidJSON header-only library. |
28615
5da49e37a6c9
New functions jsondecode and jsonencode (bug #53100).
Abdallah Elshamy <abdallah.k.elshamy@gmail.com>
parents:
28528
diff
changeset
|
1446 |
29963
00f871ed7aa2
build: Allow disabling RapidJSON support by configure switch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29949
diff
changeset
|
1447 check_for_rapidjson=yes |
00f871ed7aa2
build: Allow disabling RapidJSON support by configure switch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29949
diff
changeset
|
1448 AC_ARG_ENABLE([rapidjson], |
00f871ed7aa2
build: Allow disabling RapidJSON support by configure switch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29949
diff
changeset
|
1449 [AS_HELP_STRING([--disable-rapidjson], |
00f871ed7aa2
build: Allow disabling RapidJSON support by configure switch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29949
diff
changeset
|
1450 [disable rapidjson])], |
00f871ed7aa2
build: Allow disabling RapidJSON support by configure switch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29949
diff
changeset
|
1451 [if test "$enableval" = no; then check_for_rapidjson=no; fi], []) |
29684
490e400d4df0
build: Show warning if RapidJSON is not found by configure (bug #60610).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29663
diff
changeset
|
1452 warn_rapidjson= |
29963
00f871ed7aa2
build: Allow disabling RapidJSON support by configure switch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29949
diff
changeset
|
1453 if test $check_for_rapidjson = yes; then |
00f871ed7aa2
build: Allow disabling RapidJSON support by configure switch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29949
diff
changeset
|
1454 AC_LANG_PUSH(C++) |
00f871ed7aa2
build: Allow disabling RapidJSON support by configure switch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29949
diff
changeset
|
1455 AC_CHECK_HEADER([rapidjson/rapidjson.h], |
00f871ed7aa2
build: Allow disabling RapidJSON support by configure switch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29949
diff
changeset
|
1456 [have_rapidjson=yes], |
00f871ed7aa2
build: Allow disabling RapidJSON support by configure switch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29949
diff
changeset
|
1457 [have_rapidjson=no |
00f871ed7aa2
build: Allow disabling RapidJSON support by configure switch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29949
diff
changeset
|
1458 warn_rapidjson="RapidJSON library not found. Octave will not be able to read or write JSON files."]) |
00f871ed7aa2
build: Allow disabling RapidJSON support by configure switch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29949
diff
changeset
|
1459 |
00f871ed7aa2
build: Allow disabling RapidJSON support by configure switch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29949
diff
changeset
|
1460 if test $have_rapidjson = yes; then |
00f871ed7aa2
build: Allow disabling RapidJSON support by configure switch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29949
diff
changeset
|
1461 AC_DEFINE(HAVE_RAPIDJSON, 1, [Define to 1 if RapidJSON is available.]) |
00f871ed7aa2
build: Allow disabling RapidJSON support by configure switch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29949
diff
changeset
|
1462 |
00f871ed7aa2
build: Allow disabling RapidJSON support by configure switch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29949
diff
changeset
|
1463 ## Additional check on RapidJSON library that was found |
00f871ed7aa2
build: Allow disabling RapidJSON support by configure switch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29949
diff
changeset
|
1464 ## Some features of the version of RapidJSON that is packaged in many |
00f871ed7aa2
build: Allow disabling RapidJSON support by configure switch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29949
diff
changeset
|
1465 ## distributions do not build correctly with newer compilers. |
00f871ed7aa2
build: Allow disabling RapidJSON support by configure switch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29949
diff
changeset
|
1466 ## See also: |
00f871ed7aa2
build: Allow disabling RapidJSON support by configure switch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29949
diff
changeset
|
1467 ## https://github.com/Tencent/rapidjson/issues/909 |
00f871ed7aa2
build: Allow disabling RapidJSON support by configure switch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29949
diff
changeset
|
1468 ## https://github.com/Tencent/rapidjson/issues/1718 |
00f871ed7aa2
build: Allow disabling RapidJSON support by configure switch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29949
diff
changeset
|
1469 AC_CACHE_CHECK([for working PrettyWriter in RapidJSON], |
00f871ed7aa2
build: Allow disabling RapidJSON support by configure switch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29949
diff
changeset
|
1470 [octave_cv_rapidjson_has_prettywriter], |
00f871ed7aa2
build: Allow disabling RapidJSON support by configure switch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29949
diff
changeset
|
1471 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
00f871ed7aa2
build: Allow disabling RapidJSON support by configure switch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29949
diff
changeset
|
1472 #include <rapidjson/prettywriter.h> |
00f871ed7aa2
build: Allow disabling RapidJSON support by configure switch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29949
diff
changeset
|
1473 ]], [[ |
00f871ed7aa2
build: Allow disabling RapidJSON support by configure switch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29949
diff
changeset
|
1474 rapidjson::StringBuffer json; |
00f871ed7aa2
build: Allow disabling RapidJSON support by configure switch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29949
diff
changeset
|
1475 rapidjson::PrettyWriter<rapidjson::StringBuffer, rapidjson::UTF8<>, |
00f871ed7aa2
build: Allow disabling RapidJSON support by configure switch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29949
diff
changeset
|
1476 rapidjson::UTF8<>, rapidjson::CrtAllocator, |
00f871ed7aa2
build: Allow disabling RapidJSON support by configure switch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29949
diff
changeset
|
1477 rapidjson::kWriteNanAndInfFlag> writer (json); |
00f871ed7aa2
build: Allow disabling RapidJSON support by configure switch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29949
diff
changeset
|
1478 ]])], |
00f871ed7aa2
build: Allow disabling RapidJSON support by configure switch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29949
diff
changeset
|
1479 [octave_cv_rapidjson_has_prettywriter=yes], |
00f871ed7aa2
build: Allow disabling RapidJSON support by configure switch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29949
diff
changeset
|
1480 [octave_cv_rapidjson_has_prettywriter=no]) |
00f871ed7aa2
build: Allow disabling RapidJSON support by configure switch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29949
diff
changeset
|
1481 ]) |
00f871ed7aa2
build: Allow disabling RapidJSON support by configure switch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29949
diff
changeset
|
1482 if test $octave_cv_rapidjson_has_prettywriter = yes; then |
00f871ed7aa2
build: Allow disabling RapidJSON support by configure switch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29949
diff
changeset
|
1483 AC_DEFINE(HAVE_RAPIDJSON_PRETTYWRITER, 1, |
00f871ed7aa2
build: Allow disabling RapidJSON support by configure switch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29949
diff
changeset
|
1484 [Define to 1 if the RapidJSON PrettyWriter function is available.]) |
00f871ed7aa2
build: Allow disabling RapidJSON support by configure switch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29949
diff
changeset
|
1485 else |
00f871ed7aa2
build: Allow disabling RapidJSON support by configure switch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29949
diff
changeset
|
1486 warn_rapidjson='RapidJSON library found, but some features do not seem to work properly. The "PrettyWriter" option in jsonencode will be disabled.' |
00f871ed7aa2
build: Allow disabling RapidJSON support by configure switch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29949
diff
changeset
|
1487 fi |
28624
aae9d7f098bd
Support for RapidJSON 1.1.0 with jsonencode and jsondecode
Abdallah Elshamy <abdallah.k.elshamy@gmail.com>
parents:
28615
diff
changeset
|
1488 fi |
29963
00f871ed7aa2
build: Allow disabling RapidJSON support by configure switch.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29949
diff
changeset
|
1489 AC_LANG_POP([C++]) |
28615
5da49e37a6c9
New functions jsondecode and jsonencode (bug #53100).
Abdallah Elshamy <abdallah.k.elshamy@gmail.com>
parents:
28528
diff
changeset
|
1490 fi |
5da49e37a6c9
New functions jsondecode and jsonencode (bug #53100).
Abdallah Elshamy <abdallah.k.elshamy@gmail.com>
parents:
28528
diff
changeset
|
1491 |
29684
490e400d4df0
build: Show warning if RapidJSON is not found by configure (bug #60610).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29663
diff
changeset
|
1492 if test -n "$warn_rapidjson"; then |
490e400d4df0
build: Show warning if RapidJSON is not found by configure (bug #60610).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29663
diff
changeset
|
1493 OCTAVE_CONFIGURE_WARNING([warn_rapidjson]) |
490e400d4df0
build: Show warning if RapidJSON is not found by configure (bug #60610).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29663
diff
changeset
|
1494 fi |
490e400d4df0
build: Show warning if RapidJSON is not found by configure (bug #60610).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29663
diff
changeset
|
1495 |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1496 ### Check for readline library. |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1497 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1498 OCTAVE_ENABLE_READLINE |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1499 |
32049
1c99c8f020f7
gui: Show encodings available with iconv in file editor preferences.
Markus Mützel <markus.muetzel@gmx.de>
parents:
32020
diff
changeset
|
1500 ### Check whether functions from libiconv are available. |
1c99c8f020f7
gui: Show encodings available with iconv in file editor preferences.
Markus Mützel <markus.muetzel@gmx.de>
parents:
32020
diff
changeset
|
1501 |
1c99c8f020f7
gui: Show encodings available with iconv in file editor preferences.
Markus Mützel <markus.muetzel@gmx.de>
parents:
32020
diff
changeset
|
1502 OCTAVE_CHECK_ICONVLIST |
1c99c8f020f7
gui: Show encodings available with iconv in file editor preferences.
Markus Mützel <markus.muetzel@gmx.de>
parents:
32020
diff
changeset
|
1503 |
1c99c8f020f7
gui: Show encodings available with iconv in file editor preferences.
Markus Mützel <markus.muetzel@gmx.de>
parents:
32020
diff
changeset
|
1504 OCTAVE_CHECK_ICONV_CANONICALIZE |
1c99c8f020f7
gui: Show encodings available with iconv in file editor preferences.
Markus Mützel <markus.muetzel@gmx.de>
parents:
32020
diff
changeset
|
1505 |
5270 | 1506 ### Check for ZLIB library. |
3820 | 1507 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1508 OCTAVE_CHECK_LIB(z, ZLIB, |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1509 [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
|
1510 [zlib.h], [gzclearerr]) |
3687 | 1511 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1512 ## Also define HAVE_ZLIB if libz is found. |
28304
144d77f3f829
configure.ac: Fix compilation when --without-XXX used for all libraries (bug #58330).
Rik <rik@octave.org>
parents:
28300
diff
changeset
|
1513 if test -n "$Z_LIBS"; then |
16332
5293cee91891
conditionally define HAVE_FFTW and HAVE_ZLIB in config.h
John W. Eaton <jwe@octave.org>
parents:
16330
diff
changeset
|
1514 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
|
1515 fi |
16332
5293cee91891
conditionally define HAVE_FFTW and HAVE_ZLIB in config.h
John W. Eaton <jwe@octave.org>
parents:
16330
diff
changeset
|
1516 |
22160
766f934db568
Rewrite gzip and bzip2 in C++ instead of using its applications (bug #43431)
Carnë Draug <carandraug@octave.org>
parents:
22150
diff
changeset
|
1517 ### 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
|
1518 |
766f934db568
Rewrite gzip and bzip2 in C++ instead of using its applications (bug #43431)
Carnë Draug <carandraug@octave.org>
parents:
22150
diff
changeset
|
1519 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
|
1520 [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
|
1521 [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
|
1522 |
9538
d0239bddf621
use OCTAVE_CHECK_LIB to check for zlib
John W. Eaton <jwe@octave.org>
parents:
9536
diff
changeset
|
1523 ### Check for HDF5 library. |
5270 | 1524 |
9542
f5ec5dc66824
use OCTAVE_CHECK_LIBRARY to check for HDF5
John W. Eaton <jwe@octave.org>
parents:
9540
diff
changeset
|
1525 save_CPPFLAGS="$CPPFLAGS" |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1526 save_LIBS="$LIBS" |
9542
f5ec5dc66824
use OCTAVE_CHECK_LIBRARY to check for HDF5
John W. Eaton <jwe@octave.org>
parents:
9540
diff
changeset
|
1527 CPPFLAGS="$Z_CPPFLAGS $CPPFLAGS" |
f5ec5dc66824
use OCTAVE_CHECK_LIBRARY to check for HDF5
John W. Eaton <jwe@octave.org>
parents:
9540
diff
changeset
|
1528 LIBS="$Z_LDFLAGS $Z_LIBS $LIBS" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1529 OCTAVE_CHECK_LIB(hdf5, HDF5, |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1530 [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
|
1531 [hdf5.h], [H5Gget_num_objs], [], [], |
f5ec5dc66824
use OCTAVE_CHECK_LIBRARY to check for HDF5
John W. Eaton <jwe@octave.org>
parents:
9540
diff
changeset
|
1532 [warn_hdf5= |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1533 OCTAVE_CHECK_HDF5_HAS_VER_16_API |
30243
a4061ae5ff79
Use UTF-8 file API if supported by HDF5 library.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29963
diff
changeset
|
1534 OCTAVE_CHECK_HDF5_HAS_UTF8_API |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1535 AC_DEFINE(HAVE_HDF5, 1, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1536 [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
|
1537 if test $have_msvc = yes; then |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1538 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
|
1539 fi |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1540 ]) |
9542
f5ec5dc66824
use OCTAVE_CHECK_LIBRARY to check for HDF5
John W. Eaton <jwe@octave.org>
parents:
9540
diff
changeset
|
1541 CPPFLAGS="$save_CPPFLAGS" |
f5ec5dc66824
use OCTAVE_CHECK_LIBRARY to check for HDF5
John W. Eaton <jwe@octave.org>
parents:
9540
diff
changeset
|
1542 LIBS="$save_LIBS" |
5270 | 1543 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1544 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
|
1545 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
|
1546 have_hdf5_int2float_conversions=no |
21378
172479a97e6c
configure.ac: Remove overquoting in shell variables tests.
Rik <rik@octave.org>
parents:
21374
diff
changeset
|
1547 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
|
1548 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
|
1549 [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
|
1550 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
|
1551 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1552 ### Check for FFTW library. |
31153
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
1553 dnl Default to Fortran FFTPACK if it is not available. |
5203 | 1554 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1555 ## Check for FFTW header and library. |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1556 OCTAVE_CHECK_LIB(fftw3, FFTW3, |
31716
d05c0d7317ef
fix typo in previous change
John W. Eaton <jwe@octave.org>
parents:
31714
diff
changeset
|
1557 [FFTW3 library not found. Octave will not be able to perform fft calculations.], |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1558 [fftw3.h], [fftw_plan_dft_1d]) |
3827 | 1559 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1560 OCTAVE_CHECK_LIB(fftw3f, FFTW3F, |
31714
892955dca2b5
update configure message for missing fftw libraries (bug #63628)
John W. Eaton <jwe@octave.org>
parents:
31706
diff
changeset
|
1561 [FFTW3F library not found. Octave will not be able to perform fft calculations.], |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1562 [fftw3.h], [fftwf_plan_dft_1d]) |
3827 | 1563 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1564 ## 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
|
1565 build_fftw_threads=yes |
15960
bde7731b2b83
added FFTW multithreaded library support
Andreas Weber <andy.weber.aw@gmail.com>
parents:
15946
diff
changeset
|
1566 AC_ARG_ENABLE([fftw-threads], |
bde7731b2b83
added FFTW multithreaded library support
Andreas Weber <andy.weber.aw@gmail.com>
parents:
15946
diff
changeset
|
1567 [AS_HELP_STRING([--disable-fftw-threads], |
bde7731b2b83
added FFTW multithreaded library support
Andreas Weber <andy.weber.aw@gmail.com>
parents:
15946
diff
changeset
|
1568 [disable Multi-threaded FFTW])], |
8938
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
1569 [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
|
1570 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
|
1571 fi], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1572 []) |
2813 | 1573 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1574 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
|
1575 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
|
1576 |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1577 AM_CONDITIONAL([AMCOND_HAVE_FFTW], |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1578 [test -n "$FFTW3_LIBS" && test -n "$FFTW3F_LIBS"]) |
3827 | 1579 |
16332
5293cee91891
conditionally define HAVE_FFTW and HAVE_ZLIB in config.h
John W. Eaton <jwe@octave.org>
parents:
16330
diff
changeset
|
1580 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
|
1581 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
|
1582 else |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1583 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
|
1584 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
|
1585 build_fftw_threads=no |
88847d5d1a96
configure.ac: Fix handling of --without-fftw3[f] options.
Rik <rik@octave.org>
parents:
18991
diff
changeset
|
1586 fi |
88847d5d1a96
configure.ac: Fix handling of --without-fftw3[f] options.
Rik <rik@octave.org>
parents:
18991
diff
changeset
|
1587 |
31153
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
1588 ## Check for multithreaded FFTW library. |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1589 ## 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
|
1590 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
|
1591 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
|
1592 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
|
1593 fi |
5293cee91891
conditionally define HAVE_FFTW and HAVE_ZLIB in config.h
John W. Eaton <jwe@octave.org>
parents:
16330
diff
changeset
|
1594 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1595 ## Collections of flags. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1596 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
|
1597 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
|
1598 |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
1599 ## 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
|
1600 |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
1601 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
|
1602 |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
1603 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
|
1604 |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
1605 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
|
1606 |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
1607 AC_SUBST(FFTW_XCPPFLAGS) |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
1608 AC_SUBST(FFTW_XLDFLAGS) |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
1609 AC_SUBST(FFTW_XLIBS) |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
1610 |
23434
f4d4d83f15c5
maint: rename cruft/ directory to external/
Rik <rik@octave.org>
parents:
23426
diff
changeset
|
1611 ## 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
|
1612 FFT_DIR="fftpack" |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1613 AC_SUBST(FFT_DIR) |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1614 |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1615 ### Check for GLPK library and header. |
5235 | 1616 |
9540
79b5fe2d5646
use Z_LIBS in checks for curl and glpk libraries
John W. Eaton <jwe@octave.org>
parents:
9538
diff
changeset
|
1617 save_CPPFLAGS="$CPPFLAGS" |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1618 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
|
1619 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
|
1620 LIBS="$Z_LDFLAGS $Z_LIBS $LIBS" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1621 OCTAVE_CHECK_LIB(glpk, GLPK, |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1622 [GLPK library not found. The glpk function for solving linear programs will be disabled.], |
29428
dba6e9920113
configure.ac: Prioritize top-level headers in OCTAVE_CHECK_LIB macro (bug #59806)
Rik <rik@octave.org>
parents:
29409
diff
changeset
|
1623 [glpk.h glpk/glpk.h], [glp_simplex], [], [], |
17241
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17196
diff
changeset
|
1624 [warn_glpk= |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17196
diff
changeset
|
1625 OCTAVE_CHECK_LIB_GLPK_OK( |
19355
22289e6e316e
build: Remove unused TEXINFO_LIBNAME definitions from Makefiles.
Rik <rik@octave.org>
parents:
19353
diff
changeset
|
1626 [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
|
1627 [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
|
1628 LIBS="$save_LIBS" |
79b5fe2d5646
use Z_LIBS in checks for curl and glpk libraries
John W. Eaton <jwe@octave.org>
parents:
9538
diff
changeset
|
1629 CPPFLAGS="$save_CPPFLAGS" |
5235 | 1630 |
31153
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
1631 ### Check for cURL library existence and functionality. |
6043 | 1632 |
9540
79b5fe2d5646
use Z_LIBS in checks for curl and glpk libraries
John W. Eaton <jwe@octave.org>
parents:
9538
diff
changeset
|
1633 save_CPPFLAGS="$CPPFLAGS" |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1634 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
|
1635 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
|
1636 LIBS="$Z_LDFLAGS $Z_LIBS $LIBS" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1637 OCTAVE_CHECK_LIB(curl, cURL, |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1638 [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
|
1639 [curl/curl.h], [curl_easy_escape]) |
28304
144d77f3f829
configure.ac: Fix compilation when --without-XXX used for all libraries (bug #58330).
Rik <rik@octave.org>
parents:
28300
diff
changeset
|
1640 if test -n "$CURL_LIBS"; then |
15338
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1641 ## 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
|
1642 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
|
1643 [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
|
1644 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
15323
c42bf5cadb60
Add check for CURLOPT_DIRLISTONLY in libcurl
Mike Miller <mtmiller@ieee.org>
parents:
15317
diff
changeset
|
1645 #include <curl/curl.h> |
c42bf5cadb60
Add check for CURLOPT_DIRLISTONLY in libcurl
Mike Miller <mtmiller@ieee.org>
parents:
15317
diff
changeset
|
1646 ]], [[ |
c42bf5cadb60
Add check for CURLOPT_DIRLISTONLY in libcurl
Mike Miller <mtmiller@ieee.org>
parents:
15317
diff
changeset
|
1647 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
|
1648 ]])], |
16080
c53f8f706c55
Reverse logic of libcurl feature test result
Mike Miller <mtmiller@ieee.org>
parents:
16079
diff
changeset
|
1649 [octave_cv_curl_has_curlopt_dirlistonly=yes], |
c53f8f706c55
Reverse logic of libcurl feature test result
Mike Miller <mtmiller@ieee.org>
parents:
16079
diff
changeset
|
1650 [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
|
1651 ]) |
16080
c53f8f706c55
Reverse logic of libcurl feature test result
Mike Miller <mtmiller@ieee.org>
parents:
16079
diff
changeset
|
1652 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
|
1653 AC_DEFINE(CURLOPT_DIRLISTONLY, CURLOPT_FTPLISTONLY, |
16079
3a90c3f4046d
Fix typo in changeset dc39c1d84c5b
Mike Miller <mtmiller@ieee.org>
parents:
16078
diff
changeset
|
1654 [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
|
1655 fi |
15323
c42bf5cadb60
Add check for CURLOPT_DIRLISTONLY in libcurl
Mike Miller <mtmiller@ieee.org>
parents:
15317
diff
changeset
|
1656 fi |
9540
79b5fe2d5646
use Z_LIBS in checks for curl and glpk libraries
John W. Eaton <jwe@octave.org>
parents:
9538
diff
changeset
|
1657 LIBS="$save_LIBS" |
79b5fe2d5646
use Z_LIBS in checks for curl and glpk libraries
John W. Eaton <jwe@octave.org>
parents:
9538
diff
changeset
|
1658 CPPFLAGS="$save_CPPFLAGS" |
6133 | 1659 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1660 ### 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
|
1661 |
22104
cfc260765ddf
build: use simpler and more consistent checks for portaudio and sndfile
Mike Miller <mtmiller@octave.org>
parents:
22041
diff
changeset
|
1662 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
|
1663 [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
|
1664 [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
|
1665 [], [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
|
1666 [warn_sndfile= |
d534a3014fd7
build: restore sndfile check for specific features needed to build
Mike Miller <mtmiller@octave.org>
parents:
22104
diff
changeset
|
1667 OCTAVE_CHECK_LIB_SNDFILE_OK( |
32195
9cb43336c3b3
audiowrite: Allow writing mp3 through libsndfile API (bug #64388).
John Donoghue <john.donoghue@ieee.org>
parents:
32049
diff
changeset
|
1668 [AC_DEFINE(HAVE_SNDFILE, 1, [Define to 1 if sndfile is available.]) |
9cb43336c3b3
audiowrite: Allow writing mp3 through libsndfile API (bug #64388).
John Donoghue <john.donoghue@ieee.org>
parents:
32049
diff
changeset
|
1669 OCTAVE_CHECK_LIB_SNDFILE_FORMATS], |
22110
d534a3014fd7
build: restore sndfile check for specific features needed to build
Mike Miller <mtmiller@octave.org>
parents:
22104
diff
changeset
|
1670 [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
|
1671 |
31153
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
1672 ### Check for PortAudio library. |
19470
23833e1bfa2e
check for PortAudio
Vytautas Jančauskas <unaudio@gmail.com>
parents:
19467
diff
changeset
|
1673 |
22104
cfc260765ddf
build: use simpler and more consistent checks for portaudio and sndfile
Mike Miller <mtmiller@octave.org>
parents:
22041
diff
changeset
|
1674 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
|
1675 [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
|
1676 [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
|
1677 [], [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
|
1678 [], [portaudio-2.0]) |
19470
23833e1bfa2e
check for PortAudio
Vytautas Jančauskas <unaudio@gmail.com>
parents:
19467
diff
changeset
|
1679 |
31153
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
1680 ### Check for either of GraphicsMagick++/ImageMagick++ libraries. |
9575
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
1681 |
21381 | 1682 check_magick=yes |
1683 use_magick=no | |
11216
5036b0ff9597
configure.ac: Properly m4 quote AS_HELP_STRING.
Rik <octave@nomad.inbox5.com>
parents:
11214
diff
changeset
|
1684 AC_ARG_WITH([magick], |
5036b0ff9597
configure.ac: Properly m4 quote AS_HELP_STRING.
Rik <octave@nomad.inbox5.com>
parents:
11214
diff
changeset
|
1685 [AS_HELP_STRING([--with-magick=LIB], |
30283
b7bce52e4500
allow building with ImageMagick++ to work again (bug #49653)
Markus Mützel <markus.muetzel@gmx.de>
parents:
30277
diff
changeset
|
1686 [select library to use for image I/O (options: GraphicsMagick++(default) or ImageMagick++)])], |
21381 | 1687 [if test x"$withval" = xno; then |
1688 check_magick=no | |
1689 else | |
1690 magick="$withval" | |
30283
b7bce52e4500
allow building with ImageMagick++ to work again (bug #49653)
Markus Mützel <markus.muetzel@gmx.de>
parents:
30277
diff
changeset
|
1691 fi], [magick="GraphicsMagick++"]) |
21381 | 1692 |
1693 if test $check_magick = yes; then | |
1694 | |
1695 MAGICK_CPPFLAGS= | |
1696 MAGICK_LDFLAGS= | |
1697 MAGICK_LIBS= | |
1698 | |
30283
b7bce52e4500
allow building with ImageMagick++ to work again (bug #49653)
Markus Mützel <markus.muetzel@gmx.de>
parents:
30277
diff
changeset
|
1699 PKG_CHECK_EXISTS([$magick], [ |
b7bce52e4500
allow building with ImageMagick++ to work again (bug #49653)
Markus Mützel <markus.muetzel@gmx.de>
parents:
30277
diff
changeset
|
1700 dnl We are using --cflags now instead of --cflags-only-I because some |
b7bce52e4500
allow building with ImageMagick++ to work again (bug #49653)
Markus Mützel <markus.muetzel@gmx.de>
parents:
30277
diff
changeset
|
1701 dnl Graphics/ImageMagick++ packages will provide -D options for |
b7bce52e4500
allow building with ImageMagick++ to work again (bug #49653)
Markus Mützel <markus.muetzel@gmx.de>
parents:
30277
diff
changeset
|
1702 dnl MAGICKCORE_HDRI_ENABLE and MAGICKCORE_QUANTUM_DEPTH that are needed |
b7bce52e4500
allow building with ImageMagick++ to work again (bug #49653)
Markus Mützel <markus.muetzel@gmx.de>
parents:
30277
diff
changeset
|
1703 dnl for building with a particular verison of the library. If there |
b7bce52e4500
allow building with ImageMagick++ to work again (bug #49653)
Markus Mützel <markus.muetzel@gmx.de>
parents:
30277
diff
changeset
|
1704 dnl are other flags in the output from pkg-config --cflags that cause |
b7bce52e4500
allow building with ImageMagick++ to work again (bug #49653)
Markus Mützel <markus.muetzel@gmx.de>
parents:
30277
diff
changeset
|
1705 dnl trouble, then we may need to go back to using --cflags-only-I and |
b7bce52e4500
allow building with ImageMagick++ to work again (bug #49653)
Markus Mützel <markus.muetzel@gmx.de>
parents:
30277
diff
changeset
|
1706 dnl have a configure test to determine the proper definitions of |
b7bce52e4500
allow building with ImageMagick++ to work again (bug #49653)
Markus Mützel <markus.muetzel@gmx.de>
parents:
30277
diff
changeset
|
1707 dnl MAGICKCORE_HDRI_ENABLE and MAGICKCORE_QUANTUM_DEPTH. |
b7bce52e4500
allow building with ImageMagick++ to work again (bug #49653)
Markus Mützel <markus.muetzel@gmx.de>
parents:
30277
diff
changeset
|
1708 dnl See also bug #49563. |
b7bce52e4500
allow building with ImageMagick++ to work again (bug #49653)
Markus Mützel <markus.muetzel@gmx.de>
parents:
30277
diff
changeset
|
1709 MAGICK_CPPFLAGS="$($PKG_CONFIG --cflags $magick | $SED -e 's/^ *$//')" |
b7bce52e4500
allow building with ImageMagick++ to work again (bug #49653)
Markus Mützel <markus.muetzel@gmx.de>
parents:
30277
diff
changeset
|
1710 MAGICK_LDFLAGS="$($PKG_CONFIG --libs-only-L $magick | $SED -e 's/^ *$//')" |
b7bce52e4500
allow building with ImageMagick++ to work again (bug #49653)
Markus Mützel <markus.muetzel@gmx.de>
parents:
30277
diff
changeset
|
1711 MAGICK_LIBS="$($PKG_CONFIG --libs-only-l $magick | $SED -e 's/^ *$//')" |
b7bce52e4500
allow building with ImageMagick++ to work again (bug #49653)
Markus Mützel <markus.muetzel@gmx.de>
parents:
30277
diff
changeset
|
1712 |
b7bce52e4500
allow building with ImageMagick++ to work again (bug #49653)
Markus Mützel <markus.muetzel@gmx.de>
parents:
30277
diff
changeset
|
1713 warn_magick="$magick library fails tests. The imread, imwrite, and imfinfo functions for reading and writing image files will not be fully functional." |
21381 | 1714 |
1715 save_CPPFLAGS="$CPPFLAGS" | |
1716 save_LIBS="$LIBS" | |
1717 CPPFLAGS="$MAGICK_CPPFLAGS $CPPFLAGS" | |
1718 LIBS="$MAGICK_LDFLAGS $MAGICK_LIBS $LIBS" | |
1719 AC_LANG_PUSH(C++) | |
1720 AC_CHECK_HEADER([Magick++.h], [ | |
31407
97057039b835
build: Check for symbol removed from ImageMagick++-7 API (bug #63331).
Markus Mützel <markus.muetzel@gmx.de>
parents:
31393
diff
changeset
|
1721 AC_CACHE_CHECK([for Magick::ColorRGB and Magick::PixelPacket in Magick++.h], |
97057039b835
build: Check for symbol removed from ImageMagick++-7 API (bug #63331).
Markus Mützel <markus.muetzel@gmx.de>
parents:
31393
diff
changeset
|
1722 [octave_cv_func_magick], |
30290
47c078c0f22d
build: Check if magick++ library exports necessary symbols (bug #61481).
Markus Mützel <markus.muetzel@gmx.de>
parents:
30283
diff
changeset
|
1723 [AC_LINK_IFELSE([AC_LANG_PROGRAM([[ |
21381 | 1724 #include <Magick++.h> |
1725 ]], [[ | |
1726 Magick::ColorRGB c; | |
31407
97057039b835
build: Check for symbol removed from ImageMagick++-7 API (bug #63331).
Markus Mützel <markus.muetzel@gmx.de>
parents:
31393
diff
changeset
|
1727 Magick::PixelPacket pix; |
21381 | 1728 ]])], |
31407
97057039b835
build: Check for symbol removed from ImageMagick++-7 API (bug #63331).
Markus Mützel <markus.muetzel@gmx.de>
parents:
31393
diff
changeset
|
1729 octave_cv_func_magick=yes, |
97057039b835
build: Check for symbol removed from ImageMagick++-7 API (bug #63331).
Markus Mützel <markus.muetzel@gmx.de>
parents:
31393
diff
changeset
|
1730 octave_cv_func_magick=no) |
21381 | 1731 ]) |
31407
97057039b835
build: Check for symbol removed from ImageMagick++-7 API (bug #63331).
Markus Mützel <markus.muetzel@gmx.de>
parents:
31393
diff
changeset
|
1732 if test $octave_cv_func_magick = yes; then |
21381 | 1733 use_magick=yes |
1734 warn_magick= | |
1735 fi | |
1736 ]) | |
1737 AC_LANG_POP(C++) | |
1738 CPPFLAGS="$save_CPPFLAGS" | |
1739 LIBS="$save_LIBS" | |
22041
26c0e65e6b77
configure: clean up warning messages when building without GraphicsMagick
Mike Miller <mtmiller@octave.org>
parents:
22027
diff
changeset
|
1740 ], |
26c0e65e6b77
configure: clean up warning messages when building without GraphicsMagick
Mike Miller <mtmiller@octave.org>
parents:
22027
diff
changeset
|
1741 [use_magick=no |
30283
b7bce52e4500
allow building with ImageMagick++ to work again (bug #49653)
Markus Mützel <markus.muetzel@gmx.de>
parents:
30277
diff
changeset
|
1742 warn_magick="$magick library not found. The imread, imwrite, and imfinfo functions for reading and writing image files will not be fully functional."]) |
21381 | 1743 fi |
1744 | |
1745 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
|
1746 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
|
1747 [Define to 1 if Graphics/ImageMagick++ is available.]) |
7937
6661387827d6
Allow build without GraphicsMagick installed
David Bateman <dbateman@free.fr>
parents:
7934
diff
changeset
|
1748 else |
21381 | 1749 if test -n "$warn_magick"; then |
1750 OCTAVE_CONFIGURE_WARNING([warn_magick]) | |
1751 fi | |
9575
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
1752 MAGICK_CPPFLAGS= |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
1753 MAGICK_LDFLAGS= |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
1754 MAGICK_LIBS= |
8938
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
1755 fi |
9575
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
1756 AC_SUBST(MAGICK_CPPFLAGS) |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
1757 AC_SUBST(MAGICK_LDFLAGS) |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
1758 AC_SUBST(MAGICK_LIBS) |
6043 | 1759 |
31153
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
1760 ### Check for X11 libraries. |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1761 |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1762 AC_PATH_X |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1763 if test "$have_x" = yes; then |
23009
624f76f2ca51
configure.ac: Use a common style for messages.
Rik <rik@octave.org>
parents:
23007
diff
changeset
|
1764 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
|
1765 |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1766 if test "$x_includes" != "NONE"; then |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1767 X11_INCFLAGS="$x_includes" |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1768 fi |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1769 AC_SUBST(X11_INCFLAGS) |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1770 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1771 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
|
1772 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
|
1773 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
|
1774 AC_CHECK_LIB([X11], XrmInitialize, |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1775 [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
|
1776 fi |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1777 AC_SUBST(X11_LIBS) |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1778 fi |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1779 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1780 ### 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
|
1781 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1782 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
|
1783 [[#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
|
1784 [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
|
1785 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
|
1786 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
|
1787 [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
|
1788 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
|
1789 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
|
1790 AC_SUBST(CARBON_LIBS) |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1791 fi |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1792 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1793 ## 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
|
1794 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
|
1795 OCTAVE_CARBON_CGDISPLAYBITSPERPIXEL |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1796 fi |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
1797 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1798 ### 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
|
1799 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1800 check_opengl=yes |
11208
a44ba1cdfbb5
handle --without-opengl configure option
John W. Eaton <jwe@octave.org>
parents:
11119
diff
changeset
|
1801 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
|
1802 [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
|
1803 [don't use OpenGL libraries, disable OpenGL graphics])], |
21381 | 1804 [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
|
1805 check_opengl=no |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1806 fi]) |
11208
a44ba1cdfbb5
handle --without-opengl configure option
John W. Eaton <jwe@octave.org>
parents:
11119
diff
changeset
|
1807 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1808 ## 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
|
1809 if test $check_opengl = yes; then |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1810 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
|
1811 if test -z "$OPENGL_LIBS"; then |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1812 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
|
1813 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
|
1814 fi |
11208
a44ba1cdfbb5
handle --without-opengl configure option
John W. Eaton <jwe@octave.org>
parents:
11119
diff
changeset
|
1815 fi |
a44ba1cdfbb5
handle --without-opengl configure option
John W. Eaton <jwe@octave.org>
parents:
11119
diff
changeset
|
1816 |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1817 ## 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
|
1818 |
24121
e2dc75c661ac
configure: add a command-line option '--without-freetype' to disable FreeType
Mike Miller <mtmiller@octave.org>
parents:
24077
diff
changeset
|
1819 check_freetype=yes |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1820 warn_freetype= |
24121
e2dc75c661ac
configure: add a command-line option '--without-freetype' to disable FreeType
Mike Miller <mtmiller@octave.org>
parents:
24077
diff
changeset
|
1821 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
|
1822 [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
|
1823 [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
|
1824 [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
|
1825 check_freetype=no |
e2dc75c661ac
configure: add a command-line option '--without-freetype' to disable FreeType
Mike Miller <mtmiller@octave.org>
parents:
24077
diff
changeset
|
1826 fi]) |
e2dc75c661ac
configure: add a command-line option '--without-freetype' to disable FreeType
Mike Miller <mtmiller@octave.org>
parents:
24077
diff
changeset
|
1827 |
e2dc75c661ac
configure: add a command-line option '--without-freetype' to disable FreeType
Mike Miller <mtmiller@octave.org>
parents:
24077
diff
changeset
|
1828 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
|
1829 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
|
1830 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
|
1831 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
|
1832 $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
|
1833 ac_status=$? |
e2dc75c661ac
configure: add a command-line option '--without-freetype' to disable FreeType
Mike Miller <mtmiller@octave.org>
parents:
24077
diff
changeset
|
1834 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
|
1835 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
|
1836 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
|
1837 save_LIBS="$LIBS" |
e2dc75c661ac
configure: add a command-line option '--without-freetype' to disable FreeType
Mike Miller <mtmiller@octave.org>
parents:
24077
diff
changeset
|
1838 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
|
1839 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
|
1840 LIBS="$save_LIBS" |
e2dc75c661ac
configure: add a command-line option '--without-freetype' to disable FreeType
Mike Miller <mtmiller@octave.org>
parents:
24077
diff
changeset
|
1841 else |
e2dc75c661ac
configure: add a command-line option '--without-freetype' to disable FreeType
Mike Miller <mtmiller@octave.org>
parents:
24077
diff
changeset
|
1842 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
|
1843 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
|
1844 fi], |
e2dc75c661ac
configure: add a command-line option '--without-freetype' to disable FreeType
Mike Miller <mtmiller@octave.org>
parents:
24077
diff
changeset
|
1845 [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
|
1846 fi |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1847 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1848 if test -n "$warn_freetype"; then |
25668
19eba00c0c7d
if freetype detection fails, unset FT2_* config variables (bug #54369)
John W. Eaton <jwe@octave.org>
parents:
25607
diff
changeset
|
1849 FT2_CFLAGS= |
19eba00c0c7d
if freetype detection fails, unset FT2_* config variables (bug #54369)
John W. Eaton <jwe@octave.org>
parents:
25607
diff
changeset
|
1850 FT2_LIBS= |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1851 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
|
1852 else |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1853 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
|
1854 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
|
1855 FT2_CPPFLAGS="$FT2_CFLAGS" |
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
1856 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
|
1857 fi |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1858 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1859 ## Check for fontconfig library |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1860 |
23018
50b9eb1fb5fb
* configure.ac: Use OCTAVE_CHECK_LIB to check for fontconfig library.
John W. Eaton <jwe@octave.org>
parents:
23016
diff
changeset
|
1861 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
|
1862 [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
|
1863 [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
|
1864 [], [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
|
1865 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1866 ### GUI/Qt related tests. |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1867 |
32004
c5b57a82a17c
build: Initial changes to enable building with Qt6.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31999
diff
changeset
|
1868 QT_VERSIONS="5 6" |
21381 | 1869 |
1870 AC_ARG_WITH([qt], | |
22257
945e7f9c11ff
build: fix configure --without-qt or --with-qt
Mike Miller <mtmiller@octave.org>
parents:
22251
diff
changeset
|
1871 [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
|
1872 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
|
1873 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
|
1874 [case $withval in |
945e7f9c11ff
build: fix configure --without-qt or --with-qt
Mike Miller <mtmiller@octave.org>
parents:
22251
diff
changeset
|
1875 yes | "") |
945e7f9c11ff
build: fix configure --without-qt or --with-qt
Mike Miller <mtmiller@octave.org>
parents:
22251
diff
changeset
|
1876 ;; |
945e7f9c11ff
build: fix configure --without-qt or --with-qt
Mike Miller <mtmiller@octave.org>
parents:
22251
diff
changeset
|
1877 no) |
945e7f9c11ff
build: fix configure --without-qt or --with-qt
Mike Miller <mtmiller@octave.org>
parents:
22251
diff
changeset
|
1878 QT_VERSIONS= |
945e7f9c11ff
build: fix configure --without-qt or --with-qt
Mike Miller <mtmiller@octave.org>
parents:
22251
diff
changeset
|
1879 ;; |
945e7f9c11ff
build: fix configure --without-qt or --with-qt
Mike Miller <mtmiller@octave.org>
parents:
22251
diff
changeset
|
1880 *) |
945e7f9c11ff
build: fix configure --without-qt or --with-qt
Mike Miller <mtmiller@octave.org>
parents:
22251
diff
changeset
|
1881 QT_VERSIONS="$withval" |
945e7f9c11ff
build: fix configure --without-qt or --with-qt
Mike Miller <mtmiller@octave.org>
parents:
22251
diff
changeset
|
1882 ;; |
945e7f9c11ff
build: fix configure --without-qt or --with-qt
Mike Miller <mtmiller@octave.org>
parents:
22251
diff
changeset
|
1883 esac]) |
945e7f9c11ff
build: fix configure --without-qt or --with-qt
Mike Miller <mtmiller@octave.org>
parents:
22251
diff
changeset
|
1884 |
22823
e2afee0041bf
new configure option, --without-qscintilla
John W. Eaton <jwe@octave.org>
parents:
22763
diff
changeset
|
1885 check_qscintilla=yes |
e2afee0041bf
new configure option, --without-qscintilla
John W. Eaton <jwe@octave.org>
parents:
22763
diff
changeset
|
1886 AC_ARG_WITH([qscintilla], |
e2afee0041bf
new configure option, --without-qscintilla
John W. Eaton <jwe@octave.org>
parents:
22763
diff
changeset
|
1887 [AS_HELP_STRING([--without-qscintilla], [disable QScintilla editor])], |
e2afee0041bf
new configure option, --without-qscintilla
John W. Eaton <jwe@octave.org>
parents:
22763
diff
changeset
|
1888 [if test x"$withval" = xno; then |
e2afee0041bf
new configure option, --without-qscintilla
John W. Eaton <jwe@octave.org>
parents:
22763
diff
changeset
|
1889 check_qscintilla=no |
e2afee0041bf
new configure option, --without-qscintilla
John W. Eaton <jwe@octave.org>
parents:
22763
diff
changeset
|
1890 fi]) |
e2afee0041bf
new configure option, --without-qscintilla
John W. Eaton <jwe@octave.org>
parents:
22763
diff
changeset
|
1891 |
22257
945e7f9c11ff
build: fix configure --without-qt or --with-qt
Mike Miller <mtmiller@octave.org>
parents:
22251
diff
changeset
|
1892 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
|
1893 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1894 ## Default terminal font for the GUI. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1895 |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1896 case $host_os in |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1897 mingw* | msdosmsvc) |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1898 DEFAULT_TERMINAL_FONT="Lucida Console" |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1899 ;; |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1900 *) |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1901 DEFAULT_TERMINAL_FONT="Courier" |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1902 ;; |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1903 esac |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1904 DEFAULT_TERMINAL_FONT_SIZE=10 |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1905 AC_SUBST(DEFAULT_TERMINAL_FONT) |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1906 AC_SUBST(DEFAULT_TERMINAL_FONT_SIZE) |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1907 |
31153
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
1908 ### 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
|
1909 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1910 check_fltk=yes |
21512
79aa496c6d47
maint: Fix configure warning messages on missing OpenGL graphics support
Mike Miller <mtmiller@octave.org>
parents:
21480
diff
changeset
|
1911 build_fltk_graphics=no |
79aa496c6d47
maint: Fix configure warning messages on missing OpenGL graphics support
Mike Miller <mtmiller@octave.org>
parents:
21480
diff
changeset
|
1912 |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1913 AC_ARG_WITH([fltk], |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1914 [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
|
1915 [don't use FLTK libraries, disable OpenGL graphics with FLTK widgets])], |
21381 | 1916 [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
|
1917 check_fltk=no |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1918 fi]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1919 |
19733
08033d583435
more consistently use _CPPFLAGS and _LDFLAGS variables
John W. Eaton <jwe@octave.org>
parents:
19732
diff
changeset
|
1920 FLTK_CPPFLAGS= |
08033d583435
more consistently use _CPPFLAGS and _LDFLAGS variables
John W. Eaton <jwe@octave.org>
parents:
19732
diff
changeset
|
1921 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
|
1922 FLTK_LIBS= |
10571
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1923 |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1924 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
|
1925 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
|
1926 [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
|
1927 [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
|
1928 [fltk_prefix="$withval"], |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1929 [fltk_prefix=""]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1930 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1931 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
|
1932 [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
|
1933 [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
|
1934 [fltk_exec_prefix="$withval"], |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1935 [fltk_exec_prefix=""]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1936 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1937 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
|
1938 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
|
1939 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
|
1940 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
|
1941 fi |
18025
7c0f59b688fc
configure.ac: Check for Xft library before building native graphics.
Rik <rik@octave.org>
parents:
17989
diff
changeset
|
1942 fi |
7c0f59b688fc
configure.ac: Check for Xft library before building native graphics.
Rik <rik@octave.org>
parents:
17989
diff
changeset
|
1943 |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1944 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
|
1945 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
|
1946 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
|
1947 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
|
1948 fi |
18025
7c0f59b688fc
configure.ac: Check for Xft library before building native graphics.
Rik <rik@octave.org>
parents:
17989
diff
changeset
|
1949 fi |
7c0f59b688fc
configure.ac: Check for Xft library before building native graphics.
Rik <rik@octave.org>
parents:
17989
diff
changeset
|
1950 |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1951 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
|
1952 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1953 warn_fltk_config= |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1954 warn_fltk_opengl= |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1955 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1956 if test "$FLTK_CONFIG" = no; then |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1957 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
|
1958 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
|
1959 else |
21984
6187b9ce8477
build: Only include -I preprocessor options in FLTK_CPPFLAGS (bug #48302)
Mike Miller <mtmiller@octave.org>
parents:
21949
diff
changeset
|
1960 ## 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
|
1961 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
|
1962 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
|
1963 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
|
1964 -I*) |
6187b9ce8477
build: Only include -I preprocessor options in FLTK_CPPFLAGS (bug #48302)
Mike Miller <mtmiller@octave.org>
parents:
21949
diff
changeset
|
1965 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
|
1966 ;; |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1967 esac |
21984
6187b9ce8477
build: Only include -I preprocessor options in FLTK_CPPFLAGS (bug #48302)
Mike Miller <mtmiller@octave.org>
parents:
21949
diff
changeset
|
1968 done |
25213
7f6b4483468d
configure.ac: Strip any spaces from start of FLTK_XXX variables.
Rik <rik@octave.org>
parents:
25208
diff
changeset
|
1969 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
|
1970 |
23939
fd6b1339689f
build: set FLTK_LIBS properly by splitting FLTK_LDFLAGS
Mike Miller <mtmiller@octave.org>
parents:
23836
diff
changeset
|
1971 ## 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
|
1972 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
|
1973 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
|
1974 case $fltk_option in |
fd6b1339689f
build: set FLTK_LIBS properly by splitting FLTK_LDFLAGS
Mike Miller <mtmiller@octave.org>
parents:
23836
diff
changeset
|
1975 -l*) |
fd6b1339689f
build: set FLTK_LIBS properly by splitting FLTK_LDFLAGS
Mike Miller <mtmiller@octave.org>
parents:
23836
diff
changeset
|
1976 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
|
1977 ;; |
fd6b1339689f
build: set FLTK_LIBS properly by splitting FLTK_LDFLAGS
Mike Miller <mtmiller@octave.org>
parents:
23836
diff
changeset
|
1978 *) |
fd6b1339689f
build: set FLTK_LIBS properly by splitting FLTK_LDFLAGS
Mike Miller <mtmiller@octave.org>
parents:
23836
diff
changeset
|
1979 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
|
1980 ;; |
fd6b1339689f
build: set FLTK_LIBS properly by splitting FLTK_LDFLAGS
Mike Miller <mtmiller@octave.org>
parents:
23836
diff
changeset
|
1981 esac |
fd6b1339689f
build: set FLTK_LIBS properly by splitting FLTK_LDFLAGS
Mike Miller <mtmiller@octave.org>
parents:
23836
diff
changeset
|
1982 done |
25213
7f6b4483468d
configure.ac: Strip any spaces from start of FLTK_XXX variables.
Rik <rik@octave.org>
parents:
25208
diff
changeset
|
1983 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
|
1984 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
|
1985 |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1986 case $host_os in |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1987 mingw*) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1988 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
|
1989 ;; |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1990 esac |
21802
66972e1679df
configure.ac: Fix check for OpenGL support in FLTK
Andreas Weber <andy.weber.aw@gmail.com>
parents:
21724
diff
changeset
|
1991 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
|
1992 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
|
1993 [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
|
1994 [save_CPPFLAGS="$CPPFLAGS" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1995 CPPFLAGS="$CFLAGS $FLTK_CPPFLAGS" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1996 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
|
1997 #include <FL/gl.h> |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1998 ]], [[ |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1999 int nothing = 0; |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
2000 ]])], |
21802
66972e1679df
configure.ac: Fix check for OpenGL support in FLTK
Andreas Weber <andy.weber.aw@gmail.com>
parents:
21724
diff
changeset
|
2001 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
|
2002 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
|
2003 CPPFLAGS="$save_CPPFLAGS" |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
2004 ]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
2005 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
|
2006 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
|
2007 else |
21512
79aa496c6d47
maint: Fix configure warning messages on missing OpenGL graphics support
Mike Miller <mtmiller@octave.org>
parents:
21480
diff
changeset
|
2008 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
|
2009 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
|
2010 fi |
21802
66972e1679df
configure.ac: Fix check for OpenGL support in FLTK
Andreas Weber <andy.weber.aw@gmail.com>
parents:
21724
diff
changeset
|
2011 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
|
2012 |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
2013 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
|
2014 OCTAVE_CONFIGURE_WARNING([warn_fltk_opengl]) |
10571
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
2015 fi |
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
2016 fi |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
2017 fi |
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
2018 |
19733
08033d583435
more consistently use _CPPFLAGS and _LDFLAGS variables
John W. Eaton <jwe@octave.org>
parents:
19732
diff
changeset
|
2019 AC_SUBST(FLTK_CPPFLAGS) |
08033d583435
more consistently use _CPPFLAGS and _LDFLAGS variables
John W. Eaton <jwe@octave.org>
parents:
19732
diff
changeset
|
2020 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
|
2021 AC_SUBST(FLTK_LIBS) |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
2022 |
31999
835e9eab3ead
avoid configure script error when using --without-qt (bug #64027)
John W. Eaton <jwe@octave.org>
parents:
31984
diff
changeset
|
2023 ### Final determination of whether OpenGL graphics features should |
835e9eab3ead
avoid configure script error when using --without-qt (bug #64027)
John W. Eaton <jwe@octave.org>
parents:
31984
diff
changeset
|
2024 ### be built. Note that there is no longer a way to build the Qt GUI |
835e9eab3ead
avoid configure script error when using --without-qt (bug #64027)
John W. Eaton <jwe@octave.org>
parents:
31984
diff
changeset
|
2025 ### without also building a Qt widget that uses OpenGL graphics so we |
835e9eab3ead
avoid configure script error when using --without-qt (bug #64027)
John W. Eaton <jwe@octave.org>
parents:
31984
diff
changeset
|
2026 ### check $build_qt_gui instead of $build_qt_graphics here. |
835e9eab3ead
avoid configure script error when using --without-qt (bug #64027)
John W. Eaton <jwe@octave.org>
parents:
31984
diff
changeset
|
2027 if test $build_qt_gui = 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
|
2028 opengl_graphics=no |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
2029 else |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
2030 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
|
2031 fi |
19703
a81177f4bfe6
Add __osmesa_print__.cc for offscreen rendering with OpenGL
Andreas Weber <andy.weber.aw@gmail.com>
parents:
19697
diff
changeset
|
2032 |
28359
75c87b15bcee
configure.ac: Move check for gl2ps to after Qt and OpenGL detection.
Markus Mützel <markus.muetzel@gmx.de>
parents:
28356
diff
changeset
|
2033 ## Check for gl2ps which is required for printing with OpenGL graphics. |
75c87b15bcee
configure.ac: Move check for gl2ps to after Qt and OpenGL detection.
Markus Mützel <markus.muetzel@gmx.de>
parents:
28356
diff
changeset
|
2034 |
75c87b15bcee
configure.ac: Move check for gl2ps to after Qt and OpenGL detection.
Markus Mützel <markus.muetzel@gmx.de>
parents:
28356
diff
changeset
|
2035 if test $opengl_graphics = yes; then |
75c87b15bcee
configure.ac: Move check for gl2ps to after Qt and OpenGL detection.
Markus Mützel <markus.muetzel@gmx.de>
parents:
28356
diff
changeset
|
2036 AC_CHECK_HEADERS([gl2ps.h], |
75c87b15bcee
configure.ac: Move check for gl2ps to after Qt and OpenGL detection.
Markus Mützel <markus.muetzel@gmx.de>
parents:
28356
diff
changeset
|
2037 [GL2PS_LIBS="-lgl2ps"], |
75c87b15bcee
configure.ac: Move check for gl2ps to after Qt and OpenGL detection.
Markus Mützel <markus.muetzel@gmx.de>
parents:
28356
diff
changeset
|
2038 [warn_gl2ps="gl2ps library not found. Printing of OpenGL graphics will be disabled."]) |
75c87b15bcee
configure.ac: Move check for gl2ps to after Qt and OpenGL detection.
Markus Mützel <markus.muetzel@gmx.de>
parents:
28356
diff
changeset
|
2039 |
75c87b15bcee
configure.ac: Move check for gl2ps to after Qt and OpenGL detection.
Markus Mützel <markus.muetzel@gmx.de>
parents:
28356
diff
changeset
|
2040 if test -n "$warn_gl2ps"; then |
75c87b15bcee
configure.ac: Move check for gl2ps to after Qt and OpenGL detection.
Markus Mützel <markus.muetzel@gmx.de>
parents:
28356
diff
changeset
|
2041 OCTAVE_CONFIGURE_WARNING([warn_gl2ps]) |
75c87b15bcee
configure.ac: Move check for gl2ps to after Qt and OpenGL detection.
Markus Mützel <markus.muetzel@gmx.de>
parents:
28356
diff
changeset
|
2042 else |
75c87b15bcee
configure.ac: Move check for gl2ps to after Qt and OpenGL detection.
Markus Mützel <markus.muetzel@gmx.de>
parents:
28356
diff
changeset
|
2043 save_LIBS="$LIBS" |
75c87b15bcee
configure.ac: Move check for gl2ps to after Qt and OpenGL detection.
Markus Mützel <markus.muetzel@gmx.de>
parents:
28356
diff
changeset
|
2044 LIBS="$GL2PS_LIBS $LIBS" |
75c87b15bcee
configure.ac: Move check for gl2ps to after Qt and OpenGL detection.
Markus Mützel <markus.muetzel@gmx.de>
parents:
28356
diff
changeset
|
2045 AC_CHECK_FUNCS([gl2psLineJoin]) |
75c87b15bcee
configure.ac: Move check for gl2ps to after Qt and OpenGL detection.
Markus Mützel <markus.muetzel@gmx.de>
parents:
28356
diff
changeset
|
2046 LIBS="$save_LIBS" |
75c87b15bcee
configure.ac: Move check for gl2ps to after Qt and OpenGL detection.
Markus Mützel <markus.muetzel@gmx.de>
parents:
28356
diff
changeset
|
2047 fi |
75c87b15bcee
configure.ac: Move check for gl2ps to after Qt and OpenGL detection.
Markus Mützel <markus.muetzel@gmx.de>
parents:
28356
diff
changeset
|
2048 |
75c87b15bcee
configure.ac: Move check for gl2ps to after Qt and OpenGL detection.
Markus Mützel <markus.muetzel@gmx.de>
parents:
28356
diff
changeset
|
2049 AC_SUBST(GL2PS_LIBS) |
75c87b15bcee
configure.ac: Move check for gl2ps to after Qt and OpenGL detection.
Markus Mützel <markus.muetzel@gmx.de>
parents:
28356
diff
changeset
|
2050 fi |
75c87b15bcee
configure.ac: Move check for gl2ps to after Qt and OpenGL detection.
Markus Mützel <markus.muetzel@gmx.de>
parents:
28356
diff
changeset
|
2051 |
31153
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2052 ### Use the system-wide installation of GNU FreeFont if the user requests it. |
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2053 dnl By default, Octave includes its own copy of the FreeSans font which it |
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2054 dnl installs in its own directory for use as a fallback default font. If this |
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2055 dnl configuration option is used, then do not install our own copy of the fonts |
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2056 dnl and assume they can be found in the provided system directory. |
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2057 SYSTEM_FREEFONT_DIR= |
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2058 AC_ARG_WITH([system-freefont], |
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2059 [AS_HELP_STRING([--with-system-freefont=DIR], |
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2060 [use FreeSans fonts in DIR (default: install and use internal copy)])]) |
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2061 case $with_system_freefont in |
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2062 no | "") |
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2063 SYSTEM_FREEFONT_DIR= |
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2064 ;; |
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2065 yes) |
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2066 AC_MSG_ERROR([directory argument required for --with-system-freefont]) |
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2067 ;; |
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2068 *) |
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2069 SYSTEM_FREEFONT_DIR=$with_system_freefont |
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2070 ;; |
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2071 esac |
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2072 if test -n "$SYSTEM_FREEFONT_DIR"; then |
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2073 AC_MSG_NOTICE([configuring Octave to use system fonts in $SYSTEM_FREEFONT_DIR]) |
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2074 AC_DEFINE_UNQUOTED([SYSTEM_FREEFONT_DIR], ["$SYSTEM_FREEFONT_DIR"], |
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2075 [Define this to be the system directory containing the GNU FreeFont fonts.]) |
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2076 fi |
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2077 AM_CONDITIONAL([AMCOND_INSTALL_INTERNAL_FONT_FILES], |
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2078 [test -z "$SYSTEM_FREEFONT_DIR"]) |
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2079 |
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2080 ### Check for qrupdate library. |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
2081 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2082 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
|
2083 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
|
2084 save_LIBS="$LIBS" |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2085 LIBS="$LAPACK_LIBS $BLAS_LIBS $FLIBS $LIBS" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2086 OCTAVE_CHECK_LIB(qrupdate, qrupdate, |
9571
263a8ed419b0
configure.in: style fixes for messages
John W. Eaton <jwe@octave.org>
parents:
9570
diff
changeset
|
2087 [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
|
2088 [], |
9707
6f5c4c82c5fc
avoid ugly F77 names in configure
Jaroslav Hajek <highegg@gmail.com>
parents:
9648
diff
changeset
|
2089 [sqr1up], |
6f5c4c82c5fc
avoid ugly F77 names in configure
Jaroslav Hajek <highegg@gmail.com>
parents:
9648
diff
changeset
|
2090 [Fortran 77], [don't use qrupdate, disable QR & Cholesky updating functions]) |
9708 | 2091 |
19349
043440fa7006
configure.ac: Respect without-z and without-qrupdate options when config.cache exists.
Rik <rik@octave.org>
parents:
19344
diff
changeset
|
2092 ## Additional check to see if qrupdate lib found supports LU updates |
28304
144d77f3f829
configure.ac: Fix compilation when --without-XXX used for all libraries (bug #58330).
Rik <rik@octave.org>
parents:
28300
diff
changeset
|
2093 if test -n "$QRUPDATE_LIBS"; then |
15361
01c4f5d8a656
configure.ac: Cache results for QRUPDATE_LUU autoconf test.
Rik <rik@octave.org>
parents:
15350
diff
changeset
|
2094 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
|
2095 [octave_cv_func_slup1up], |
01c4f5d8a656
configure.ac: Cache results for QRUPDATE_LUU autoconf test.
Rik <rik@octave.org>
parents:
15350
diff
changeset
|
2096 [LIBS="$LIBS $QRUPDATE_LIBS" |
01c4f5d8a656
configure.ac: Cache results for QRUPDATE_LUU autoconf test.
Rik <rik@octave.org>
parents:
15350
diff
changeset
|
2097 AC_LANG_PUSH([Fortran 77]) |
01c4f5d8a656
configure.ac: Cache results for QRUPDATE_LUU autoconf test.
Rik <rik@octave.org>
parents:
15350
diff
changeset
|
2098 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
|
2099 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
|
2100 AC_LANG_POP([Fortran 77]) |
01c4f5d8a656
configure.ac: Cache results for QRUPDATE_LUU autoconf test.
Rik <rik@octave.org>
parents:
15350
diff
changeset
|
2101 ]) |
01c4f5d8a656
configure.ac: Cache results for QRUPDATE_LUU autoconf test.
Rik <rik@octave.org>
parents:
15350
diff
changeset
|
2102 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
|
2103 AC_DEFINE(HAVE_QRUPDATE_LUU, 1, [Define to 1 if qrupdate supports LU updates.]) |
9708 | 2104 fi |
2105 fi | |
9570
1ab56c73ec7c
use OCTAVE_CHECK_LIBRARY to check for qrupdate library
John W. Eaton <jwe@octave.org>
parents:
9568
diff
changeset
|
2106 LIBS="$save_LIBS" |
8547
d66c9b6e506a
imported patch qrupdate.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8417
diff
changeset
|
2107 |
21131
54527108599a
store more --enable-FEATURE info in octave_config_info
John W. Eaton <jwe@octave.org>
parents:
21117
diff
changeset
|
2108 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
|
2109 CHOLMOD_TAG="_l_" |
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
2110 CXSPARSE_TAG="_dl_" |
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
2111 UMFPACK_TAG="_zl_" |
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
2112 else |
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
2113 CHOLMOD_TAG="_" |
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
2114 CXSPARSE_TAG="_di_" |
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
2115 UMFPACK_TAG="_zi_" |
20712
4a25c398ffa2
configure option to build with address sanitizer (bugg #46449)
John W. Eaton <jwe@octave.org>
parents:
20677
diff
changeset
|
2116 fi |
4a25c398ffa2
configure option to build with address sanitizer (bugg #46449)
John W. Eaton <jwe@octave.org>
parents:
20677
diff
changeset
|
2117 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2118 ## On some systems, explicitly linking with -lsuitesparseconfig is needed |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2119 ## 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
|
2120 ## 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
|
2121 ## 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
|
2122 |
6f56efc098bd
check for suitesparse config library before other suitesparse libraries
John W. Eaton <jwe@octave.org>
parents:
23989
diff
changeset
|
2123 save_LIBS="$LIBS" |
23993
49e37560e0fe
configure: rely on gnulib for detection of clock_gettime
Mike Miller <mtmiller@octave.org>
parents:
23992
diff
changeset
|
2124 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
|
2125 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
|
2126 [], [], [SuiteSparse_time], [], |
6f56efc098bd
check for suitesparse config library before other suitesparse libraries
John W. Eaton <jwe@octave.org>
parents:
23989
diff
changeset
|
2127 [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
|
2128 LIBS="$save_LIBS" |
6f56efc098bd
check for suitesparse config library before other suitesparse libraries
John W. Eaton <jwe@octave.org>
parents:
23989
diff
changeset
|
2129 |
23993
49e37560e0fe
configure: rely on gnulib for detection of clock_gettime
Mike Miller <mtmiller@octave.org>
parents:
23992
diff
changeset
|
2130 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
|
2131 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
|
2132 fi |
6f56efc098bd
check for suitesparse config library before other suitesparse libraries
John W. Eaton <jwe@octave.org>
parents:
23989
diff
changeset
|
2133 |
31153
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2134 ## Save and restore LIBS after all checks for SuiteSparse libraries. |
23990
6f56efc098bd
check for suitesparse config library before other suitesparse libraries
John W. Eaton <jwe@octave.org>
parents:
23989
diff
changeset
|
2135 suitesparse_save_LIBS="$LIBS" |
6f56efc098bd
check for suitesparse config library before other suitesparse libraries
John W. Eaton <jwe@octave.org>
parents:
23989
diff
changeset
|
2136 LIBS="$SUITESPARSECONFIG_LIBS $LIBS" |
6f56efc098bd
check for suitesparse config library before other suitesparse libraries
John W. Eaton <jwe@octave.org>
parents:
23989
diff
changeset
|
2137 |
31153
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2138 ### Check for AMD library. |
7619 | 2139 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2140 OCTAVE_CHECK_LIB(amd, AMD, |
9571
263a8ed419b0
configure.in: style fixes for messages
John W. Eaton <jwe@octave.org>
parents:
9570
diff
changeset
|
2141 [AMD library not found. This will result in some lack of functionality for sparse matrices.], |
29429
73db3b4d2188
configure.ac: No longer look for SuiteSparse header files in ufsparse/ (bug #59806).
Rik <rik@octave.org>
parents:
29428
diff
changeset
|
2142 [amd.h suitesparse/amd.h amd/amd.h], |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
2143 [amd_postorder], |
10003
2ea3110e15ed
Use M4 quoting for arguments to autoconf macros containing variables
Rik <rdrider0-list@yahoo.com>
parents:
9989
diff
changeset
|
2144 [], [don't use AMD library, disable some sparse matrix functionality]) |
5451 | 2145 |
31153
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2146 ### Check for CAMD library. |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
2147 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2148 OCTAVE_CHECK_LIB(camd, CAMD, |
9571
263a8ed419b0
configure.in: style fixes for messages
John W. Eaton <jwe@octave.org>
parents:
9570
diff
changeset
|
2149 [CAMD library not found. This will result in some lack of functionality for sparse matrices.], |
29429
73db3b4d2188
configure.ac: No longer look for SuiteSparse header files in ufsparse/ (bug #59806).
Rik <rik@octave.org>
parents:
29428
diff
changeset
|
2150 [camd.h suitesparse/camd.h camd/camd.h], |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
2151 [camd_postorder], |
10003
2ea3110e15ed
Use M4 quoting for arguments to autoconf macros containing variables
Rik <rdrider0-list@yahoo.com>
parents:
9989
diff
changeset
|
2152 [], [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
|
2153 |
31153
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2154 ### Check for COLAMD library. |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
2155 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2156 OCTAVE_CHECK_LIB(colamd, COLAMD, |
9571
263a8ed419b0
configure.in: style fixes for messages
John W. Eaton <jwe@octave.org>
parents:
9570
diff
changeset
|
2157 [COLAMD library not found. This will result in some lack of functionality for sparse matrices.], |
29429
73db3b4d2188
configure.ac: No longer look for SuiteSparse header files in ufsparse/ (bug #59806).
Rik <rik@octave.org>
parents:
29428
diff
changeset
|
2158 [colamd.h suitesparse/colamd.h colamd/colamd.h], |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
2159 [colamd], |
10003
2ea3110e15ed
Use M4 quoting for arguments to autoconf macros containing variables
Rik <rdrider0-list@yahoo.com>
parents:
9989
diff
changeset
|
2160 [], [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
|
2161 |
31153
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2162 ### Check for CCOLAMD library. |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
2163 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2164 OCTAVE_CHECK_LIB(ccolamd, CCOLAMD, |
9571
263a8ed419b0
configure.in: style fixes for messages
John W. Eaton <jwe@octave.org>
parents:
9570
diff
changeset
|
2165 [CCOLAMD library not found. This will result in some lack of functionality for sparse matrices.], |
29429
73db3b4d2188
configure.ac: No longer look for SuiteSparse header files in ufsparse/ (bug #59806).
Rik <rik@octave.org>
parents:
29428
diff
changeset
|
2166 [ccolamd.h suitesparse/ccolamd.h ccolamd/ccolamd.h], |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
2167 [ccolamd], |
10003
2ea3110e15ed
Use M4 quoting for arguments to autoconf macros containing variables
Rik <rdrider0-list@yahoo.com>
parents:
9989
diff
changeset
|
2168 [], [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
|
2169 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
2170 ### Check for CHOLMOD library. |
31153
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2171 dnl If your cholmod library requires cblas, then you will need to configure |
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2172 dnl with --with-cholmod="-lcholmod -lcblas". |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
2173 |
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
2174 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
|
2175 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
|
2176 OCTAVE_CHECK_LIB(cholmod, CHOLMOD, |
9571
263a8ed419b0
configure.in: style fixes for messages
John W. Eaton <jwe@octave.org>
parents:
9570
diff
changeset
|
2177 [CHOLMOD library not found. This will result in some lack of functionality for sparse matrices.], |
29429
73db3b4d2188
configure.ac: No longer look for SuiteSparse header files in ufsparse/ (bug #59806).
Rik <rik@octave.org>
parents:
29428
diff
changeset
|
2178 [cholmod.h suitesparse/cholmod.h cholmod/cholmod.h], |
16318
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
2179 [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
|
2180 [], [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
|
2181 LIBS="$save_LIBS" |
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
2182 |
31153
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2183 ### Check for SPQR library. |
29259
66f162b6fa03
Replacement of CXSPARSE by SPQR for QR factorization (bug #57033).
Simon Hau <simon.hau79@gmail.com>
parents:
29239
diff
changeset
|
2184 |
29355
2a4998b97990
build: Consider SPQR dependency on cholmod in configure check (bug #57033).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29354
diff
changeset
|
2185 save_LIBS="$LIBS" |
2a4998b97990
build: Consider SPQR dependency on cholmod in configure check (bug #57033).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29354
diff
changeset
|
2186 LIBS="$CHOLMOD_LIBS $LIBS" |
29259
66f162b6fa03
Replacement of CXSPARSE by SPQR for QR factorization (bug #57033).
Simon Hau <simon.hau79@gmail.com>
parents:
29239
diff
changeset
|
2187 OCTAVE_CHECK_LIB(spqr, SPQR, |
66f162b6fa03
Replacement of CXSPARSE by SPQR for QR factorization (bug #57033).
Simon Hau <simon.hau79@gmail.com>
parents:
29239
diff
changeset
|
2188 [SPQR library not found. This will result in some lack of functionality for sparse matrices.], |
29428
dba6e9920113
configure.ac: Prioritize top-level headers in OCTAVE_CHECK_LIB macro (bug #59806)
Rik <rik@octave.org>
parents:
29409
diff
changeset
|
2189 [SuiteSparseQR.hpp suitesparse/SuiteSparseQR.hpp], |
29259
66f162b6fa03
Replacement of CXSPARSE by SPQR for QR factorization (bug #57033).
Simon Hau <simon.hau79@gmail.com>
parents:
29239
diff
changeset
|
2190 [SuiteSparseQR_C], |
66f162b6fa03
Replacement of CXSPARSE by SPQR for QR factorization (bug #57033).
Simon Hau <simon.hau79@gmail.com>
parents:
29239
diff
changeset
|
2191 [C++], [don't use SPQR library, disable some sparse matrix functionality]) |
29355
2a4998b97990
build: Consider SPQR dependency on cholmod in configure check (bug #57033).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29354
diff
changeset
|
2192 LIBS="$save_LIBS" |
29259
66f162b6fa03
Replacement of CXSPARSE by SPQR for QR factorization (bug #57033).
Simon Hau <simon.hau79@gmail.com>
parents:
29239
diff
changeset
|
2193 |
31153
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2194 ### Check for CXSparse library. |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
2195 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2196 OCTAVE_CHECK_LIB(cxsparse, CXSparse, |
9571
263a8ed419b0
configure.in: style fixes for messages
John W. Eaton <jwe@octave.org>
parents:
9570
diff
changeset
|
2197 [CXSparse library not found. This will result in some lack of functionality for sparse matrices.], |
29429
73db3b4d2188
configure.ac: No longer look for SuiteSparse header files in ufsparse/ (bug #59806).
Rik <rik@octave.org>
parents:
29428
diff
changeset
|
2198 [cs.h suitesparse/cs.h cxsparse/cs.h], |
16318
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
2199 [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
|
2200 [C++], [don't use CXSparse library, disable some sparse matrix functionality]) |
6024 | 2201 |
28304
144d77f3f829
configure.ac: Fix compilation when --without-XXX used for all libraries (bug #58330).
Rik <rik@octave.org>
parents:
28300
diff
changeset
|
2202 if test -n "$CXSPARSE_LIBS"; then |
25309
7d32780f4dea
avoid syntax error in configure if cxsparse is missing
John W. Eaton <jwe@octave.org>
parents:
25295
diff
changeset
|
2203 ## 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
|
2204 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
|
2205 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
|
2206 if test $octave_cv_cxsparse_version_ok = no; then |
30250
aaac4d16af9e
build: Correct error message for incompatible CXSparse (bug #61385).
Petter Tomner <tomner@kth.se>
parents:
30248
diff
changeset
|
2207 AC_MSG_ERROR([CXSparse library is too old (< version 2.2). Upgrade CXSparse (SuiteSparse) or configure Octave with --without-cxsparse"]) |
25309
7d32780f4dea
avoid syntax error in configure if cxsparse is missing
John W. Eaton <jwe@octave.org>
parents:
25295
diff
changeset
|
2208 fi |
21160
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
2209 fi |
21023
ec532a439c6f
rework method of disabling warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
20842
diff
changeset
|
2210 fi |
4626 | 2211 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
2212 ### Check for UMFPACK library. |
5226 | 2213 |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
2214 save_LIBS="$LIBS" |
9787
cc5bb7b5679f
use AMD_CPPFLAGS when checking for UMFPACK
David Grundberg <davidg@cs.umu.se>
parents:
9763
diff
changeset
|
2215 save_CPPFLAGS="$CPPFLAGS" |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
2216 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
|
2217 CPPFLAGS="$AMD_CPPFLAGS $CPPFLAGS" |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2218 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
|
2219 [UMFPACK not found. This will result in some lack of functionality for sparse matrices.], |
29429
73db3b4d2188
configure.ac: No longer look for SuiteSparse header files in ufsparse/ (bug #59806).
Rik <rik@octave.org>
parents:
29428
diff
changeset
|
2220 [umfpack.h suitesparse/umfpack.h umfpack/umfpack.h], |
16318
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
2221 [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
|
2222 [], [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
|
2223 CPPFLAGS="$save_CPPFLAGS" |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
2224 LIBS="$save_LIBS" |
5512 | 2225 |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
2226 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
|
2227 ## 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
|
2228 $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
|
2229 $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
|
2230 save_LIBS="$LIBS" |
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
2231 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
|
2232 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
|
2233 [UMFPACK not found. This will result in some lack of functionality for sparse matrices.], |
29429
73db3b4d2188
configure.ac: No longer look for SuiteSparse header files in ufsparse/ (bug #59806).
Rik <rik@octave.org>
parents:
29428
diff
changeset
|
2234 [umfpack.h suitesparse/umfpack.h umfpack/umfpack.h], |
16318
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
2235 [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
|
2236 [], [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
|
2237 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
|
2238 UMFPACK_LIBS="$UMFPACK_LIBS -lcblas" |
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
2239 fi |
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
2240 LIBS="$save_LIBS" |
6133 | 2241 fi |
5513 | 2242 |
23021
6094018f5e72
refactor configure checks for Sundials (bug #50003)
John W. Eaton <jwe@octave.org>
parents:
23018
diff
changeset
|
2243 ### Check for KLU library and header. |
6094018f5e72
refactor configure checks for Sundials (bug #50003)
John W. Eaton <jwe@octave.org>
parents:
23018
diff
changeset
|
2244 |
6094018f5e72
refactor configure checks for Sundials (bug #50003)
John W. Eaton <jwe@octave.org>
parents:
23018
diff
changeset
|
2245 OCTAVE_CHECK_LIB(klu, KLU, |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2246 [KLU library not found. This will result in some lack of functionality for sparse matrices.], |
29429
73db3b4d2188
configure.ac: No longer look for SuiteSparse header files in ufsparse/ (bug #59806).
Rik <rik@octave.org>
parents:
29428
diff
changeset
|
2247 [klu.h suitesparse/klu.h klu/klu.h], [klu_solve], |
23021
6094018f5e72
refactor configure checks for Sundials (bug #50003)
John W. Eaton <jwe@octave.org>
parents:
23018
diff
changeset
|
2248 [], [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
|
2249 |
31153
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2250 ## Restore LIBS after all suitesparse configuration tests |
23990
6f56efc098bd
check for suitesparse config library before other suitesparse libraries
John W. Eaton <jwe@octave.org>
parents:
23989
diff
changeset
|
2251 LIBS="$suitesparse_save_LIBS" |
5226 | 2252 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2253 ## Collections of flags. |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2254 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
|
2255 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
|
2256 |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
2257 ## 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
|
2258 |
29259
66f162b6fa03
Replacement of CXSPARSE by SPQR for QR factorization (bug #57033).
Simon Hau <simon.hau79@gmail.com>
parents:
29239
diff
changeset
|
2259 SPARSE_XCPPFLAGS="$CHOLMOD_CPPFLAGS $UMFPACK_CPPFLAGS $AMD_CPPFLAGS $CAMD_CPPFLAGS $COLAMD_CPPFLAGS $CCOLAMD_CPPFLAGS $CXSPARSE_CPPFLAGS $SPQR_CPPFLAGS" |
66f162b6fa03
Replacement of CXSPARSE by SPQR for QR factorization (bug #57033).
Simon Hau <simon.hau79@gmail.com>
parents:
29239
diff
changeset
|
2260 |
66f162b6fa03
Replacement of CXSPARSE by SPQR for QR factorization (bug #57033).
Simon Hau <simon.hau79@gmail.com>
parents:
29239
diff
changeset
|
2261 SPARSE_XLDFLAGS="$CHOLMOD_LDFLAGS $UMFPACK_LDFLAGS $AMD_LDFLAGS $CAMD_LDFLAGS $COLAMD_LDFLAGS $CCOLAMD_LDFLAGS $CXSPARSE_LDFLAGS $SPQR_LDFLAGS" |
66f162b6fa03
Replacement of CXSPARSE by SPQR for QR factorization (bug #57033).
Simon Hau <simon.hau79@gmail.com>
parents:
29239
diff
changeset
|
2262 |
66f162b6fa03
Replacement of CXSPARSE by SPQR for QR factorization (bug #57033).
Simon Hau <simon.hau79@gmail.com>
parents:
29239
diff
changeset
|
2263 SPARSE_XLIBS="$CHOLMOD_LIBS $UMFPACK_LIBS $AMD_LIBS $CAMD_LIBS $COLAMD_LIBS $CCOLAMD_LIBS $CXSPARSE_LIBS $SUITESPARSECONFIG_LIBS $SPQR_LIBS" |
23389
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
2264 |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
2265 AC_SUBST(SPARSE_XCPPFLAGS) |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
2266 AC_SUBST(SPARSE_XLDFLAGS) |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
2267 AC_SUBST(SPARSE_XLIBS) |
5226 | 2268 |
22501
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2269 ## 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
|
2270 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
|
2271 save_CPPFLAGS="$CPPFLAGS" |
23389
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
2272 save_LDFLAGS="$LDFLAGS"; |
22501
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2273 save_LIBS="$LIBS"; |
23389
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
2274 |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
2275 CPPFLAGS="$SPARSE_XCPPFLAGS $CPPFLAGS" |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
2276 LDFLAGS="$SPARSE_XLDFLAGS $LDFLAGS" |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
2277 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
|
2278 |
22501
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2279 OCTAVE_UMFPACK_SEPARATE_SPLIT |
23389
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
2280 |
22501
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2281 CPPFLAGS="$save_CPPFLAGS" |
23389
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
2282 LDFLAGS="$save_LDFLAGS" |
22501
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2283 LIBS="$save_LIBS" |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2284 fi |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
2285 |
23981
6420142ff32c
configure: fix capitalization of SUNDIALS, reword related terms
Mike Miller <mtmiller@octave.org>
parents:
23980
diff
changeset
|
2286 ### 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
|
2287 |
6420142ff32c
configure: fix capitalization of SUNDIALS, reword related terms
Mike Miller <mtmiller@octave.org>
parents:
23980
diff
changeset
|
2288 OCTAVE_CHECK_LIB(sundials_nvecserial, [SUNDIALS NVECTOR], |
26992
05f389459461
configure: avoid excessive SUNDIALS warning messages when already disabled
Mike Miller <mtmiller@octave.org>
parents:
26991
diff
changeset
|
2289 [SUNDIALS NVECTOR serial library not found. The solvers ode15i and ode15s will be disabled.], |
29428
dba6e9920113
configure.ac: Prioritize top-level headers in OCTAVE_CHECK_LIB macro (bug #59806)
Rik <rik@octave.org>
parents:
29409
diff
changeset
|
2290 [nvector_serial.h nvector/nvector_serial.h], [N_VNew_Serial], |
31735
3dcdb05a2e68
build: Make sure SUNDIALS headers compile with C++ compiler (bug #63633).
Markus Mützel <markus.muetzel@gmx.de>
parents:
31716
diff
changeset
|
2291 [C++], [don't use SUNDIALS NVECTOR library, disable solvers ode15i and ode15s]) |
23981
6420142ff32c
configure: fix capitalization of SUNDIALS, reword related terms
Mike Miller <mtmiller@octave.org>
parents:
23980
diff
changeset
|
2292 |
6420142ff32c
configure: fix capitalization of SUNDIALS, reword related terms
Mike Miller <mtmiller@octave.org>
parents:
23980
diff
changeset
|
2293 ### 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
|
2294 |
28299
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2295 if test -n "$SUNDIALS_NVECSERIAL_LIBS"; then |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2296 |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2297 save_CPPFLAGS="$CPPFLAGS" |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2298 save_LDFLAGS="$LDFLAGS" |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2299 save_LIBS="$LIBS" |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2300 LIBS="$SUNDIALS_NVECSERIAL_LIBS $KLU_LIBS $BLAS_LIBS $FLIBS $LIBS" |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2301 LDFLAGS="$SUNDIALS_NVECSERIAL_LDFLAGS $KLU_LDFLAGS $BLAS_LDFLAGS $LDFLAGS" |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2302 CPPFLAGS="$SUNDIALS_NVECSERIAL_CPPFLAGS $KLU_CPPFLAGS $BLAS_CPPFLAGS $CPPFLAGS" |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2303 OCTAVE_CHECK_LIB(sundials_ida, [SUNDIALS IDA], |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2304 [SUNDIALS IDA library not found. The solvers ode15i and ode15s will be disabled.], |
29428
dba6e9920113
configure.ac: Prioritize top-level headers in OCTAVE_CHECK_LIB macro (bug #59806)
Rik <rik@octave.org>
parents:
29409
diff
changeset
|
2305 [ida.h ida/ida.h], [IDAInit], |
28299
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2306 [], [don't use SUNDIALS IDA library, disable solvers ode15i and ode15s]) |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2307 CPPFLAGS="$save_CPPFLAGS" |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2308 LDFLAGS="$save_LDFLAGS" |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2309 LIBS="$save_LIBS" |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2310 fi |
26992
05f389459461
configure: avoid excessive SUNDIALS warning messages when already disabled
Mike Miller <mtmiller@octave.org>
parents:
26991
diff
changeset
|
2311 |
05f389459461
configure: avoid excessive SUNDIALS warning messages when already disabled
Mike Miller <mtmiller@octave.org>
parents:
26991
diff
changeset
|
2312 ### Check for SUNDIALS library features, some required, some optional. |
05f389459461
configure: avoid excessive SUNDIALS warning messages when already disabled
Mike Miller <mtmiller@octave.org>
parents:
26991
diff
changeset
|
2313 |
28299
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2314 if test -n "$SUNDIALS_IDA_LIBS" && test -n "$SUNDIALS_NVECSERIAL_LIBS"; then |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2315 |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2316 CPPFLAGS="$SUNDIALS_IDA_CPPFLAGS $SUNDIALS_NVECSERIAL_CPPFLAGS $KLU_CPPFLAGS $BLAS_CPPFLAGS $CPPFLAGS" |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2317 LDFLAGS="$SUNDIALS_IDA_LDFLAGS $SUNDIALS_NVECSERIAL_LDFLAGS $KLU_LDFLAGS $BLAS_LDFLAGS $LDFLAGS" |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2318 LIBS="$SUNDIALS_IDA_LIBS $SUNDIALS_NVECSERIAL_LIBS $KLU_LIBS $BLAS_LIBS $FLIBS $LIBS" |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2319 if test -z "$warn_sundials_nvecserial" && test -z "$warn_sundials_ida"; then |
31153
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2320 dnl Any of the following tests could determine that SUNDIALS is |
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2321 dnl incompatible and should be disabled. In that event, they all populate |
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2322 dnl the same variable with appropriate warning messages, and further tests |
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2323 dnl should be skipped if a warning message has already been generated that |
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2324 dnl SUNDIALS is disabled. |
28299
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2325 warn_sundials_disabled= |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2326 if test -z "$warn_sundials_disabled"; then |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2327 OCTAVE_CHECK_SUNDIALS_COMPATIBLE_API |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2328 fi |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2329 if test -z "$warn_sundials_disabled"; then |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2330 OCTAVE_CHECK_SUNDIALS_SIZEOF_REALTYPE |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2331 fi |
28939 | 2332 if test -z "$warn_sundials_disabled"; then |
2333 OCTAVE_CHECK_SUNDIALS_SUNLINSOL_DENSE | |
2334 fi | |
28299
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2335 dnl The following tests determine whether certain optional features are |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2336 dnl present in the SUNDIALS libraries, but will not disable using SUNDIALS. |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2337 if test -z "$warn_sundials_disabled"; then |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2338 OCTAVE_CHECK_SUNDIALS_SUNLINSOL_KLU |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2339 fi |
26992
05f389459461
configure: avoid excessive SUNDIALS warning messages when already disabled
Mike Miller <mtmiller@octave.org>
parents:
26991
diff
changeset
|
2340 fi |
28299
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2341 CPPFLAGS="$save_CPPFLAGS" |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2342 LDFLAGS="$save_LDFLAGS" |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2343 LIBS="$save_LIBS" |
26992
05f389459461
configure: avoid excessive SUNDIALS warning messages when already disabled
Mike Miller <mtmiller@octave.org>
parents:
26991
diff
changeset
|
2344 fi |
23021
6094018f5e72
refactor configure checks for Sundials (bug #50003)
John W. Eaton <jwe@octave.org>
parents:
23018
diff
changeset
|
2345 |
30580
fdc30b576333
eliminate code duplication in oct-conf-post.in.h and octave-config.h
John W. Eaton <jwe@octave.org>
parents:
30565
diff
changeset
|
2346 dnl Define this way instead of with an #if in oct-conf-post-private.h so that |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2347 dnl the build features script will get the correct value. |
26903
73b141d5a888
improve configure checks for sundials (bug #55911)
John W. Eaton <jwe@octave.org>
parents:
26894
diff
changeset
|
2348 dnl |
31153
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2349 dnl FIXME: The test on the sunlinsol_klu.h header is a bit of a kluge. |
26903
73b141d5a888
improve configure checks for sundials (bug #55911)
John W. Eaton <jwe@octave.org>
parents:
26894
diff
changeset
|
2350 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:
26894
diff
changeset
|
2351 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:
26894
diff
changeset
|
2352 dnl works when some things are missing (for example, KLU)? |
28299
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2353 if test -n "$SUNDIALS_IDA_LIBS" && test -n "$SUNDIALS_NVECSERIAL_LIBS"; then |
28939 | 2354 if test "x$octave_cv_sundials_sunlinsol_dense" = xyes \ |
2355 && test "x$octave_cv_sundials_realtype_is_double" = xyes \ | |
28299
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2356 && test "x$octave_have_sundials_compatible_api" = xyes; then |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2357 AC_DEFINE(HAVE_SUNDIALS, 1, [Define to 1 if SUNDIALS is available.]) |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2358 |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2359 ## Options needed to build with SUNDIALS and its dependencies. |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2360 SUNDIALS_XCPPFLAGS="$SUNDIALS_IDA_CPPFLAGS $SUNDIALS_SUNLINSOLKLU_CPPFLAGS $SUNDIALS_NVECSERIAL_CPPFLAGS $KLU_CPPFLAGS" |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2361 SUNDIALS_XLDFLAGS="$SUNDIALS_IDA_LDFLAGS $SUNDIALS_SUNLINSOLKLU_LDFLAGS $SUNDIALS_NVECSERIAL_LDFLAGS $KLU_LDFLAGS" |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2362 SUNDIALS_XLIBS="$SUNDIALS_IDA_LIBS $SUNDIALS_SUNLINSOLKLU_LIBS $SUNDIALS_NVECSERIAL_LIBS $KLU_LIBS" |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2363 else |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2364 SUNDIALS_IDA_CPPFLAGS= |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2365 SUNDIALS_IDA_LDFLAGS= |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2366 SUNDIALS_IDA_LIBS= |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2367 SUNDIALS_SUNLINSOLKLU_CPPFLAGS= |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2368 SUNDIALS_SUNLINSOLKLU_LDFLAGS= |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2369 SUNDIALS_SUNLINSOLKLU_LIBS= |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2370 SUNDIALS_NVECSERIAL_CPPFLAGS= |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2371 SUNDIALS_NVECSERIAL_LDFLAGS= |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2372 SUNDIALS_NVECSERIAL_LIBS= |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2373 SUNDIALS_XCPPFLAGS= |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2374 SUNDIALS_XLDFLAGS= |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2375 SUNDIALS_XLIBS= |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2376 dnl Emit a fallback warning message in case SUNDIALS has been disabled for |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2377 dnl some reason that hasn't already generated one of these known warnings. |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2378 if test -z "$warn_sundials_nvecserial" && test -z "$warn_sundials_ida" \ |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2379 && test -z "$warn_sundials_disabled"; then |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2380 warn_sundials_disabled="SUNDIALS libraries are missing some feature. The solvers ode15i and ode15s will be disabled." |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2381 OCTAVE_CONFIGURE_WARNING([warn_sundials_disabled]) |
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
28270
diff
changeset
|
2382 fi |
26992
05f389459461
configure: avoid excessive SUNDIALS warning messages when already disabled
Mike Miller <mtmiller@octave.org>
parents:
26991
diff
changeset
|
2383 fi |
23021
6094018f5e72
refactor configure checks for Sundials (bug #50003)
John W. Eaton <jwe@octave.org>
parents:
23018
diff
changeset
|
2384 fi |
6094018f5e72
refactor configure checks for Sundials (bug #50003)
John W. Eaton <jwe@octave.org>
parents:
23018
diff
changeset
|
2385 |
23389
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
2386 AC_SUBST(SUNDIALS_XCPPFLAGS) |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
2387 AC_SUBST(SUNDIALS_XLDFLAGS) |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
2388 AC_SUBST(SUNDIALS_XLIBS) |
f0eb5d4431b7
* configure.ac: Reorder definition of compiler flag collections.
John W. Eaton <jwe@octave.org>
parents:
23370
diff
changeset
|
2389 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
2390 ### Check for ARPACK library. |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
2391 |
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
|
2392 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
|
2393 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
|
2394 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
|
2395 [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
|
2396 [], |
834df9f10963
remove ARPACK files from sources and restore configure checks for external ARPACK library
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
2397 [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
|
2398 [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
|
2399 [warn_arpack= |
24289
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
2400 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
|
2401 [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
|
2402 [warn_arpack="ARPACK library found, but does not seem to work properly; disabling eigs function"]) |
28304
144d77f3f829
configure.ac: Fix compilation when --without-XXX used for all libraries (bug #58330).
Rik <rik@octave.org>
parents:
28300
diff
changeset
|
2403 if test -n "$ARPACK_LIBS"; then |
24289
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
2404 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
|
2405 [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
|
2406 fi |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
2407 ]) |
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
|
2408 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
|
2409 |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2410 ### Check for Java. |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2411 |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2412 build_java=yes |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2413 AC_ARG_ENABLE([java], |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2414 [AS_HELP_STRING([--disable-java], |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2415 [disable Java interface])], |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2416 [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
|
2417 build_java=no |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2418 fi], |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2419 []) |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2420 |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2421 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
|
2422 [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
|
2423 [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
|
2424 [JAVA_HOMEDIR="$withval"]) |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2425 |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2426 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
|
2427 [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
|
2428 [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
|
2429 [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
|
2430 |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2431 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
|
2432 [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
|
2433 [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
|
2434 [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
|
2435 |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2436 ## 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
|
2437 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
|
2438 ## 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
|
2439 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
|
2440 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
|
2441 fi |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2442 JAVA= |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2443 JAVAC= |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2444 JAR= |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2445 JAVA_LIBS= |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2446 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2447 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
|
2448 warn_java= |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2449 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
|
2450 do |
15780
f25101b1e37f
configure.ac: Use build_java as internal script variable rather than HAVE_JAVA.
Rik <rik@octave.org>
parents:
15779
diff
changeset
|
2451 ## 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
|
2452 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
|
2453 |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2454 ## 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
|
2455 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
|
2456 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
|
2457 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
|
2458 fi |
9f3656ada658
configure.ac: Add warning message if JAVA_HOME variable is not set.
Rik <rik@octave.org>
parents:
15756
diff
changeset
|
2459 |
15780
f25101b1e37f
configure.ac: Use build_java as internal script variable rather than HAVE_JAVA.
Rik <rik@octave.org>
parents:
15779
diff
changeset
|
2460 ## 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
|
2461 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
|
2462 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
|
2463 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
|
2464 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
|
2465 fi |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2466 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
|
2467 |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2468 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
|
2469 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
|
2470 break |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2471 fi |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2472 |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2473 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
|
2474 ## 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
|
2475 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
|
2476 ## 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
|
2477 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
|
2478 fi |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2479 |
18030
f0427ca399cc
configure.ac: Remove unused JAVA_HOME_NATIVE variable.
Rik <rik@octave.org>
parents:
18025
diff
changeset
|
2480 case $build_os in |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2481 mingw* | msdosmsvc) |
27641
ab13485346c2
configure.ac: Fix typos and grammar in comments (bug #57171)
Andrew Janke <andrew@apjanke.net>
parents:
27625
diff
changeset
|
2482 ## Under Win32 platform, we want JAVA_HOME to be in MSYS format; that is, |
15846
605488d19cb3
configure.ac: Avoid non-portable sh technique of double-quoted, backtick expressions.
Rik <rik@octave.org>
parents:
15839
diff
changeset
|
2483 ## 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
|
2484 ## Use quoted paths as Java may be installed in a path with whitespaces |
31153
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2485 ## (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
|
2486 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
|
2487 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
|
2488 fi |
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2489 ;; |
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2490 esac |
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2491 |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2492 ## 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
|
2493 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
|
2494 JAVA_PATH="$PATH" |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2495 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
|
2496 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
|
2497 fi |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2498 |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2499 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
|
2500 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
|
2501 |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2502 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
|
2503 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
|
2504 break |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2505 fi |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2506 |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2507 ## Check Java version is recent enough. |
31123
1d819b308578
build: cache Java, g++, and gcc compiler version numbers in configure (bug #62715)
Rik <rik@octave.org>
parents:
31122
diff
changeset
|
2508 AC_CACHE_CHECK([for Java version], |
1d819b308578
build: cache Java, g++, and gcc compiler version numbers in configure (bug #62715)
Rik <rik@octave.org>
parents:
31122
diff
changeset
|
2509 [octave_cv_java_version], |
1d819b308578
build: cache Java, g++, and gcc compiler version numbers in configure (bug #62715)
Rik <rik@octave.org>
parents:
31122
diff
changeset
|
2510 [octave_cv_java_version=[`"$JAVA" -version 2>&1 | $SED -n -e 's/^[^ ]* version[^0-9"]*"\([^"]*\)".*/\1/p'`] |
1d819b308578
build: cache Java, g++, and gcc compiler version numbers in configure (bug #62715)
Rik <rik@octave.org>
parents:
31122
diff
changeset
|
2511 ]) |
1d819b308578
build: cache Java, g++, and gcc compiler version numbers in configure (bug #62715)
Rik <rik@octave.org>
parents:
31122
diff
changeset
|
2512 |
1d819b308578
build: cache Java, g++, and gcc compiler version numbers in configure (bug #62715)
Rik <rik@octave.org>
parents:
31122
diff
changeset
|
2513 java_major=[`echo $octave_cv_java_version | $SED -e 's/^\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*$/\1/'`] |
1d819b308578
build: cache Java, g++, and gcc compiler version numbers in configure (bug #62715)
Rik <rik@octave.org>
parents:
31122
diff
changeset
|
2514 java_minor=[`echo $octave_cv_java_version | $SED -e 's/^\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*$/\2/'`] |
1d819b308578
build: cache Java, g++, and gcc compiler version numbers in configure (bug #62715)
Rik <rik@octave.org>
parents:
31122
diff
changeset
|
2515 |
24389
295664c0c922
configure.ac: Fix test for Java version (bug #52617).
Rik <rik@octave.org>
parents:
24374
diff
changeset
|
2516 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
|
2517 : # 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
|
2518 else |
17844
e88a8fa25125
configure.ac: add warnings on checking for JAVA to the final summary.
Carnë Draug <carandraug@octave.org>
parents:
17836
diff
changeset
|
2519 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
|
2520 break |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2521 fi |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2522 |
17819
af924e6572cb
build: Don't search path at compile time for jvm on Win32 platforms.
Rik <rik@octave.org>
parents:
17816
diff
changeset
|
2523 ## At this point Win32 systems have enough configuration data. |
31153
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2524 ## We assume that all appropriate variables (e.g., INCLUDE and LIB) already |
17819
af924e6572cb
build: Don't search path at compile time for jvm on Win32 platforms.
Rik <rik@octave.org>
parents:
17816
diff
changeset
|
2525 ## 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
|
2526 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2527 msdosmsvc) |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2528 build_java=yes |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2529 JAVA_LIBS=-ladvapi32 |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2530 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
|
2531 [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
|
2532 break |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2533 ;; |
17819
af924e6572cb
build: Don't search path at compile time for jvm on Win32 platforms.
Rik <rik@octave.org>
parents:
17816
diff
changeset
|
2534 mingw* | cygwin*) |
af924e6572cb
build: Don't search path at compile time for jvm on Win32 platforms.
Rik <rik@octave.org>
parents:
17816
diff
changeset
|
2535 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
|
2536 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
|
2537 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
|
2538 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
|
2539 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
|
2540 else |
18276
508f67c72854
Fix native MinGW builds with spaces in JAVA_HOME (bug #41024).
Rik <rik@octave.org>
parents:
18273
diff
changeset
|
2541 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
|
2542 fi |
15836
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2543 fi |
17819
af924e6572cb
build: Don't search path at compile time for jvm on Win32 platforms.
Rik <rik@octave.org>
parents:
17816
diff
changeset
|
2544 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
|
2545 [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
|
2546 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
|
2547 ;; |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2548 esac |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2549 |
20713
2469d78a1d8b
Consistently use 'filename' rather than 'file name' throughout code base.
Rik <rik@octave.org>
parents:
20712
diff
changeset
|
2550 ## 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
|
2551 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2552 darwin*) |
15777
b8bcb2c7f3e8
configure.ac: Search for jvm.dll on MingW/Cygwin platforms for Java.
Rik <rik@octave.org>
parents:
15769
diff
changeset
|
2553 jvmlib=libjvm.dylib |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2554 ;; |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2555 *) |
15777
b8bcb2c7f3e8
configure.ac: Search for jvm.dll on MingW/Cygwin platforms for Java.
Rik <rik@octave.org>
parents:
15769
diff
changeset
|
2556 jvmlib=libjvm.so |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2557 ;; |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2558 esac |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2559 |
15777
b8bcb2c7f3e8
configure.ac: Search for jvm.dll on MingW/Cygwin platforms for Java.
Rik <rik@octave.org>
parents:
15769
diff
changeset
|
2560 AC_MSG_CHECKING([for $jvmlib]) |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2561 |
31125
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2562 AC_CACHE_VAL([octave_cv_java_ldpath],[ |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2563 if test -z "$JAVA_LDPATH"; then |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2564 ## Run Java to try and determine library path to libjvm.so. |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2565 JAVA_TMP_LDPATH=`$JAVA -classpath ${srcdir}/build-aux OctJavaQry JAVA_LDPATH` |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2566 JAVA_TMP_LDPATH=`echo $JAVA_TMP_LDPATH | $SED -e "s/${PATH_SEPARATOR}/ /g"` |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2567 for dir in $JAVA_TMP_LDPATH; do |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2568 if test -f "$dir/$jvmlib"; then |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2569 JAVA_LDPATH=$dir |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2570 break |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2571 fi |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2572 done |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2573 fi |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2574 |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2575 if test -z "$JAVA_LDPATH"; then |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2576 ## Nothing found. Try Java again using bootpath argument. |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2577 JAVA_TMP_LDPATH=`$JAVA -classpath ${srcdir}/build-aux OctJavaQry JAVA_BOOTPATH` |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2578 JAVA_TMP_LDPATH="${JAVA_TMP_LDPATH} ${JAVA_TMP_LDPATH}/client ${JAVA_TMP_LDPATH}/server" |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2579 for dir in $JAVA_TMP_LDPATH; do |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2580 if test -f "$dir/$jvmlib"; then |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2581 JAVA_LDPATH=$dir |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2582 break |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2583 fi |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2584 done |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2585 fi |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2586 |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2587 if test -z "$JAVA_LDPATH"; then |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2588 ## Java failed to find its own library path. Guess wildly. |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2589 JAVA_TMP_LDPATH=`ls -d $JAVA_HOME/jre/lib/*/client` |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2590 JAVA_TMP_LDPATH="${JAVA_TMP_LDPATH} `ls -d $JAVA_HOME/jre/lib/*/server`" |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2591 ## Add some paths that might work on Macs. |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2592 JAVA_TMP_LDPATH="${JAVA_TMP_LDPATH} ${JAVA_HOME}/../Libraries ${JAVA_HOME}/Libraries" |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2593 ## Add some paths that might work on MinGW |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2594 JAVA_TMP_LDPATH="${JAVA_TMP_LDPATH} ${JAVA_HOME}/bin/client ${JAVA_HOME}/bin/server" |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2595 for dir in $JAVA_TMP_LDPATH; do |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2596 if test -f "$dir/$jvmlib"; then |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2597 JAVA_LDPATH=$dir |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2598 break |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2599 fi |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2600 done |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2601 fi |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2602 |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2603 ## Verify value passed in option --with-java-libdir |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2604 if test -n "$JAVA_LDPATH"; then |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2605 if test -f "${JAVA_LDPATH}/$jvmlib"; then |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2606 : # libjvm found |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2607 else |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2608 JAVA_LDPATH="" |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2609 fi |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
2610 fi |
31125
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2611 |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2612 octave_cv_java_ldpath=$JAVA_LDPATH |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2613 ]) |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2614 JAVA_LDPATH=$octave_cv_java_ldpath |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2615 if test -z "$JAVA_LDPATH"; then |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2616 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
|
2617 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
|
2618 break |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2619 else |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2620 AC_MSG_RESULT([$JAVA_LDPATH]) |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2621 fi |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2622 |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2623 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
|
2624 |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2625 ## 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
|
2626 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2627 darwin*) |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2628 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
|
2629 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
|
2630 else |
24592
6c3b7ca0cb90
Fix Java >1.8 on macOS (Bug #9439)
Sebastian Schöps <sesc@gmx.de>
parents:
24556
diff
changeset
|
2631 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
|
2632 fi |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2633 ;; |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2634 *) |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2635 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
|
2636 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
|
2637 else |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2638 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
|
2639 fi |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2640 ;; |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2641 esac |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2642 |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2643 ## Verify jni.h include file exists. |
31125
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2644 AC_CACHE_VAL([octave_cv_java_have_jni],[ |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2645 JNI_PATH=`echo $JAVA_CPPFLAGS | $SED -e 's/-I//g'` |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2646 octave_cv_java_have_jni=no |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2647 for dir in $JNI_PATH; do |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2648 if test -f "${dir}/jni.h"; then |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2649 octave_cv_java_have_jni=yes |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2650 octave_cv_java_jni_h_path=$dir |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2651 break |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2652 fi |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2653 done |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2654 ]) |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2655 if test $octave_cv_java_have_jni = yes; then |
c4f52c6c5944
build: cache JAVA_LDPATH and Java "jni.h" path (bug #62715)
Rik <rik@octave.org>
parents:
31123
diff
changeset
|
2656 AC_MSG_RESULT([$octave_cv_java_jni_h_path]) |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2657 else |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2658 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
|
2659 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
|
2660 break |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2661 fi |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2662 |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2663 ## 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
|
2664 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
|
2665 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
|
2666 [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
|
2667 break |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2668 done |
17844
e88a8fa25125
configure.ac: add warnings on checking for JAVA to the final summary.
Carnë Draug <carandraug@octave.org>
parents:
17836
diff
changeset
|
2669 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
|
2670 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
|
2671 fi |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2672 |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2673 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
|
2674 AC_SUBST(JAVA) |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2675 AC_SUBST(JAVAC) |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2676 AC_SUBST(JAR) |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2677 AC_SUBST(JAVA_CPPFLAGS) |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2678 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
|
2679 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
|
2680 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
|
2681 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2682 ### 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
|
2683 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2684 ENABLE_DOCS=yes |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2685 AC_ARG_ENABLE([docs], |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2686 [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
|
2687 [if test "$enableval" = no; then |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2688 ENABLE_DOCS=no |
24623
f39ae754a7d8
configure: test that makeinfo supports the @sortas command
Mike Miller <mtmiller@octave.org>
parents:
24592
diff
changeset
|
2689 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
|
2690 OCTAVE_CONFIGURE_WARNING([warn_docs]) |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2691 fi], []) |
28356
4e4baa5ac03c
configure.ac: Don't check for gl2ps if opengl_graphics are not used.
Rik <rik@octave.org>
parents:
28338
diff
changeset
|
2692 |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2693 if test $ENABLE_DOCS = yes; then |
31751
e863066429f1
assume QOffscreenSurface is available
John W. Eaton <jwe@octave.org>
parents:
31750
diff
changeset
|
2694 if test $opengl_graphics = no; then |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2695 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
|
2696 ENABLE_DOCS=no |
24623
f39ae754a7d8
configure: test that makeinfo supports the @sortas command
Mike Miller <mtmiller@octave.org>
parents:
24592
diff
changeset
|
2697 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
|
2698 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
|
2699 fi |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2700 fi |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2701 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
|
2702 ENABLE_DOCS=no |
24623
f39ae754a7d8
configure: test that makeinfo supports the @sortas command
Mike Miller <mtmiller@octave.org>
parents:
24592
diff
changeset
|
2703 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
|
2704 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
|
2705 fi |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2706 fi |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2707 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
|
2708 AC_DEFINE(ENABLE_DOCS, 1, |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2709 [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
|
2710 fi |
28356
4e4baa5ac03c
configure.ac: Don't check for gl2ps if opengl_graphics are not used.
Rik <rik@octave.org>
parents:
28338
diff
changeset
|
2711 |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2712 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
|
2713 |
24945
ba9d37893822
build: Don't built special Qt Help files when --without-qt used (bug #53394)
Rik <rik@octave.org>
parents:
24935
diff
changeset
|
2714 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
|
2715 [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
|
2716 |
29554
99e3912441ec
build: Make relocation of dependencies with Octave optional (bug #60413).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29408
diff
changeset
|
2717 OCTAVE_RELOCATE_ALL=no |
99e3912441ec
build: Make relocation of dependencies with Octave optional (bug #60413).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29408
diff
changeset
|
2718 AC_ARG_ENABLE([relocate-all], |
99e3912441ec
build: Make relocation of dependencies with Octave optional (bug #60413).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29408
diff
changeset
|
2719 [AS_HELP_STRING([--enable-relocate-all], |
99e3912441ec
build: Make relocation of dependencies with Octave optional (bug #60413).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29408
diff
changeset
|
2720 [assume that all dependencies that are installed under the same prefix are relocated when Octave is relocated])], |
99e3912441ec
build: Make relocation of dependencies with Octave optional (bug #60413).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29408
diff
changeset
|
2721 [if test "$enableval" = yes; then OCTAVE_RELOCATE_ALL=yes; fi], []) |
99e3912441ec
build: Make relocation of dependencies with Octave optional (bug #60413).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29408
diff
changeset
|
2722 AC_SUBST(OCTAVE_RELOCATE_ALL) |
99e3912441ec
build: Make relocation of dependencies with Octave optional (bug #60413).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29408
diff
changeset
|
2723 if test $OCTAVE_RELOCATE_ALL = yes; then |
99e3912441ec
build: Make relocation of dependencies with Octave optional (bug #60413).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29408
diff
changeset
|
2724 AC_DEFINE(OCTAVE_REPLACE_PREFIX, 1, [Replace prefix in mkoctfile flags.]) |
99e3912441ec
build: Make relocation of dependencies with Octave optional (bug #60413).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29408
diff
changeset
|
2725 fi |
30368
15ae4d97a632
mkoctfile: Correctly handle relocation in cross-compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents:
30347
diff
changeset
|
2726 AM_CONDITIONAL([AMCOND_RELOCATE_ALL], [test $OCTAVE_RELOCATE_ALL = yes]) |
29554
99e3912441ec
build: Make relocation of dependencies with Octave optional (bug #60413).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29408
diff
changeset
|
2727 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2728 ### 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
|
2729 |
24926
ff80c319e664
maint: Merge GSOC Specfun code into core
Rik <rik@octave.org>
parents:
24900
diff
changeset
|
2730 ENABLE_HG_ID=yes |
ff80c319e664
maint: Merge GSOC Specfun code into core
Rik <rik@octave.org>
parents:
24900
diff
changeset
|
2731 AC_ARG_ENABLE([hg-id], |
ff80c319e664
maint: Merge GSOC Specfun code into core
Rik <rik@octave.org>
parents:
24900
diff
changeset
|
2732 [AS_HELP_STRING([--disable-hg-id], |
ff80c319e664
maint: Merge GSOC Specfun code into core
Rik <rik@octave.org>
parents:
24900
diff
changeset
|
2733 [disable embedding of hg id in libraries])], |
ff80c319e664
maint: Merge GSOC Specfun code into core
Rik <rik@octave.org>
parents:
24900
diff
changeset
|
2734 [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
|
2735 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
|
2736 |
ff80c319e664
maint: Merge GSOC Specfun code into core
Rik <rik@octave.org>
parents:
24900
diff
changeset
|
2737 ### Determine whether to install build logs with Octave. |
ff80c319e664
maint: Merge GSOC Specfun code into core
Rik <rik@octave.org>
parents:
24900
diff
changeset
|
2738 |
ff80c319e664
maint: Merge GSOC Specfun code into core
Rik <rik@octave.org>
parents:
24900
diff
changeset
|
2739 install_build_logs=no |
ff80c319e664
maint: Merge GSOC Specfun code into core
Rik <rik@octave.org>
parents:
24900
diff
changeset
|
2740 AC_ARG_ENABLE([install-build-logs], |
ff80c319e664
maint: Merge GSOC Specfun code into core
Rik <rik@octave.org>
parents:
24900
diff
changeset
|
2741 [AS_HELP_STRING([--enable-install-build-logs], |
31153
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2742 [install build logs (i.e., config.log) with Octave])], |
24926
ff80c319e664
maint: Merge GSOC Specfun code into core
Rik <rik@octave.org>
parents:
24900
diff
changeset
|
2743 [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
|
2744 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
|
2745 |
31153
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2746 ### Determine whether libraries should be linked with visibility attributes. |
29313
6dea3b384846
Optionally disable building libraries with visibility attributes (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29268
diff
changeset
|
2747 |
6dea3b384846
Optionally disable building libraries with visibility attributes (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29268
diff
changeset
|
2748 ENABLE_LIB_VISIBILITY_FLAGS=yes |
6dea3b384846
Optionally disable building libraries with visibility attributes (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29268
diff
changeset
|
2749 AC_ARG_ENABLE(lib-visibility-flags, |
6dea3b384846
Optionally disable building libraries with visibility attributes (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29268
diff
changeset
|
2750 [AS_HELP_STRING([--disable-lib-visibility-flags], |
6dea3b384846
Optionally disable building libraries with visibility attributes (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29268
diff
changeset
|
2751 [don't build libraries with visibility flags (export all symbols)])], |
6dea3b384846
Optionally disable building libraries with visibility attributes (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29268
diff
changeset
|
2752 [case $enableval in |
6dea3b384846
Optionally disable building libraries with visibility attributes (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29268
diff
changeset
|
2753 yes) ENABLE_LIB_VISIBILITY_FLAGS=yes ;; |
6dea3b384846
Optionally disable building libraries with visibility attributes (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29268
diff
changeset
|
2754 no) ENABLE_LIB_VISIBILITY_FLAGS=no ;; |
6dea3b384846
Optionally disable building libraries with visibility attributes (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29268
diff
changeset
|
2755 *) AC_MSG_ERROR([bad value $enableval for --enable-lib-visibility-flags]) ;; |
6dea3b384846
Optionally disable building libraries with visibility attributes (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29268
diff
changeset
|
2756 esac]) |
6dea3b384846
Optionally disable building libraries with visibility attributes (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29268
diff
changeset
|
2757 |
30505
e0e22183ffca
Restore building with visibility flags for Windows.
Markus Mützel <markus.muetzel@gmx.de>
parents:
30488
diff
changeset
|
2758 case $host_os in |
e0e22183ffca
Restore building with visibility flags for Windows.
Markus Mützel <markus.muetzel@gmx.de>
parents:
30488
diff
changeset
|
2759 msdosmsvc | mingw* | cygwin*) |
e0e22183ffca
Restore building with visibility flags for Windows.
Markus Mützel <markus.muetzel@gmx.de>
parents:
30488
diff
changeset
|
2760 # Assume that symbol export is working on that platform |
e0e22183ffca
Restore building with visibility flags for Windows.
Markus Mützel <markus.muetzel@gmx.de>
parents:
30488
diff
changeset
|
2761 ;; |
e0e22183ffca
Restore building with visibility flags for Windows.
Markus Mützel <markus.muetzel@gmx.de>
parents:
30488
diff
changeset
|
2762 *) |
e0e22183ffca
Restore building with visibility flags for Windows.
Markus Mützel <markus.muetzel@gmx.de>
parents:
30488
diff
changeset
|
2763 if test $ENABLE_LIB_VISIBILITY_FLAGS = yes && test $HAVE_VISIBILITY = 0; then |
e0e22183ffca
Restore building with visibility flags for Windows.
Markus Mützel <markus.muetzel@gmx.de>
parents:
30488
diff
changeset
|
2764 AC_MSG_NOTICE([cannot build with visibility flags on this platform]) |
e0e22183ffca
Restore building with visibility flags for Windows.
Markus Mützel <markus.muetzel@gmx.de>
parents:
30488
diff
changeset
|
2765 ENABLE_LIB_VISIBILITY_FLAGS=no |
e0e22183ffca
Restore building with visibility flags for Windows.
Markus Mützel <markus.muetzel@gmx.de>
parents:
30488
diff
changeset
|
2766 fi |
e0e22183ffca
Restore building with visibility flags for Windows.
Markus Mützel <markus.muetzel@gmx.de>
parents:
30488
diff
changeset
|
2767 ;; |
e0e22183ffca
Restore building with visibility flags for Windows.
Markus Mützel <markus.muetzel@gmx.de>
parents:
30488
diff
changeset
|
2768 esac |
29647
bdb0cfffa2d0
Define variables for API visibility flags on all platforms (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29638
diff
changeset
|
2769 |
29313
6dea3b384846
Optionally disable building libraries with visibility attributes (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29268
diff
changeset
|
2770 if test $ENABLE_LIB_VISIBILITY_FLAGS = yes; then |
6dea3b384846
Optionally disable building libraries with visibility attributes (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29268
diff
changeset
|
2771 AC_DEFINE(OCTAVE_ENABLE_LIB_VISIBILITY_FLAGS, 1, |
6dea3b384846
Optionally disable building libraries with visibility attributes (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29268
diff
changeset
|
2772 [Define to 1 if building libraries with visibility flags]) |
6dea3b384846
Optionally disable building libraries with visibility attributes (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29268
diff
changeset
|
2773 else |
6dea3b384846
Optionally disable building libraries with visibility attributes (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29268
diff
changeset
|
2774 case $host_os in |
6dea3b384846
Optionally disable building libraries with visibility attributes (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29268
diff
changeset
|
2775 msdosmsvc | mingw* | cygwin*) |
6dea3b384846
Optionally disable building libraries with visibility attributes (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29268
diff
changeset
|
2776 LDFLAGS="$LDFLAGS -Wl,--export-all-symbols" |
6dea3b384846
Optionally disable building libraries with visibility attributes (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29268
diff
changeset
|
2777 ;; |
6dea3b384846
Optionally disable building libraries with visibility attributes (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29268
diff
changeset
|
2778 esac |
6dea3b384846
Optionally disable building libraries with visibility attributes (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29268
diff
changeset
|
2779 fi |
6dea3b384846
Optionally disable building libraries with visibility attributes (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29268
diff
changeset
|
2780 |
6dea3b384846
Optionally disable building libraries with visibility attributes (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29268
diff
changeset
|
2781 AM_CONDITIONAL([AMCOND_LIB_VISIBILITY_FLAGS], |
6dea3b384846
Optionally disable building libraries with visibility attributes (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29268
diff
changeset
|
2782 [test $ENABLE_LIB_VISIBILITY_FLAGS = yes]) |
6dea3b384846
Optionally disable building libraries with visibility attributes (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29268
diff
changeset
|
2783 |
31153
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2784 ### Set flags for symbol visibility. |
29647
bdb0cfffa2d0
Define variables for API visibility flags on all platforms (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29638
diff
changeset
|
2785 |
bdb0cfffa2d0
Define variables for API visibility flags on all platforms (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29638
diff
changeset
|
2786 if test $ENABLE_LIB_VISIBILITY_FLAGS = yes; then |
bdb0cfffa2d0
Define variables for API visibility flags on all platforms (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29638
diff
changeset
|
2787 EXTERNAL_DLL_DEFS="-DEXTERNAL_DLL" |
bdb0cfffa2d0
Define variables for API visibility flags on all platforms (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29638
diff
changeset
|
2788 OCTAVE_DLL_DEFS="-DOCTAVE_DLL" |
bdb0cfffa2d0
Define variables for API visibility flags on all platforms (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29638
diff
changeset
|
2789 OCTINTERP_DLL_DEFS="-DOCTINTERP_DLL" |
bdb0cfffa2d0
Define variables for API visibility flags on all platforms (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29638
diff
changeset
|
2790 OCTGUI_DLL_DEFS="-DOCTGUI_DLL" |
bdb0cfffa2d0
Define variables for API visibility flags on all platforms (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29638
diff
changeset
|
2791 OCTGRAPHICS_DLL_DEFS="-DOCTGRAPHICS_DLL" |
bdb0cfffa2d0
Define variables for API visibility flags on all platforms (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29638
diff
changeset
|
2792 else |
bdb0cfffa2d0
Define variables for API visibility flags on all platforms (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29638
diff
changeset
|
2793 EXTERNAL_DLL_DEFS= |
bdb0cfffa2d0
Define variables for API visibility flags on all platforms (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29638
diff
changeset
|
2794 OCTAVE_DLL_DEFS= |
bdb0cfffa2d0
Define variables for API visibility flags on all platforms (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29638
diff
changeset
|
2795 OCTINTERP_DLL_DEFS= |
bdb0cfffa2d0
Define variables for API visibility flags on all platforms (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29638
diff
changeset
|
2796 OCTGUI_DLL_DEFS= |
bdb0cfffa2d0
Define variables for API visibility flags on all platforms (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29638
diff
changeset
|
2797 OCTGRAPHICS_DLL_DEFS= |
bdb0cfffa2d0
Define variables for API visibility flags on all platforms (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29638
diff
changeset
|
2798 fi |
bdb0cfffa2d0
Define variables for API visibility flags on all platforms (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29638
diff
changeset
|
2799 AC_MSG_NOTICE([defining EXTERNAL_DLL_DEFS to be $EXTERNAL_DLL_DEFS]) |
bdb0cfffa2d0
Define variables for API visibility flags on all platforms (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29638
diff
changeset
|
2800 AC_MSG_NOTICE([defining OCTAVE_DLL_DEFS to be $OCTAVE_DLL_DEFS]) |
bdb0cfffa2d0
Define variables for API visibility flags on all platforms (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29638
diff
changeset
|
2801 AC_MSG_NOTICE([defining OCTINTERP_DLL_DEFS to be $OCTINTERP_DLL_DEFS]) |
bdb0cfffa2d0
Define variables for API visibility flags on all platforms (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29638
diff
changeset
|
2802 AC_MSG_NOTICE([defining OCTGUI_DLL_DEFS to be $OCTGUI_DLL_DEFS]) |
bdb0cfffa2d0
Define variables for API visibility flags on all platforms (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29638
diff
changeset
|
2803 AC_MSG_NOTICE([defining OCTGRAPHICS_DLL_DEFS to be $OCTGRAPHICS_DLL_DEFS]) |
bdb0cfffa2d0
Define variables for API visibility flags on all platforms (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29638
diff
changeset
|
2804 |
bdb0cfffa2d0
Define variables for API visibility flags on all platforms (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29638
diff
changeset
|
2805 AC_SUBST(EXTERNAL_DLL_DEFS) |
bdb0cfffa2d0
Define variables for API visibility flags on all platforms (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29638
diff
changeset
|
2806 AC_SUBST(OCTAVE_DLL_DEFS) |
bdb0cfffa2d0
Define variables for API visibility flags on all platforms (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29638
diff
changeset
|
2807 AC_SUBST(OCTINTERP_DLL_DEFS) |
bdb0cfffa2d0
Define variables for API visibility flags on all platforms (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29638
diff
changeset
|
2808 AC_SUBST(OCTGUI_DLL_DEFS) |
bdb0cfffa2d0
Define variables for API visibility flags on all platforms (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29638
diff
changeset
|
2809 AC_SUBST(OCTGRAPHICS_DLL_DEFS) |
bdb0cfffa2d0
Define variables for API visibility flags on all platforms (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29638
diff
changeset
|
2810 |
24926
ff80c319e664
maint: Merge GSOC Specfun code into core
Rik <rik@octave.org>
parents:
24900
diff
changeset
|
2811 ### 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
|
2812 |
ff80c319e664
maint: Merge GSOC Specfun code into core
Rik <rik@octave.org>
parents:
24900
diff
changeset
|
2813 ## Add warning flags |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2814 |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2815 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
|
2816 case "$GCC_VERSION" in |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2817 *4*) ;; |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2818 *) GCC_WSHADOW_OPTION=-Wshadow ;; |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2819 esac |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2820 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2821 GCC_EXTRA_FLAGS="-Wall -W $GCC_WSHADOW_OPTION -Wformat -Wpointer-arith -Wmissing-prototypes -Wstrict-prototypes -Wwrite-strings -Wcast-align -Wcast-qual" |
26925
7fdbb03d5f76
include -Woverloaded-virtual in GXX_EXTRA_FLAGS (bug #55741)
John W. Eaton <jwe@octave.org>
parents:
26910
diff
changeset
|
2822 GXX_EXTRA_FLAGS="-Wall -W $GCC_WSHADOW_OPTION -Woverloaded-virtual -Wold-style-cast -Wformat -Wpointer-arith -Wwrite-strings -Wcast-align -Wcast-qual" |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2823 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2824 try_extra_warning_flags=yes |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2825 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
|
2826 [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
|
2827 [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
|
2828 [if test "$enableval" = no; then |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2829 try_extra_warning_flags=no |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2830 fi], |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2831 []) |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2832 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2833 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
|
2834 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
|
2835 OCTAVE_CC_FLAG([$flag], [ |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2836 WARN_CFLAGS="$WARN_CFLAGS $flag"; |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2837 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
|
2838 done |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2839 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
|
2840 OCTAVE_CXX_FLAG([$flag], [ |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2841 WARN_CXXFLAGS="$WARN_CXXFLAGS $flag"; |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2842 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
|
2843 done |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2844 fi |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2845 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2846 ## Add strict warning flags |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2847 GCC_STRICT_FLAGS="-Wconversion" |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2848 GXX_STRICT_FLAGS="-Wconversion -Weffc++" |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2849 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2850 try_strict_warning_flags=no |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2851 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
|
2852 [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
|
2853 [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
|
2854 [if test "$enableval" = yes; then |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2855 try_strict_warning_flags=yes |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2856 fi], |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2857 []) |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2858 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2859 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
|
2860 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
|
2861 OCTAVE_CC_FLAG([$flag], [ |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2862 WARN_CFLAGS="$WARN_CFLAGS $flag"; |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2863 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
|
2864 done |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2865 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
|
2866 OCTAVE_CXX_FLAG([$flag], [ |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2867 WARN_CXXFLAGS="$WARN_CXXFLAGS $flag"; |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2868 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
|
2869 done |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2870 fi |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2871 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2872 ## Add sanitizer flags |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2873 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
|
2874 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
|
2875 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
|
2876 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2877 try_address_sanitizer_flags=no |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2878 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
|
2879 [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
|
2880 [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
|
2881 [if test "$enableval" = yes; then |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2882 try_address_sanitizer_flags=yes |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2883 fi], |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2884 []) |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2885 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2886 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
|
2887 ADDRESS_SANITIZER_OPTIONS="symbolize=1" |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2888 AC_SUBST(ADDRESS_SANITIZER_OPTIONS) |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2889 fi |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2890 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2891 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
|
2892 [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
|
2893 |
30277
f816a8c44924
allow build to succeed when address sanitizer is enabled (bug #61415)
John W. Eaton <jwe@octave.org>
parents:
30273
diff
changeset
|
2894 ADDRESS_SANITIZER_ENABLED=no |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2895 if test $try_address_sanitizer_flags = yes; then |
30277
f816a8c44924
allow build to succeed when address sanitizer is enabled (bug #61415)
John W. Eaton <jwe@octave.org>
parents:
30273
diff
changeset
|
2896 ADDRESS_SANITIZER_ENABLED=yes |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2897 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
|
2898 OCTAVE_CC_FLAG([$flag], [ |
31806
3641b742d8aa
configure.ac: Add sanitizer compilation flags to XTRA_XXXFLAGS rather than WARN_XXXFLAGS (bug #63712).
Rik <rik@octave.org>
parents:
31769
diff
changeset
|
2899 XTRA_CFLAGS="$XTRA_CFLAGS $flag"; |
3641b742d8aa
configure.ac: Add sanitizer compilation flags to XTRA_XXXFLAGS rather than WARN_XXXFLAGS (bug #63712).
Rik <rik@octave.org>
parents:
31769
diff
changeset
|
2900 AC_MSG_RESULT([adding $flag to XTRA_CFLAGS])]) |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2901 done |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2902 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
|
2903 OCTAVE_CXX_FLAG([$flag], [ |
31806
3641b742d8aa
configure.ac: Add sanitizer compilation flags to XTRA_XXXFLAGS rather than WARN_XXXFLAGS (bug #63712).
Rik <rik@octave.org>
parents:
31769
diff
changeset
|
2904 XTRA_CXXFLAGS="$XTRA_CXXFLAGS $flag"; |
3641b742d8aa
configure.ac: Add sanitizer compilation flags to XTRA_XXXFLAGS rather than WARN_XXXFLAGS (bug #63712).
Rik <rik@octave.org>
parents:
31769
diff
changeset
|
2905 AC_MSG_RESULT([adding $flag to XTRA_CXXFLAGS])]) |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2906 done |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2907 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
|
2908 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
|
2909 OCTAVE_CC_FLAG([$flag], [ |
31806
3641b742d8aa
configure.ac: Add sanitizer compilation flags to XTRA_XXXFLAGS rather than WARN_XXXFLAGS (bug #63712).
Rik <rik@octave.org>
parents:
31769
diff
changeset
|
2910 XTRA_LDFLAGS="$XTRA_LDFLAGS $flag"; |
3641b742d8aa
configure.ac: Add sanitizer compilation flags to XTRA_XXXFLAGS rather than WARN_XXXFLAGS (bug #63712).
Rik <rik@octave.org>
parents:
31769
diff
changeset
|
2911 AC_MSG_RESULT([adding $flag to XTRA_LDFLAGS])]) |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2912 done |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2913 fi |
30277
f816a8c44924
allow build to succeed when address sanitizer is enabled (bug #61415)
John W. Eaton <jwe@octave.org>
parents:
30273
diff
changeset
|
2914 AC_SUBST(ADDRESS_SANITIZER_ENABLED) |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2915 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2916 AC_SUBST(WARN_CFLAGS) |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2917 AC_SUBST(WARN_CXXFLAGS) |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2918 AC_SUBST(WARN_LDFLAGS) |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2919 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2920 ### 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
|
2921 |
29662
5ad070a5f19a
build: Don't use deprecated AC_TRY_COMPILE.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29647
diff
changeset
|
2922 AC_LANG_PUSH(C++) |
30531
492a37a18b81
Guard usage of non-standard pragmas.
Markus Mützel <markus.muetzel@gmx.de>
parents:
30512
diff
changeset
|
2923 AC_CACHE_CHECK([for @%:@pragma GCC diagnostic push/pop/ignored], |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2924 [octave_cv_gcc_has_pragma_GCC_diagnostic], |
29662
5ad070a5f19a
build: Don't use deprecated AC_TRY_COMPILE.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29647
diff
changeset
|
2925 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2926 #pragma GCC diagnostic push |
30531
492a37a18b81
Guard usage of non-standard pragmas.
Markus Mützel <markus.muetzel@gmx.de>
parents:
30512
diff
changeset
|
2927 #pragma GCC diagnostic ignored "-Wold-style-cast" |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2928 int three = (int) 3.1415926; |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2929 #pragma GCC diagnostic pop |
29662
5ad070a5f19a
build: Don't use deprecated AC_TRY_COMPILE.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29647
diff
changeset
|
2930 ]])], |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2931 [octave_cv_gcc_has_pragma_GCC_diagnostic=yes], |
29662
5ad070a5f19a
build: Don't use deprecated AC_TRY_COMPILE.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29647
diff
changeset
|
2932 [octave_cv_gcc_has_pragma_GCC_diagnostic=no])], |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2933 ]) |
29662
5ad070a5f19a
build: Don't use deprecated AC_TRY_COMPILE.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29647
diff
changeset
|
2934 AC_LANG_POP(C++) |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2935 |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2936 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
|
2937 AC_DEFINE(HAVE_PRAGMA_GCC_DIAGNOSTIC, 1, |
30531
492a37a18b81
Guard usage of non-standard pragmas.
Markus Mützel <markus.muetzel@gmx.de>
parents:
30512
diff
changeset
|
2938 [Define to 1 if compiler supports @%:@pragma GCC diagnostic ...]) |
492a37a18b81
Guard usage of non-standard pragmas.
Markus Mützel <markus.muetzel@gmx.de>
parents:
30512
diff
changeset
|
2939 fi |
492a37a18b81
Guard usage of non-standard pragmas.
Markus Mützel <markus.muetzel@gmx.de>
parents:
30512
diff
changeset
|
2940 |
492a37a18b81
Guard usage of non-standard pragmas.
Markus Mützel <markus.muetzel@gmx.de>
parents:
30512
diff
changeset
|
2941 AC_CACHE_CHECK([for @%:@pragma GCC visibility push/pop], |
492a37a18b81
Guard usage of non-standard pragmas.
Markus Mützel <markus.muetzel@gmx.de>
parents:
30512
diff
changeset
|
2942 [octave_cv_gcc_has_pragma_GCC_visiblity], |
492a37a18b81
Guard usage of non-standard pragmas.
Markus Mützel <markus.muetzel@gmx.de>
parents:
30512
diff
changeset
|
2943 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ |
492a37a18b81
Guard usage of non-standard pragmas.
Markus Mützel <markus.muetzel@gmx.de>
parents:
30512
diff
changeset
|
2944 #pragma GCC visibility push(default) |
492a37a18b81
Guard usage of non-standard pragmas.
Markus Mützel <markus.muetzel@gmx.de>
parents:
30512
diff
changeset
|
2945 int three = 3; |
492a37a18b81
Guard usage of non-standard pragmas.
Markus Mützel <markus.muetzel@gmx.de>
parents:
30512
diff
changeset
|
2946 #pragma GCC visiblity pop(default) |
492a37a18b81
Guard usage of non-standard pragmas.
Markus Mützel <markus.muetzel@gmx.de>
parents:
30512
diff
changeset
|
2947 ]])], |
492a37a18b81
Guard usage of non-standard pragmas.
Markus Mützel <markus.muetzel@gmx.de>
parents:
30512
diff
changeset
|
2948 [octave_cv_gcc_has_pragma_GCC_visiblity=yes], |
492a37a18b81
Guard usage of non-standard pragmas.
Markus Mützel <markus.muetzel@gmx.de>
parents:
30512
diff
changeset
|
2949 [octave_cv_gcc_has_pragma_GCC_visiblity=no])], |
492a37a18b81
Guard usage of non-standard pragmas.
Markus Mützel <markus.muetzel@gmx.de>
parents:
30512
diff
changeset
|
2950 ]) |
492a37a18b81
Guard usage of non-standard pragmas.
Markus Mützel <markus.muetzel@gmx.de>
parents:
30512
diff
changeset
|
2951 |
492a37a18b81
Guard usage of non-standard pragmas.
Markus Mützel <markus.muetzel@gmx.de>
parents:
30512
diff
changeset
|
2952 if test $octave_cv_gcc_has_pragma_GCC_visiblity = yes; then |
492a37a18b81
Guard usage of non-standard pragmas.
Markus Mützel <markus.muetzel@gmx.de>
parents:
30512
diff
changeset
|
2953 AC_DEFINE(HAVE_PRAGMA_GCC_VISIBILITY, 1, |
492a37a18b81
Guard usage of non-standard pragmas.
Markus Mützel <markus.muetzel@gmx.de>
parents:
30512
diff
changeset
|
2954 [Define to 1 if compiler supports @%:@pragma GCC visiblity ...]) |
24387
268d31e7aa4f
build: Silence compile warning about unknown GCC warning "-Wimplicit-fallthrough".
Rik <rik@octave.org>
parents:
24375
diff
changeset
|
2955 fi |
268d31e7aa4f
build: Silence compile warning about unknown GCC warning "-Wimplicit-fallthrough".
Rik <rik@octave.org>
parents:
24375
diff
changeset
|
2956 |
268d31e7aa4f
build: Silence compile warning about unknown GCC warning "-Wimplicit-fallthrough".
Rik <rik@octave.org>
parents:
24375
diff
changeset
|
2957 ## 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
|
2958 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
|
2959 OCTAVE_CC_FLAG([-Wimplicit-fallthrough], |
268d31e7aa4f
build: Silence compile warning about unknown GCC warning "-Wimplicit-fallthrough".
Rik <rik@octave.org>
parents:
24375
diff
changeset
|
2960 [AC_DEFINE(HAVE_WARN_IMPLICIT_FALLTHROUGH, 1, |
30531
492a37a18b81
Guard usage of non-standard pragmas.
Markus Mützel <markus.muetzel@gmx.de>
parents:
30512
diff
changeset
|
2961 [Define to 1 if compiler supports -Wimplicit-fallthrough warning])]) |
23992
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2962 fi |
74fa9f184f92
configure: reorder and group related blocks of feature tests
Mike Miller <mtmiller@octave.org>
parents:
23990
diff
changeset
|
2963 |
31153
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2964 ### Recommendations from the gnulib bootstrap script. |
23661
21b2816820cf
update GNULIB_LINK_DEPS for recent changes
John W. Eaton <jwe@octave.org>
parents:
23657
diff
changeset
|
2965 |
27625
b2d30e873334
Link $INTL_MACOSX_LIBS in gnulib deps in configure.ac (bug #57049)
Andrew Janke <andrew@apjanke.net>
parents:
27543
diff
changeset
|
2966 GNULIB_LINK_DEPS="$FREXPF_LIBM $FREXP_LIBM $GETHOSTNAME_LIB $LIBSOCKET $LIB_CLOCK_GETTIME $LIB_CRYPTO $LIB_GETLOGIN $LIB_NANOSLEEP $LIB_SELECT $LTLIBICONV $LTLIBINTL $LTLIBTHREAD $INTL_MACOSX_LIBS" |
23993
49e37560e0fe
configure: rely on gnulib for detection of clock_gettime
Mike Miller <mtmiller@octave.org>
parents:
23992
diff
changeset
|
2967 |
31153
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2968 ## FIXME: This is a kluge to transform $libdir/libiconv.dll.a to -liconv. |
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2969 ## It would probably be better to fix gnulib to not give us an absolute |
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2970 ## file name... |
25581
9f422e49be15
transform libiconv.dll.a to -liconv for mkoctfile (bug #53920)
John W. Eaton <jwe@octave.org>
parents:
25559
diff
changeset
|
2971 |
9f422e49be15
transform libiconv.dll.a to -liconv for mkoctfile (bug #53920)
John W. Eaton <jwe@octave.org>
parents:
25559
diff
changeset
|
2972 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
|
2973 mingw*) |
9f422e49be15
transform libiconv.dll.a to -liconv for mkoctfile (bug #53920)
John W. Eaton <jwe@octave.org>
parents:
25559
diff
changeset
|
2974 ## 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
|
2975 ## ${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
|
2976 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
|
2977 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
|
2978 ;; |
9f422e49be15
transform libiconv.dll.a to -liconv for mkoctfile (bug #53920)
John W. Eaton <jwe@octave.org>
parents:
25559
diff
changeset
|
2979 *) |
9f422e49be15
transform libiconv.dll.a to -liconv for mkoctfile (bug #53920)
John W. Eaton <jwe@octave.org>
parents:
25559
diff
changeset
|
2980 MKOCTFILE_LIBICONV="$LIBICONV" |
9f422e49be15
transform libiconv.dll.a to -liconv for mkoctfile (bug #53920)
John W. Eaton <jwe@octave.org>
parents:
25559
diff
changeset
|
2981 ;; |
9f422e49be15
transform libiconv.dll.a to -liconv for mkoctfile (bug #53920)
John W. Eaton <jwe@octave.org>
parents:
25559
diff
changeset
|
2982 esac |
9f422e49be15
transform libiconv.dll.a to -liconv for mkoctfile (bug #53920)
John W. Eaton <jwe@octave.org>
parents:
25559
diff
changeset
|
2983 |
27625
b2d30e873334
Link $INTL_MACOSX_LIBS in gnulib deps in configure.ac (bug #57049)
Andrew Janke <andrew@apjanke.net>
parents:
27543
diff
changeset
|
2984 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 $INTL_MACOSX_LIBS" |
21412
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2985 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2986 AC_SUBST(GNULIB_LINK_DEPS) |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2987 |
31153
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2988 ### Set variables for link dependencies and options. |
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
2989 |
31415
00e2eafd1c0f
build: Use gnulib module to get readline libraries.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31407
diff
changeset
|
2990 BASE_LIBOCTAVE_LINK_DEPS="$CURL_LIBS $SPARSE_XLIBS $ARPACK_LIBS $QRUPDATE_LIBS $FFTW_XLIBS $LAPACK_LIBS $BLAS_LIBS $LTLIBREADLINE $LIBGLOB $PCRE_LIBS $DL_LIBS $PTHREAD_LIBS $FLIBS $LIBS" |
23757
bba752b37f8e
use different definition for mkoctfile link deps
John W. Eaton <jwe@octave.org>
parents:
23709
diff
changeset
|
2991 |
bba752b37f8e
use different definition for mkoctfile link deps
John W. Eaton <jwe@octave.org>
parents:
23709
diff
changeset
|
2992 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
|
2993 |
bba752b37f8e
use different definition for mkoctfile link deps
John W. Eaton <jwe@octave.org>
parents:
23709
diff
changeset
|
2994 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
|
2995 |
23005
8e9dd0d6e337
update check for pcre library to use pkg-config (bug #49993)
John W. Eaton <jwe@octave.org>
parents:
22995
diff
changeset
|
2996 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
|
2997 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2998 AC_SUBST(LIBOCTAVE_LINK_DEPS) |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
2999 AC_SUBST(LIBOCTAVE_LINK_OPTS) |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3000 |
29949
f254c302bb9c
remove JIT compiler from Octave sources
John W. Eaton <jwe@octave.org>
parents:
29868
diff
changeset
|
3001 LIBOCTINTERP_LINK_DEPS="$FT2_LIBS $HDF5_LIBS $MAGICK_LIBS $Z_LIBS $SPARSE_XLIBS $FFTW_XLIBS $OPENGL_LIBS $FONTCONFIG_LIBS $FREETYPE_LIBS $X11_LIBS $CARBON_LIBS $GL2PS_LIBS $JAVA_LIBS $LAPACK_LIBS" |
f254c302bb9c
remove JIT compiler from Octave sources
John W. Eaton <jwe@octave.org>
parents:
29868
diff
changeset
|
3002 |
f254c302bb9c
remove JIT compiler from Octave sources
John W. Eaton <jwe@octave.org>
parents:
29868
diff
changeset
|
3003 LIBOCTINTERP_LINK_OPTS="$FT2_LDFLAGS $HDF5_LDFLAGS $MAGICK_LDFLAGS $Z_LDFLAGS $SPARSE_XLDFLAGS $FFTW_XLDFLAGS" |
21412
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3004 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3005 OCTAVE_LINK_DEPS="" |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3006 OCTAVE_LINK_OPTS="" |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3007 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3008 OCT_LINK_DEPS="" |
25959
14e844f1459a
fix linking of __init_qt__.la on Windows systems (bug #54881)
John W. Eaton <jwe@octave.org>
parents:
25931
diff
changeset
|
3009 OCT_GUI_LINK_DEPS="" |
14e844f1459a
fix linking of __init_qt__.la on Windows systems (bug #54881)
John W. Eaton <jwe@octave.org>
parents:
25931
diff
changeset
|
3010 |
21412
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3011 OCT_LINK_OPTS="$LDFLAGS" |
25959
14e844f1459a
fix linking of __init_qt__.la on Windows systems (bug #54881)
John W. Eaton <jwe@octave.org>
parents:
25931
diff
changeset
|
3012 OCT_GUI_LINK_OPTS="$LDFLAGS" |
21412
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3013 |
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
|
3014 if test $link_all_deps = yes; then |
29588
b4cb9d04f3cf
build: Use dynamic symbol lookup for functions in libraries on macOS (bug #53627).
Andrew Janke <andrew@apjanke.net>
parents:
29555
diff
changeset
|
3015 AC_DEFINE(OCTAVE_LINK_ALL_DEPS, 1, [Link with all dependencies.]) |
b4cb9d04f3cf
build: Use dynamic symbol lookup for functions in libraries on macOS (bug #53627).
Andrew Janke <andrew@apjanke.net>
parents:
29555
diff
changeset
|
3016 |
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
|
3017 OCT_LINK_DEPS="libinterp/liboctinterp.la liboctave/liboctave.la" |
25959
14e844f1459a
fix linking of __init_qt__.la on Windows systems (bug #54881)
John W. Eaton <jwe@octave.org>
parents:
25931
diff
changeset
|
3018 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
|
3019 |
23757
bba752b37f8e
use different definition for mkoctfile link deps
John W. Eaton <jwe@octave.org>
parents:
23709
diff
changeset
|
3020 MKOCTFILE_OCTAVE_LINK_DEPS="$LIBOCTINTERP_LINK_DEPS $MKOCTFILE_LIBOCTAVE_LINK_DEPS" |
26363
16607f64eea1
Include -loctave -loctinterp and lib path to mkoctfile link command (bug #55033).
Ben Abbott <bpabbott@mac.com>
parents:
26270
diff
changeset
|
3021 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
|
3022 |
21412
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3023 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
|
3024 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
|
3025 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3026 OCTAVE_LINK_DEPS="$LIBOCTINTERP_LINK_DEPS" |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3027 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
|
3028 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
|
3029 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
|
3030 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
|
3031 OCT_LINK_DEPS="libinterp/liboctinterp.la liboctave/liboctave.la" |
25959
14e844f1459a
fix linking of __init_qt__.la on Windows systems (bug #54881)
John W. Eaton <jwe@octave.org>
parents:
25931
diff
changeset
|
3032 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
|
3033 ;; |
7cdda3ad947f
fix .oct files link dependencies and options for --link-all-deps (bug #54168)
John W. Eaton <jwe@octave.org>
parents:
25488
diff
changeset
|
3034 esac |
21412
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3035 fi |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3036 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3037 AC_SUBST(LIBOCTINTERP_LINK_DEPS) |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3038 AC_SUBST(LIBOCTINTERP_LINK_OPTS) |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3039 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3040 AC_SUBST(OCTAVE_LINK_DEPS) |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3041 AC_SUBST(OCTAVE_LINK_OPTS) |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3042 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3043 AC_SUBST(OCT_LINK_DEPS) |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3044 AC_SUBST(OCT_LINK_OPTS) |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3045 |
25959
14e844f1459a
fix linking of __init_qt__.la on Windows systems (bug #54881)
John W. Eaton <jwe@octave.org>
parents:
25931
diff
changeset
|
3046 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:
25931
diff
changeset
|
3047 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:
25931
diff
changeset
|
3048 |
23757
bba752b37f8e
use different definition for mkoctfile link deps
John W. Eaton <jwe@octave.org>
parents:
23709
diff
changeset
|
3049 AC_SUBST(MKOCTFILE_OCTAVE_LINK_DEPS) |
bba752b37f8e
use different definition for mkoctfile link deps
John W. Eaton <jwe@octave.org>
parents:
23709
diff
changeset
|
3050 AC_SUBST(MKOCTFILE_OCT_LINK_DEPS) |
bba752b37f8e
use different definition for mkoctfile link deps
John W. Eaton <jwe@octave.org>
parents:
23709
diff
changeset
|
3051 |
21412
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3052 LIBOCTGUI_LINK_DEPS="" |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3053 LIBOCTGUI_LINK_OPTS="" |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3054 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3055 OCTAVE_GUI_LINK_DEPS="" |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3056 OCTAVE_GUI_LINK_OPTS="" |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3057 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3058 if test $build_qt_gui = yes; then |
31752
345a3f5890e7
assume QOpenGLWidget is available
John W. Eaton <jwe@octave.org>
parents:
31751
diff
changeset
|
3059 LIBOCTGUI_LINK_DEPS="$QT_LIBS" |
345a3f5890e7
assume QOpenGLWidget is available
John W. Eaton <jwe@octave.org>
parents:
31751
diff
changeset
|
3060 LIBOCTGUI_LINK_OPTS="$QT_LDFLAGS" |
21412
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3061 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3062 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
|
3063 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
|
3064 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
|
3065 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3066 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
|
3067 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
|
3068 fi |
15873
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
3069 fi |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
3070 |
21412
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3071 AC_SUBST(LIBOCTGUI_LINK_DEPS) |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3072 AC_SUBST(LIBOCTGUI_LINK_OPTS) |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3073 |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3074 AC_SUBST(OCTAVE_GUI_LINK_DEPS) |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3075 AC_SUBST(OCTAVE_GUI_LINK_OPTS) |
9773a1c2b55f
eliminate link-deps.mk files
John W. Eaton <jwe@octave.org>
parents:
21409
diff
changeset
|
3076 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
3077 ############################################################################## |
31153
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
3078 ### Configuration tests done. |
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
3079 |
8f67b53ac9ff
configure.ac: clean up ordering of macros, comments.
Rik <rik@octave.org>
parents:
31151
diff
changeset
|
3080 ### 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
|
3081 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
|
3082 CXXFLAGS="$original_octave_configure_CXXFLAGS" |
1304 | 3083 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
3084 ### Add footer to config.h |
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
3085 |
30580
fdc30b576333
eliminate code duplication in oct-conf-post.in.h and octave-config.h
John W. Eaton <jwe@octave.org>
parents:
30565
diff
changeset
|
3086 AH_BOTTOM([#include "oct-conf-post-private.h"]) |
fdc30b576333
eliminate code duplication in oct-conf-post.in.h and octave-config.h
John W. Eaton <jwe@octave.org>
parents:
30565
diff
changeset
|
3087 AH_BOTTOM([#include "oct-conf-post-public.h"]) |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
3088 |
15779
4456ad3d8a56
configure.ac: Ensure that all AC_DEFINEs are captured by UGLY_DEFS variable.
Rik <rik@octave.org>
parents:
15777
diff
changeset
|
3089 ### 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
|
3090 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
|
3091 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
|
3092 |
4456ad3d8a56
configure.ac: Ensure that all AC_DEFINEs are captured by UGLY_DEFS variable.
Rik <rik@octave.org>
parents:
15777
diff
changeset
|
3093 AC_OUTPUT_MAKE_DEFS |
3923 | 3094 |
21409
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3095 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
|
3096 ## 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
|
3097 ## 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
|
3098 ## 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
|
3099 ## 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
|
3100 ## 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
|
3101 ## |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3102 ## configure --prefix=/some/where |
27641
ab13485346c2
configure.ac: Fix typos and grammar in comments (bug #57171)
Andrew Janke <andrew@apjanke.net>
parents:
27625
diff
changeset
|
3103 ## make --prefix=/some/where/else |
21409
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3104 ## |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3105 ## 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
|
3106 |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3107 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
|
3108 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
|
3109 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
|
3110 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
|
3111 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
|
3112 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
|
3113 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
|
3114 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
|
3115 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
|
3116 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
|
3117 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
|
3118 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
|
3119 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
|
3120 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
|
3121 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
|
3122 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
|
3123 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
|
3124 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
|
3125 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
|
3126 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
|
3127 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
|
3128 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
|
3129 |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3130 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
|
3131 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
|
3132 |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3133 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
|
3134 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
|
3135 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
|
3136 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
|
3137 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
|
3138 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
|
3139 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
|
3140 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
|
3141 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
|
3142 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
|
3143 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
|
3144 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
|
3145 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
|
3146 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
|
3147 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
|
3148 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
|
3149 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
|
3150 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
|
3151 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
|
3152 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
|
3153 eval octdatadir="\"$octdatadir\"" |
24875
7c7b60dd4d4c
Generate Qt compressed help and collection files for the manual (bug #53006)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24873
diff
changeset
|
3154 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
|
3155 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
|
3156 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
|
3157 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
|
3158 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
|
3159 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
|
3160 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
|
3161 |
a53f46577e39
Fix variable expansion in dynamic linking flags for macOS (bug #48215)
Mike Miller <mtmiller@octave.org>
parents:
21908
diff
changeset
|
3162 ## 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
|
3163 ## 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
|
3164 |
a53f46577e39
Fix variable expansion in dynamic linking flags for macOS (bug #48215)
Mike Miller <mtmiller@octave.org>
parents:
21908
diff
changeset
|
3165 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
|
3166 ]) |
1aa293d58df0
fully expand all env vars before writing config.status (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
3167 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
3168 ### Do substitutions in Makefiles and other files that hold configuration info. |
869 | 3169 |
21413
3fb2bdea47a5
check substituted variables against current make variables
John W. Eaton <jwe@octave.org>
parents:
21412
diff
changeset
|
3170 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
|
3171 |
3fb2bdea47a5
check substituted variables against current make variables
John W. Eaton <jwe@octave.org>
parents:
21412
diff
changeset
|
3172 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
|
3173 AC_SUBST(ac_config_files) |
9645 | 3174 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
|
3175 |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3176 AC_CONFIG_FILES([ |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
3177 Makefile |
21413
3fb2bdea47a5
check substituted variables against current make variables
John W. Eaton <jwe@octave.org>
parents:
21412
diff
changeset
|
3178 build-aux/check-subst-vars.sh:build-aux/check-subst-vars.in.sh |
31899
c01849481834
avoid problems with $(shell ...) execution in Makefile
John W. Eaton <jwe@octave.org>
parents:
31893
diff
changeset
|
3179 build-aux/find-defun-files.sh:build-aux/find-defun-files.in.sh |
c01849481834
avoid problems with $(shell ...) execution in Makefile
John W. Eaton <jwe@octave.org>
parents:
31893
diff
changeset
|
3180 build-aux/find-files-with-tests.sh:build-aux/find-files-with-tests.in.sh |
17102
c48625614ea6
Properly incorporate Doxygen into the build system
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
16088
diff
changeset
|
3181 doc/doxyhtml/Doxyfile |
25391
26070f36f1e7
Provide octave configuration files for pkg-config (bug #48775)
Carnë Draug <carandraug@octave.org>
parents:
25333
diff
changeset
|
3182 libgnu/Makefile |
30806
103efb7e1600
avoid make dist failure due to long command line (bug #62135)
John W. Eaton <jwe@octave.org>
parents:
30674
diff
changeset
|
3183 test/Makefile |
25391
26070f36f1e7
Provide octave configuration files for pkg-config (bug #48775)
Carnë Draug <carandraug@octave.org>
parents:
25333
diff
changeset
|
3184 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
|
3185 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
|
3186 |
30580
fdc30b576333
eliminate code duplication in oct-conf-post.in.h and octave-config.h
John W. Eaton <jwe@octave.org>
parents:
30565
diff
changeset
|
3187 dnl We use a .in.h file for oct-conf-post-private.h and |
fdc30b576333
eliminate code duplication in oct-conf-post.in.h and octave-config.h
John W. Eaton <jwe@octave.org>
parents:
30565
diff
changeset
|
3188 dnl oct-conf-post-public.h simply to copy it to the build tree |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
3189 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
|
3190 |
30580
fdc30b576333
eliminate code duplication in oct-conf-post.in.h and octave-config.h
John W. Eaton <jwe@octave.org>
parents:
30565
diff
changeset
|
3191 AC_CONFIG_FILES([ |
fdc30b576333
eliminate code duplication in oct-conf-post.in.h and octave-config.h
John W. Eaton <jwe@octave.org>
parents:
30565
diff
changeset
|
3192 oct-conf-post-private.h-tmp:oct-conf-post-private.in.h |
fdc30b576333
eliminate code duplication in oct-conf-post.in.h and octave-config.h
John W. Eaton <jwe@octave.org>
parents:
30565
diff
changeset
|
3193 oct-conf-post-public.h-tmp:oct-conf-post-public.in.h]) |
fdc30b576333
eliminate code duplication in oct-conf-post.in.h and octave-config.h
John W. Eaton <jwe@octave.org>
parents:
30565
diff
changeset
|
3194 |
fdc30b576333
eliminate code duplication in oct-conf-post.in.h and octave-config.h
John W. Eaton <jwe@octave.org>
parents:
30565
diff
changeset
|
3195 AC_CONFIG_COMMANDS([oct-conf-post-private.h], |
fdc30b576333
eliminate code duplication in oct-conf-post.in.h and octave-config.h
John W. Eaton <jwe@octave.org>
parents:
30565
diff
changeset
|
3196 [$SHELL $srcdir/build-aux/move-if-change oct-conf-post-private.h-tmp oct-conf-post-private.h]) |
fdc30b576333
eliminate code duplication in oct-conf-post.in.h and octave-config.h
John W. Eaton <jwe@octave.org>
parents:
30565
diff
changeset
|
3197 |
fdc30b576333
eliminate code duplication in oct-conf-post.in.h and octave-config.h
John W. Eaton <jwe@octave.org>
parents:
30565
diff
changeset
|
3198 AC_CONFIG_COMMANDS([oct-conf-post-public.h], |
fdc30b576333
eliminate code duplication in oct-conf-post.in.h and octave-config.h
John W. Eaton <jwe@octave.org>
parents:
30565
diff
changeset
|
3199 [$SHELL $srcdir/build-aux/move-if-change oct-conf-post-public.h-tmp oct-conf-post-public.h]) |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
3200 |
21397
df859661e31e
generate default-qt-settings at configure time
John W. Eaton <jwe@octave.org>
parents:
21392
diff
changeset
|
3201 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
|
3202 liboctave/external/mk-f77-def.sh |
25397
2cf750f5cb7d
make version info accessible in liboctave
John W. Eaton <jwe@octave.org>
parents:
25391
diff
changeset
|
3203 liboctave/mk-version-h.sh |
28123
4963f23b145c
move mex type definitions to separate file
John W. Eaton <jwe@octave.org>
parents:
28092
diff
changeset
|
3204 libinterp/corefcn/mk-mxtypes-h.sh |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
3205 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
|
3206 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
|
3207 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
|
3208 |
3887 | 3209 AC_OUTPUT |
1225 | 3210 |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
3211 ### Print a summary of the build configuration. |
1225 | 3212 |
5844 | 3213 AC_MSG_NOTICE([ |
1225 | 3214 |
3215 Octave is now configured for $canonical_host_type | |
3216 | |
22501
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3217 Source directory: $srcdir |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3218 Installation prefix: $prefix |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3219 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
|
3220 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
|
3221 Fortran compiler: $F77 $FFLAGS |
29776
0916ffc997e6
build: Include CPPFLAGS in summary of configure script.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29745
diff
changeset
|
3222 CPPFLAGS: $CPPFLAGS |
22501
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3223 Fortran libraries: $FLIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3224 Lex libraries: $LEXLIB |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3225 LIBS: $LIBS |
23370
e284cf4239bf
configure.ac: Print LDFLAGS in summary of config variables.
Rik <rik@octave.org>
parents:
23227
diff
changeset
|
3226 LDFLAGS: $LDFLAGS |
31806
3641b742d8aa
configure.ac: Add sanitizer compilation flags to XTRA_XXXFLAGS rather than WARN_XXXFLAGS (bug #63712).
Rik <rik@octave.org>
parents:
31769
diff
changeset
|
3227 Extra LDFLAGS: $XTRA_LDFLAGS $WARN_LDFLAGS |
22501
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3228 |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3229 AMD CPPFLAGS: $AMD_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3230 AMD LDFLAGS: $AMD_LDFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3231 AMD libraries: $AMD_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3232 ARPACK CPPFLAGS: $ARPACK_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3233 ARPACK LDFLAGS: $ARPACK_LDFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3234 ARPACK libraries: $ARPACK_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3235 BLAS libraries: $BLAS_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3236 BZ2 CPPFLAGS: $BZ2_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3237 BZ2 LDFLAGS: $BZ2_LDFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3238 BZ2 libraries: $BZ2_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3239 CAMD CPPFLAGS: $CAMD_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3240 CAMD LDFLAGS: $CAMD_LDFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3241 CAMD libraries: $CAMD_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3242 CARBON libraries: $CARBON_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3243 CCOLAMD CPPFLAGS: $CCOLAMD_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3244 CCOLAMD LDFLAGS: $CCOLAMD_LDFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3245 CCOLAMD libraries: $CCOLAMD_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3246 CHOLMOD CPPFLAGS: $CHOLMOD_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3247 CHOLMOD LDFLAGS: $CHOLMOD_LDFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3248 CHOLMOD libraries: $CHOLMOD_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3249 COLAMD CPPFLAGS: $COLAMD_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3250 COLAMD LDFLAGS: $COLAMD_LDFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3251 COLAMD libraries: $COLAMD_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3252 CURL CPPFLAGS: $CURL_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3253 CURL LDFLAGS: $CURL_LDFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3254 CURL libraries: $CURL_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3255 CXSPARSE CPPFLAGS: $CXSPARSE_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3256 CXSPARSE LDFLAGS: $CXSPARSE_LDFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3257 CXSPARSE libraries: $CXSPARSE_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3258 DL libraries: $DL_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3259 FFTW3 CPPFLAGS: $FFTW3_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3260 FFTW3 LDFLAGS: $FFTW3_LDFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3261 FFTW3 libraries: $FFTW3_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3262 FFTW3F CPPFLAGS: $FFTW3F_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3263 FFTW3F LDFLAGS: $FFTW3F_LDFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3264 FFTW3F libraries: $FFTW3F_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3265 FLTK CPPFLAGS: $FLTK_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3266 FLTK LDFLAGS: $FLTK_LDFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3267 FLTK libraries: $FLTK_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3268 fontconfig CPPFLAGS: $FONTCONFIG_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3269 fontconfig libraries: $FONTCONFIG_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3270 FreeType2 CPPFLAGS: $FT2_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3271 FreeType2 libraries: $FT2_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3272 GLPK CPPFLAGS: $GLPK_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3273 GLPK LDFLAGS: $GLPK_LDFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3274 GLPK libraries: $GLPK_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3275 HDF5 CPPFLAGS: $HDF5_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3276 HDF5 LDFLAGS: $HDF5_LDFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3277 HDF5 libraries: $HDF5_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3278 Java home: $JAVA_HOME |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3279 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
|
3280 Java CPPFLAGS: $JAVA_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3281 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
|
3282 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
|
3283 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
|
3284 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
|
3285 LAPACK libraries: $LAPACK_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3286 Magick++ CPPFLAGS: $MAGICK_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3287 Magick++ LDFLAGS: $MAGICK_LDFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3288 Magick++ libraries: $MAGICK_LIBS |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
3289 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
|
3290 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
|
3291 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
|
3292 PCRE libraries: $PCRE_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3293 PortAudio CPPFLAGS: $PORTAUDIO_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3294 PortAudio LDFLAGS: $PORTAUDIO_LDFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3295 PortAudio libraries: $PORTAUDIO_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3296 PTHREAD flags: $PTHREAD_CFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3297 PTHREAD libraries: $PTHREAD_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3298 QHULL CPPFLAGS: $QHULL_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3299 QHULL LDFLAGS: $QHULL_LDFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3300 QHULL libraries: $QHULL_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3301 QRUPDATE CPPFLAGS: $QRUPDATE_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3302 QRUPDATE LDFLAGS: $QRUPDATE_LDFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3303 QRUPDATE libraries: $QRUPDATE_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3304 Qt CPPFLAGS: $QT_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3305 Qt LDFLAGS: $QT_LDFLAGS |
25931
332be8be16eb
dynamically load qt graphics
John W. Eaton <jwe@octave.org>
parents:
25882
diff
changeset
|
3306 Qt GUI libraries: $QT_LIBS |
22501
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3307 Qt moc: $MOC $MOCFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3308 Qt uic: $UIC $UICFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3309 Qt rcc: $RCC $RCCFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3310 Qt lrelease: $LRELEASE $LRELEASEFLAGS |
24875
7c7b60dd4d4c
Generate Qt compressed help and collection files for the manual (bug #53006)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24873
diff
changeset
|
3311 Qt qcollectiongenerator: $QCOLLECTIONGENERATOR $QCOLLECTIONGENERATORFLAGS |
24873
486bc22482ca
Improve Doxygen generation.
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24826
diff
changeset
|
3312 Qt qhelpgenerator: $QHELPGENERATOR $QHELPGENERATORFLAGS |
31415
00e2eafd1c0f
build: Use gnulib module to get readline libraries.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31407
diff
changeset
|
3313 READLINE libraries: $LIBREADLINE |
22501
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3314 Sndfile CPPFLAGS: $SNDFILE_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3315 Sndfile LDFLAGS: $SNDFILE_LDFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3316 Sndfile libraries: $SNDFILE_LIBS |
29259
66f162b6fa03
Replacement of CXSPARSE by SPQR for QR factorization (bug #57033).
Simon Hau <simon.hau79@gmail.com>
parents:
29239
diff
changeset
|
3317 SPQR CPPFLAGS: $SPQR_CPPFLAGS |
66f162b6fa03
Replacement of CXSPARSE by SPQR for QR factorization (bug #57033).
Simon Hau <simon.hau79@gmail.com>
parents:
29239
diff
changeset
|
3318 SPQR LDFLAGS: $SPQR_LDFLAGS |
66f162b6fa03
Replacement of CXSPARSE by SPQR for QR factorization (bug #57033).
Simon Hau <simon.hau79@gmail.com>
parents:
29239
diff
changeset
|
3319 SPQR libraries: $SPQR_LIBS |
23990
6f56efc098bd
check for suitesparse config library before other suitesparse libraries
John W. Eaton <jwe@octave.org>
parents:
23989
diff
changeset
|
3320 SuiteSparse config libraries: $SUITESPARSECONFIG_LIBS |
23981
6420142ff32c
configure: fix capitalization of SUNDIALS, reword related terms
Mike Miller <mtmiller@octave.org>
parents:
23980
diff
changeset
|
3321 SUNDIALS IDA CPPFLAGS: $SUNDIALS_IDA_CPPFLAGS |
6420142ff32c
configure: fix capitalization of SUNDIALS, reword related terms
Mike Miller <mtmiller@octave.org>
parents:
23980
diff
changeset
|
3322 SUNDIALS IDA LDFLAGS: $SUNDIALS_IDA_LDFLAGS |
6420142ff32c
configure: fix capitalization of SUNDIALS, reword related terms
Mike Miller <mtmiller@octave.org>
parents:
23980
diff
changeset
|
3323 SUNDIALS IDA libraries: $SUNDIALS_IDA_LIBS |
6420142ff32c
configure: fix capitalization of SUNDIALS, reword related terms
Mike Miller <mtmiller@octave.org>
parents:
23980
diff
changeset
|
3324 SUNDIALS NVECTOR CPPFLAGS: $SUNDIALS_NVECSERIAL_CPPFLAGS |
6420142ff32c
configure: fix capitalization of SUNDIALS, reword related terms
Mike Miller <mtmiller@octave.org>
parents:
23980
diff
changeset
|
3325 SUNDIALS NVECTOR LDFLAGS: $SUNDIALS_NVECSERIAL_LDFLAGS |
6420142ff32c
configure: fix capitalization of SUNDIALS, reword related terms
Mike Miller <mtmiller@octave.org>
parents:
23980
diff
changeset
|
3326 SUNDIALS NVECTOR libraries: $SUNDIALS_NVECSERIAL_LIBS |
26910
075c4d3bf1de
use OCTAVE_CHECK_LIB to check for sundials_sunlinsolklu library
John W. Eaton <jwe@octave.org>
parents:
26909
diff
changeset
|
3327 SUNLINSOL KLU CPPFLAGS: $SUNDIALS_SUNLINSOLKLU_CPPFLAGS |
075c4d3bf1de
use OCTAVE_CHECK_LIB to check for sundials_sunlinsolklu library
John W. Eaton <jwe@octave.org>
parents:
26909
diff
changeset
|
3328 SUNLINSOL KLU LDFLAGS: $SUNDIALS_SUNLINSOLKLU_LDFLAGS |
075c4d3bf1de
use OCTAVE_CHECK_LIB to check for sundials_sunlinsolklu library
John W. Eaton <jwe@octave.org>
parents:
26909
diff
changeset
|
3329 SUNLINSOL KLU libraries: $SUNDIALS_SUNLINSOLKLU_LIBS |
22501
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3330 UMFPACK CPPFLAGS: $UMFPACK_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3331 UMFPACK LDFLAGS: $UMFPACK_LDFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3332 UMFPACK libraries: $UMFPACK_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3333 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
|
3334 X11 libraries: $X11_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3335 Z CPPFLAGS: $Z_CPPFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3336 Z LDFLAGS: $Z_LDFLAGS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3337 Z libraries: $Z_LIBS |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3338 |
ed1b0d5fa97c
always check for suitesparseconfig if any SuiteSparse libs found
John W. Eaton <jwe@octave.org>
parents:
22458
diff
changeset
|
3339 Default pager: $DEFAULT_PAGER |
26071
658153e1976d
Fix failing BIST tests and oddities when gnuplot is not present (bug #55023).
Rik <rik@octave.org>
parents:
25843
diff
changeset
|
3340 gnuplot: $GNUPLOT_BINARY |
1664 | 3341 |
25097
cc21f66ecb1c
display more info in configure summary about Qt version and missing features
John W. Eaton <jwe@octave.org>
parents:
25078
diff
changeset
|
3342 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
|
3343 Build Java interface: $build_java |
7d5c56e38801
report BLAS integer size in less alarming way
John W. Eaton <jwe@octave.org>
parents:
22986
diff
changeset
|
3344 Build static libraries: $STATIC_LIBS |
7d5c56e38801
report BLAS integer size in less alarming way
John W. Eaton <jwe@octave.org>
parents:
22986
diff
changeset
|
3345 Build shared libraries: $SHARED_LIBS |
25882
22ee68edcf3a
require dynamic loading capabilities to build Octave
John W. Eaton <jwe@octave.org>
parents:
25844
diff
changeset
|
3346 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
|
3347 Include support for GNU readline: $USE_READLINE |
27971
ec769a7ab9fb
fix more spelling errors (bug #57613)
John W. Eaton <jwe@octave.org>
parents:
27970
diff
changeset
|
3348 Use push parser in command line REPL: $ENABLE_COMMAND_LINE_PUSH_PARSER |
22992
7d5c56e38801
report BLAS integer size in less alarming way
John W. Eaton <jwe@octave.org>
parents:
22986
diff
changeset
|
3349 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
|
3350 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
|
3351 OpenMP SMP multithreading: $ENABLE_OPENMP |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
3352 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
|
3353 Build cross tools: $cross_tools |
7d5c56e38801
report BLAS integer size in less alarming way
John W. Eaton <jwe@octave.org>
parents:
22986
diff
changeset
|
3354 Build docs: $ENABLE_DOCS |
1225 | 3355 ]) |
3105 | 3356 |
3357 warn_msg_printed=false | |
3358 | |
14605
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
3359 OCTAVE_CONFIGURE_WARNING_SUMMARY |
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
3360 |
21378
172479a97e6c
configure.ac: Remove overquoting in shell variables tests.
Rik <rik@octave.org>
parents:
21374
diff
changeset
|
3361 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
|
3362 AC_MSG_WARN([]) |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
3363 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
|
3364 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
|
3365 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
|
3366 fi |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3367 |
6191 | 3368 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
|
3369 AC_MSG_NOTICE([]) |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
3370 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
|
3371 AC_MSG_NOTICE([NOTE: OR if they are missing required features on your system.]) |
6161 | 3372 fi |
3373 | |
3105 | 3374 ### End of configure. |