Mercurial > octave
annotate configure.ac @ 19828:13bc2737177c
Fix incorrect reporting of OpenMP use by configure (bug #44346).
* configure.ac: Check whether ax_openmp found compiler options before reporting
that OpenMP was used.
author | Rik <rik@octave.org> |
---|---|
date | Sun, 22 Feb 2015 15:50:21 -0800 |
parents | bc3e6e96da81 |
children | d0c7b5346d55 |
rev | line source |
---|---|
5 | 1 dnl Process this file with autoconf to produce a configure script. |
2 dnl | |
19697
4197fc428c7d
maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents:
19676
diff
changeset
|
3 dnl Copyright (C) 1993-2015 John W. Eaton |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
4 ### |
869 | 5 ### This file is part of Octave. |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
6 ### |
869 | 7 ### Octave is free software; you can redistribute it and/or modify it |
8 ### under the terms of the GNU General Public License as published by the | |
7016 | 9 ### Free Software Foundation; either version 3 of the License, or (at |
10 ### your option) any later version. | |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
11 ### |
869 | 12 ### Octave is distributed in the hope that it will be useful, but WITHOUT |
13 ### ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
14 ### FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
15 ### for more details. | |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
16 ### |
869 | 17 ### You should have received a copy of the GNU General Public License |
7016 | 18 ### along with Octave; see the file COPYING. If not, see |
19 ### <http://www.gnu.org/licenses/>. | |
869 | 20 |
19825
bc3e6e96da81
bump required autoconf version to 2.63
John W. Eaton <jwe@octave.org>
parents:
19816
diff
changeset
|
21 AC_PREREQ([2.63]) |
19676
f4361ca47463
Change Octave version to 3.9.1+ to distinguish it from previous gui-release branch.
Rik <rik@octave.org>
parents:
19645
diff
changeset
|
22 AC_INIT([GNU Octave], [3.9.1+], [http://octave.org/bugs.html], [octave]) |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
23 |
18229
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
24 dnl Note that the version number is duplicated here and in AC_INIT |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
25 dnl because AC_INIT requires it to be static, not computed from |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
26 dnl shell variables. |
19645
ebd27d8c63fd
update default branch to release as 4.0
John W. Eaton <jwe@octave.org>
parents:
19598
diff
changeset
|
27 OCTAVE_MAJOR_VERSION=3 |
ebd27d8c63fd
update default branch to release as 4.0
John W. Eaton <jwe@octave.org>
parents:
19598
diff
changeset
|
28 OCTAVE_MINOR_VERSION=9 |
18486
ca65b05b9a8a
maint: Periodic merge of stable to gui-release.
John W. Eaton <jwe@octave.org>
diff
changeset
|
29 OCTAVE_PATCH_VERSION=0+ |
18229
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
30 |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
31 dnl PACKAGE_VERSION is set by the AC_INIT VERSION arg |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
32 OCTAVE_VERSION="$PACKAGE_VERSION" |
18229
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
33 |
19697
4197fc428c7d
maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents:
19676
diff
changeset
|
34 OCTAVE_COPYRIGHT="Copyright (C) 2015 John W. Eaton and others." |
18549 | 35 |
18883 | 36 OCTAVE_RELEASE_DATE="2014-07-01" |
18229
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
37 |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
38 ## The "API version" is used as a way of checking that interfaces in the |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
39 ## liboctave and libinterp libraries haven't changed in a backwardly |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
40 ## incompatible way when loading .oct files. A better way to do that is |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
41 ## with library versioning, but not all systems support that. |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
42 ## NOTE: This macro will be removed in a future version of Octave. If |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
43 ## you insist on checking for features using a version number, use the |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
44 ## OCTAVE_MAJOR_VERSION, OCTAVE_MINOR_VERSION, and |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
45 ## OCTAVE_PATCH_VERSION macros instead. |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
46 ## FIXME: Since we also set libtool versions for liboctave and |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
47 ## libinterp, perhaps we should be computing the "api version" from |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
48 ## those versions numbers in some way instead of setting it |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
49 ## independently here. |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
50 OCTAVE_API_VERSION="api-v49+" |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
51 |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
52 AC_SUBST(OCTAVE_MAJOR_VERSION) |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
53 AC_SUBST(OCTAVE_MINOR_VERSION) |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
54 AC_SUBST(OCTAVE_PATCH_VERSION) |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
55 AC_SUBST(OCTAVE_VERSION) |
18229
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
56 AC_SUBST(OCTAVE_COPYRIGHT) |
b6b6e0dc700e
provide version number macros (bug #41045)
John W. Eaton <jwe@octave.org>
parents:
18175
diff
changeset
|
57 AC_SUBST(OCTAVE_RELEASE_DATE) |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
58 AC_SUBST(OCTAVE_API_VERSION) |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
59 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
60 dnl FIXME: We should auto-insert the Mercurial changeset ID into the |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
61 dnl AC_REVISION field whenever configure.ac is modified. |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
62 dnl AC_REVISION($Revision: 1.603 $) |
15195 | 63 AC_CONFIG_SRCDIR([libinterp/octave.cc]) |
16330
306e0ac231d0
move AH_BOTTOM output to separate header file
John W. Eaton <jwe@octave.org>
parents:
16329
diff
changeset
|
64 AC_CONFIG_HEADERS([config.h:config.in.h]) |
9946 | 65 AC_CONFIG_AUX_DIR([build-aux]) |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
66 AC_CONFIG_MACRO_DIR([m4]) |
869 | 67 |
17562
76a8a179bf5b
Move Automake options into AM_INIT_AUTOMAKE
Mike Miller <mtmiller@ieee.org>
parents:
17465
diff
changeset
|
68 AM_INIT_AUTOMAKE([1.11 foreign -Wno-portability -Wno-override tar-ustar subdir-objects]) |
9946 | 69 |
19801
c1654224bc99
enable silent makefile rules by default
John W. Eaton <jwe@octave.org>
parents:
19744
diff
changeset
|
70 ## Add the option to enable silent rules and make silent rules the |
c1654224bc99
enable silent makefile rules by default
John W. Eaton <jwe@octave.org>
parents:
19744
diff
changeset
|
71 ## default behavior. Available since Automake 1.11 and included by |
c1654224bc99
enable silent makefile rules by default
John W. Eaton <jwe@octave.org>
parents:
19744
diff
changeset
|
72 ## default starting with Automake 1.13. |
c1654224bc99
enable silent makefile rules by default
John W. Eaton <jwe@octave.org>
parents:
19744
diff
changeset
|
73 AM_SILENT_RULES([yes]) |
17375
bc018154e46a
build: Support optional Automake silent rules
Mike Miller <mtmiller@ieee.org>
parents:
17330
diff
changeset
|
74 |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
75 OCTAVE_CANONICAL_HOST |
5844 | 76 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
77 AC_DEFINE(OCTAVE_SOURCE, 1, [Define to 1 if this is Octave.]) |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
78 |
9091
45c832e9976d
configure.in: require autoconf 2.60; eliminate some obsolete macros
John W. Eaton <jwe@octave.org>
parents:
9090
diff
changeset
|
79 AC_USE_SYSTEM_EXTENSIONS |
1667 | 80 |
15857
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
81 ### Make configure args available for other uses. |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
82 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
83 config_opts=$ac_configure_args |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
84 AC_SUBST(config_opts) |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
85 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
86 ### Set default file locations |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
87 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
88 OCTAVE_SET_DEFAULT([octlibdir], '$(libdir)/octave/$(version)') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
89 OCTAVE_SET_DEFAULT([archlibdir], |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
90 '$(libexecdir)/octave/$(version)/exec/$(canonical_host_type)') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
91 OCTAVE_SET_DEFAULT([localarchlibdir], |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
92 '$(libexecdir)/octave/site/exec/$(canonical_host_type)') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
93 OCTAVE_SET_DEFAULT([localapiarchlibdir], |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
94 '$(libexecdir)/octave/$(api_version)/site/exec/$(canonical_host_type)') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
95 OCTAVE_SET_DEFAULT([localverarchlibdir], |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
96 '$(libexecdir)/octave/$(version)/site/exec/$(canonical_host_type)') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
97 OCTAVE_SET_DEFAULT([octfiledir], |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
98 '$(libdir)/octave/$(version)/oct/$(canonical_host_type)') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
99 OCTAVE_SET_DEFAULT([localoctfiledir], |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
100 '$(libdir)/octave/site/oct/$(canonical_host_type)') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
101 OCTAVE_SET_DEFAULT([localapioctfiledir], |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
102 '$(libdir)/octave/site/oct/$(api_version)/$(canonical_host_type)') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
103 OCTAVE_SET_DEFAULT([localveroctfiledir], |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
104 '$(libdir)/octave/$(version)/site/oct/$(canonical_host_type)') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
105 OCTAVE_SET_DEFAULT([octincludedir], '$(includedir)/octave-$(version)/octave') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
106 OCTAVE_SET_DEFAULT([fcnfiledir], '$(datadir)/octave/$(version)/m') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
107 OCTAVE_SET_DEFAULT([localfcnfiledir], '$(datadir)/octave/site/m') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
108 OCTAVE_SET_DEFAULT([localapifcnfiledir], |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
109 '$(datadir)/octave/site/$(api_version)/m') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
110 OCTAVE_SET_DEFAULT([localverfcnfiledir], '$(datadir)/octave/$(version)/site/m') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
111 OCTAVE_SET_DEFAULT([octetcdir], '$(datadir)/octave/$(version)/etc') |
15971
e27d9b9b71f4
gui: install translation files into $(datadir)/octave/$(version)/locale
Torsten <ttl@justmail.de>
parents:
15969
diff
changeset
|
112 OCTAVE_SET_DEFAULT([octlocaledir], '$(datadir)/octave/$(version)/locale') |
15857
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
113 OCTAVE_SET_DEFAULT([doc_cache_file], '$(octetcdir)/doc-cache') |
16019
5b2126a8c84f
install tests and functions to run them
John W. Eaton <jwe@octave.org>
parents:
16012
diff
changeset
|
114 OCTAVE_SET_DEFAULT([octtestsdir], '$(octetcdir)/tests') |
15857
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
115 OCTAVE_SET_DEFAULT([texi_macros_file], '$(octetcdir)/macros.texi') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
116 OCTAVE_SET_DEFAULT([imagedir], '$(datadir)/octave/$(version)/imagelib') |
19032
d902542221c8
new data directory for storing data files we distribute
John W. Eaton <jwe@octave.org>
parents:
19019
diff
changeset
|
117 OCTAVE_SET_DEFAULT([octdatadir], '$(datadir)/octave/$(version)/data') |
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
|
118 OCTAVE_SET_DEFAULT([man1dir], '$(mandir)/man1') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
119 OCTAVE_SET_DEFAULT([man1ext], '.1') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
120 OCTAVE_SET_DEFAULT([infofile], '$(infodir)/octave.info') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
121 |
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 ### 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
|
123 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
124 ## Programs used in configuring Octave. |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
125 ## Find pkg-config executable (sets $PKG_CONFIG) |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
126 PKG_PROG_PKG_CONFIG |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
127 |
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 ## 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
|
129 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
|
130 AC_PROG_GREP |
15857
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
131 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
|
132 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
|
133 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
|
134 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
135 ## 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
|
136 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
|
137 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
138 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
|
139 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
|
140 |
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_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
|
142 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
143 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
|
144 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
|
145 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
|
146 |
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 ## 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
|
148 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
|
149 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
|
150 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
151 AC_PROG_INSTALL |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
152 INSTALL_SCRIPT='${INSTALL}' |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
153 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
|
154 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
155 OCTAVE_PROG_DESKTOP_FILE_INSTALL |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
156 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
157 ## Programs used when running Octave |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
158 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
|
159 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
|
160 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
|
161 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
|
162 |
19744
1687269e31e4
build: Generate Octave logo icons from SVG source (bug #37062)
Mike Miller <mtmiller@ieee.org>
parents:
19733
diff
changeset
|
163 ## 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
|
164 OCTAVE_PROG_ICOTOOL |
1687269e31e4
build: Generate Octave logo icons from SVG source (bug #37062)
Mike Miller <mtmiller@ieee.org>
parents:
19733
diff
changeset
|
165 OCTAVE_PROG_RSVG_CONVERT |
1687269e31e4
build: Generate Octave logo icons from SVG source (bug #37062)
Mike Miller <mtmiller@ieee.org>
parents:
19733
diff
changeset
|
166 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
|
167 [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
|
168 |
16522
bfff338c56d1
set default terminal font for the GUI from the configure script
John W. Eaton <jwe@octave.org>
parents:
16371
diff
changeset
|
169 ### Default terminal font for the GUI |
bfff338c56d1
set default terminal font for the GUI from the configure script
John W. Eaton <jwe@octave.org>
parents:
16371
diff
changeset
|
170 case $host_os in |
bfff338c56d1
set default terminal font for the GUI from the configure script
John W. Eaton <jwe@octave.org>
parents:
16371
diff
changeset
|
171 mingw* | msdosmsvc) |
bfff338c56d1
set default terminal font for the GUI from the configure script
John W. Eaton <jwe@octave.org>
parents:
16371
diff
changeset
|
172 DEFAULT_TERMINAL_FONT="Lucida Console" |
10123
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
173 ;; |
16522
bfff338c56d1
set default terminal font for the GUI from the configure script
John W. Eaton <jwe@octave.org>
parents:
16371
diff
changeset
|
174 *) |
bfff338c56d1
set default terminal font for the GUI from the configure script
John W. Eaton <jwe@octave.org>
parents:
16371
diff
changeset
|
175 DEFAULT_TERMINAL_FONT="Courier" |
10123
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
176 ;; |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
177 esac |
16522
bfff338c56d1
set default terminal font for the GUI from the configure script
John W. Eaton <jwe@octave.org>
parents:
16371
diff
changeset
|
178 DEFAULT_TERMINAL_FONT_SIZE=10 |
bfff338c56d1
set default terminal font for the GUI from the configure script
John W. Eaton <jwe@octave.org>
parents:
16371
diff
changeset
|
179 AC_SUBST(DEFAULT_TERMINAL_FONT) |
bfff338c56d1
set default terminal font for the GUI from the configure script
John W. Eaton <jwe@octave.org>
parents:
16371
diff
changeset
|
180 AC_SUBST(DEFAULT_TERMINAL_FONT_SIZE) |
10123
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
181 |
5451 | 182 ### 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
|
183 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
184 sepchar=':' |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
185 AC_ARG_WITH([sepchar], |
5842 | 186 [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
|
187 [use <char> as the path separation character])]) |
5451 | 188 case $with_sepchar in |
189 yes | "") | |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
190 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
191 mingw* | msdosmsvc) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
192 sepchar=';' ;; |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
193 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
|
194 ;; |
5451 | 195 no) |
196 AC_MSG_ERROR([You are required to define a path separation character]) | |
197 ;; | |
198 *) | |
199 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
|
200 ;; |
5451 | 201 esac |
202 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
|
203 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
|
204 [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
|
205 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
|
206 [Define this to be the path separator for your system, as a string.]) |
5451 | 207 |
15756
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
208 ### Define the path to the shell on the host system. Most systems will |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
209 ### ensure /bin/sh is the default shell so this can be safely ignored by |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
210 ### almost everyone. However, when building for Android, for example, |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
211 ### this will need to be set. |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
212 SHELL_PATH=/bin/sh |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
213 AC_ARG_WITH([shell], |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
214 [AS_HELP_STRING([--with-shell=SHELL], |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
215 [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
|
216 case $with_shell in |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
217 no) |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
218 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
|
219 ;; |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
220 yes | "") |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
221 ;; |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
222 *) |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
223 SHELL_PATH=$with_shell |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
224 ;; |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
225 esac |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
226 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
|
227 [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
|
228 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
229 ### Enable bounds checking on element references within Octave's array and |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
230 ### matrix classes. This slows down some operations a bit, so it is turned off |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
231 ### by default. |
2108 | 232 |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
233 BOUNDS_CHECKING=no |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
234 AC_ARG_ENABLE([bounds-check], |
5844 | 235 [AS_HELP_STRING([--enable-bounds-check], |
15238
c4779a180134
avoid confusing --disable-foo (default is yes) configure help messages
John W. Eaton <jwe@octave.org>
parents:
15237
diff
changeset
|
236 [enable bounds checking for indexing in internal array classes])], |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
237 [if test "$enableval" = yes; then BOUNDS_CHECKING=yes; fi], []) |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
238 if test $BOUNDS_CHECKING = yes; then |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
239 AC_DEFINE(BOUNDS_CHECKING, 1, [Define to 1 to use internal bounds checking.]) |
2108 | 240 fi |
241 | |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
242 ### Use atomic operations for internal reference counting. This is required |
18584
89b7bd7d0b83
configure.ac: Use atomic reference counting by default for Qt toolkit.
Rik <rik@octave.org>
parents:
18551
diff
changeset
|
243 ### for thread-safe behavior (Qt Handles) but incurs a significant slowdown. |
89b7bd7d0b83
configure.ac: Use atomic reference counting by default for Qt toolkit.
Rik <rik@octave.org>
parents:
18551
diff
changeset
|
244 ### Enabled by default until a higher performing solution can be found. |
89b7bd7d0b83
configure.ac: Use atomic reference counting by default for Qt toolkit.
Rik <rik@octave.org>
parents:
18551
diff
changeset
|
245 |
89b7bd7d0b83
configure.ac: Use atomic reference counting by default for Qt toolkit.
Rik <rik@octave.org>
parents:
18551
diff
changeset
|
246 USE_ATOMIC_REFCOUNT=yes |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
247 AC_ARG_ENABLE([atomic-refcount], |
18584
89b7bd7d0b83
configure.ac: Use atomic reference counting by default for Qt toolkit.
Rik <rik@octave.org>
parents:
18551
diff
changeset
|
248 [AS_HELP_STRING([--disable-atomic-refcount], |
89b7bd7d0b83
configure.ac: Use atomic reference counting by default for Qt toolkit.
Rik <rik@octave.org>
parents:
18551
diff
changeset
|
249 [Do not use atomic operations for internal reference counting. This option is required for thread-safe behavior as used in the GUI's Qt plotting toolkit. Performance for CLI-only builds is improved by disabling this feature.])], |
89b7bd7d0b83
configure.ac: Use atomic reference counting by default for Qt toolkit.
Rik <rik@octave.org>
parents:
18551
diff
changeset
|
250 [if test "$enableval" = no; then USE_ATOMIC_REFCOUNT=no; fi], []) |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
251 if test $USE_ATOMIC_REFCOUNT = yes; then |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
252 AC_DEFINE(USE_ATOMIC_REFCOUNT, 1, |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
253 [Define to 1 to use atomic operations for reference counting.]) |
13985
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
254 fi |
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
255 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
256 ### Disable running Make in the doc directory. |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
257 ### This is useful, for example, when building Octave on systems without TeX. |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
258 |
10092
02453ee20140
allow building of docs to be disabled
John W. Eaton <jwe@octave.org>
parents:
10077
diff
changeset
|
259 DOCDIR=doc |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
260 AC_ARG_ENABLE([docs], |
15238
c4779a180134
avoid confusing --disable-foo (default is yes) configure help messages
John W. Eaton <jwe@octave.org>
parents:
15237
diff
changeset
|
261 [AS_HELP_STRING([--disable-docs], [don't build documentation files])], |
10092
02453ee20140
allow building of docs to be disabled
John W. Eaton <jwe@octave.org>
parents:
10077
diff
changeset
|
262 [if test "$enableval" = no; then |
02453ee20140
allow building of docs to be disabled
John W. Eaton <jwe@octave.org>
parents:
10077
diff
changeset
|
263 DOCDIR= |
02453ee20140
allow building of docs to be disabled
John W. Eaton <jwe@octave.org>
parents:
10077
diff
changeset
|
264 warn_docs="building documentation disabled; make dist will fail" |
14605
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
265 OCTAVE_CONFIGURE_WARNING([warn_docs]) |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
266 fi], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
267 []) |
10092
02453ee20140
allow building of docs to be disabled
John W. Eaton <jwe@octave.org>
parents:
10077
diff
changeset
|
268 AC_SUBST(DOCDIR) |
02453ee20140
allow building of docs to be disabled
John W. Eaton <jwe@octave.org>
parents:
10077
diff
changeset
|
269 |
5275 | 270 ### If possible, use a 64-bit integer type for array dimensions and indexing. |
271 | |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
272 USE_64_BIT_IDX_T=no |
5275 | 273 OCTAVE_IDX_TYPE=int |
274 AC_ARG_ENABLE(64, | |
5844 | 275 [AS_HELP_STRING([--enable-64], |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
276 [(EXPERIMENTAL) use 64-bit integers for array dimensions and indexing])], |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
277 [if test "$enableval" = yes; then USE_64_BIT_IDX_T=yes; fi], []) |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
278 if test $USE_64_BIT_IDX_T = yes; then |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
279 AC_CHECK_SIZEOF([void *]) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
280 AC_CHECK_SIZEOF([int]) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
281 AC_CHECK_SIZEOF([long]) |
16313
6aafe87a3144
use int64_t for idx type if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16297
diff
changeset
|
282 AC_CHECK_SIZEOF([int64_t]) |
5275 | 283 if test $ac_cv_sizeof_void_p -eq 8; then |
16313
6aafe87a3144
use int64_t for idx type if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16297
diff
changeset
|
284 OCTAVE_IDX_TYPE=int64_t |
5275 | 285 else |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
286 warn_64_bit="pointers are not 64-bits wide; disabling 64-bit features" |
14605
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
287 OCTAVE_CONFIGURE_WARNING([warn_64_bit]) |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
288 USE_64_BIT_IDX_T=no |
5275 | 289 fi |
290 fi | |
291 AC_SUBST(OCTAVE_IDX_TYPE) | |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
292 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
|
293 [Define to the type of octave_idx_type (64 or 32 bit signed integer).]) |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
294 if test $USE_64_BIT_IDX_T = yes; then |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
295 AC_DEFINE(USE_64_BIT_IDX_T, 1, |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
296 [Define to 1 if using 64-bit integers for array dimensions and indexing.]) |
5275 | 297 fi |
298 AC_SUBST(USE_64_BIT_IDX_T) | |
299 | |
3215 | 300 ### It seems that there are some broken inline assembly functions in |
301 ### the GNU libc. Since I'm not sure how to test whether we are using | |
302 ### GNU libc, just disable them for all platforms. | |
303 | |
5844 | 304 AC_MSG_NOTICE([defining __NO_MATH_INLINES avoids buggy GNU libc exp function]) |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
305 AC_DEFINE(__NO_MATH_INLINES, 1, |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
306 [Define to 1 if your version of GNU libc has buggy inline assembly code for math functions like exp.]) |
3215 | 307 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
308 ### Determine which C++ compiler to use (we expect to find g++). |
869 | 309 |
405 | 310 AC_PROG_CXX |
311 AC_PROG_CXXCPP | |
869 | 312 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
313 ### Determine which C compiler to use (we expect to find gcc). |
869 | 314 |
5 | 315 AC_PROG_CC |
405 | 316 AC_PROG_CPP |
832 | 317 AC_PROG_GCC_TRADITIONAL |
869 | 318 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
319 ## Check for MSVC |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
320 have_msvc=no |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
321 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
322 msdosmsvc) |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
323 have_msvc=yes |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
324 ;; |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
325 mingw*) |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
326 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
|
327 AC_PREPROC_IFELSE([AC_LANG_SOURCE([[ |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
328 #ifndef _MSC_VER |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
329 #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
|
330 #endif |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
331 ]])], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
332 have_msvc=yes, have_msvc=no) |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
333 AC_MSG_RESULT([$have_msvc]) |
405 | 334 ;; |
5 | 335 esac |
869 | 336 |
15142
f4684192158e
configure.ac: Split gnulib initialization into 2 parts to match recommended usage.
Rik <rik@octave.org>
parents:
15141
diff
changeset
|
337 ### gnulib initialization: part 1 |
f4684192158e
configure.ac: Split gnulib initialization into 2 parts to match recommended usage.
Rik <rik@octave.org>
parents:
15141
diff
changeset
|
338 ### Must take place immediately after a compiler is determined |
9946 | 339 |
340 gl_EARLY | |
341 | |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
342 ### Check version number when using gcc. |
869 | 343 |
15167
1c711a646fa7
Deprecate configure variables CC_VERSION, CXX_VERSION.
Rik <rik@octave.org>
parents:
15166
diff
changeset
|
344 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
|
345 if test "$GCC" = yes; then |
17878
0d660785098e
work around GCC bug in stl_algo.h (nth_element and sort; bug #40436)
John W. Eaton <jwe@octave.org>
parents:
17877
diff
changeset
|
346 AC_MSG_CHECKING([C compiler version number]) |
17661
1978a6c76aa9
Use user-specified SED during build process (bug #40273).
Rik <rik@octave.org>
parents:
17640
diff
changeset
|
347 gcc_version=`$CC -v 2>&1 | $GREP "^.*gcc version" | \ |
1978a6c76aa9
Use user-specified SED during build process (bug #40273).
Rik <rik@octave.org>
parents:
17640
diff
changeset
|
348 $SED -e 's/^.*g.. version *//' -e 's/cygnus-//' -e 's/egcs-//' -e 's/ .*//'` |
15168
66dcad99b55e
configure.ac: Correct GCC_VERSION test to return only version number and no other text.
Rik <rik@octave.org>
parents:
15167
diff
changeset
|
349 |
15170
a44ff4f0a20b
Add AX_COMPARE_VERSION.m4 macro m4/ dir to make configure.ac simpler.
Rik <rik@octave.org>
parents:
15168
diff
changeset
|
350 AX_COMPARE_VERSION([$gcc_version], [lt], [3], |
a44ff4f0a20b
Add AX_COMPARE_VERSION.m4 macro m4/ dir to make configure.ac simpler.
Rik <rik@octave.org>
parents:
15168
diff
changeset
|
351 [warn_gcc_version="gcc version $gcc_version is likely to cause problems" |
a44ff4f0a20b
Add AX_COMPARE_VERSION.m4 macro m4/ dir to make configure.ac simpler.
Rik <rik@octave.org>
parents:
15168
diff
changeset
|
352 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
|
353 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
354 GCC_VERSION=$gcc_version |
17878
0d660785098e
work around GCC bug in stl_algo.h (nth_element and sort; bug #40436)
John W. Eaton <jwe@octave.org>
parents:
17877
diff
changeset
|
355 AC_MSG_RESULT([$GCC_VERSION]) |
1894 | 356 fi |
17877
540d1c122b08
* configure.ac: Also check for g++ version.
John W. Eaton <jwe@octave.org>
parents:
17844
diff
changeset
|
357 AC_SUBST(GCC_VERSION) |
1894 | 358 |
19353
dbde327460be
configure.ac: Remove redundant check for GXX_VERSION. Raise required version to 4.1.
Rik <rik@octave.org>
parents:
19352
diff
changeset
|
359 ### Check version number when using g++ . |
dbde327460be
configure.ac: Remove redundant check for GXX_VERSION. Raise required version to 4.1.
Rik <rik@octave.org>
parents:
19352
diff
changeset
|
360 ### It might be different from the gcc version number. |
17877
540d1c122b08
* configure.ac: Also check for g++ version.
John W. Eaton <jwe@octave.org>
parents:
17844
diff
changeset
|
361 |
540d1c122b08
* configure.ac: Also check for g++ version.
John W. Eaton <jwe@octave.org>
parents:
17844
diff
changeset
|
362 GXX_VERSION= |
540d1c122b08
* configure.ac: Also check for g++ version.
John W. Eaton <jwe@octave.org>
parents:
17844
diff
changeset
|
363 if test "$GXX" = yes; then |
17878
0d660785098e
work around GCC bug in stl_algo.h (nth_element and sort; bug #40436)
John W. Eaton <jwe@octave.org>
parents:
17877
diff
changeset
|
364 AC_MSG_CHECKING([C++ compiler version number]) |
0d660785098e
work around GCC bug in stl_algo.h (nth_element and sort; bug #40436)
John W. Eaton <jwe@octave.org>
parents:
17877
diff
changeset
|
365 gxx_version=`$CXX -v 2>&1 | $GREP "^.*g.. version" | \ |
17877
540d1c122b08
* configure.ac: Also check for g++ version.
John W. Eaton <jwe@octave.org>
parents:
17844
diff
changeset
|
366 $SED -e 's/^.*g.. version *//' -e 's/cygnus-//' -e 's/egcs-//' -e 's/ .*//'` |
540d1c122b08
* configure.ac: Also check for g++ version.
John W. Eaton <jwe@octave.org>
parents:
17844
diff
changeset
|
367 |
19353
dbde327460be
configure.ac: Remove redundant check for GXX_VERSION. Raise required version to 4.1.
Rik <rik@octave.org>
parents:
19352
diff
changeset
|
368 AX_COMPARE_VERSION([$gxx_version], [lt], [4.1], |
17877
540d1c122b08
* configure.ac: Also check for g++ version.
John W. Eaton <jwe@octave.org>
parents:
17844
diff
changeset
|
369 [warn_gxx_version="g++ version $gxx_version is likely to cause problems" |
540d1c122b08
* configure.ac: Also check for g++ version.
John W. Eaton <jwe@octave.org>
parents:
17844
diff
changeset
|
370 OCTAVE_CONFIGURE_WARNING([warn_gxx_version])]) |
540d1c122b08
* configure.ac: Also check for g++ version.
John W. Eaton <jwe@octave.org>
parents:
17844
diff
changeset
|
371 |
540d1c122b08
* configure.ac: Also check for g++ version.
John W. Eaton <jwe@octave.org>
parents:
17844
diff
changeset
|
372 GXX_VERSION=$gxx_version |
17878
0d660785098e
work around GCC bug in stl_algo.h (nth_element and sort; bug #40436)
John W. Eaton <jwe@octave.org>
parents:
17877
diff
changeset
|
373 AC_MSG_RESULT([$GXX_VERSION]) |
17877
540d1c122b08
* configure.ac: Also check for g++ version.
John W. Eaton <jwe@octave.org>
parents:
17844
diff
changeset
|
374 fi |
540d1c122b08
* configure.ac: Also check for g++ version.
John W. Eaton <jwe@octave.org>
parents:
17844
diff
changeset
|
375 AC_SUBST(GXX_VERSION) |
3775 | 376 |
17878
0d660785098e
work around GCC bug in stl_algo.h (nth_element and sort; bug #40436)
John W. Eaton <jwe@octave.org>
parents:
17877
diff
changeset
|
377 OCTAVE_CHECK_BROKEN_STL_ALGO_H |
0d660785098e
work around GCC bug in stl_algo.h (nth_element and sort; bug #40436)
John W. Eaton <jwe@octave.org>
parents:
17877
diff
changeset
|
378 AM_CONDITIONAL([AMCOND_HAVE_BROKEN_STL_ALGO_H], |
0d660785098e
work around GCC bug in stl_algo.h (nth_element and sort; bug #40436)
John W. Eaton <jwe@octave.org>
parents:
17877
diff
changeset
|
379 [test $octave_cv_broken_stl_algo_h = yes]) |
0d660785098e
work around GCC bug in stl_algo.h (nth_element and sort; bug #40436)
John W. Eaton <jwe@octave.org>
parents:
17877
diff
changeset
|
380 |
17888
11a6c7445a71
fix m4 quoting in test and improve warning messages for stl_algo.h problem
John W. Eaton <jwe@octave.org>
parents:
17878
diff
changeset
|
381 if test $octave_cv_broken_stl_algo_h = yes; then |
11a6c7445a71
fix m4 quoting in test and improve warning messages for stl_algo.h problem
John W. Eaton <jwe@octave.org>
parents:
17878
diff
changeset
|
382 warn_stl_algo_h="Found nth_element broken in g++ $GXX_VERSION. Attempting to repair by using local patched version of bits/stl_algo.h." |
11a6c7445a71
fix m4 quoting in test and improve warning messages for stl_algo.h problem
John W. Eaton <jwe@octave.org>
parents:
17878
diff
changeset
|
383 OCTAVE_CONFIGURE_WARNING([warn_stl_algo_h]) |
11a6c7445a71
fix m4 quoting in test and improve warning messages for stl_algo.h problem
John W. Eaton <jwe@octave.org>
parents:
17878
diff
changeset
|
384 fi |
11a6c7445a71
fix m4 quoting in test and improve warning messages for stl_algo.h problem
John W. Eaton <jwe@octave.org>
parents:
17878
diff
changeset
|
385 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
386 ### Determine the compiler flag necessary to create dependencies |
3775 | 387 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
388 ## Assume GCC. |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
389 INCLUDE_DEPS=yes |
3775 | 390 DEPEND_FLAGS="-M" |
391 DEPEND_EXTRA_SED_PATTERN="" | |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
392 if test "$GCC" != yes; then |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
393 case $canonical_host_type in |
6087 | 394 sparc-sun-solaris2* | i386-pc-solaris2*) |
3775 | 395 DEPEND_FLAGS="-xM1" |
396 DEPEND_EXTRA_SED_PATTERN="-e '/\/opt\/SUNWspro/d'" | |
6087 | 397 ;; |
7451 | 398 *-*-msdosmsvc) |
399 ;; | |
10123
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
400 *-*-mingw*) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
401 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
|
402 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
|
403 fi |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
404 ;; |
6087 | 405 *) |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
406 INCLUDE_DEPS=no |
6087 | 407 ;; |
408 esac | |
409 fi | |
410 AC_SUBST(INCLUDE_DEPS) | |
3775 | 411 AC_SUBST(DEPEND_FLAGS) |
412 AC_SUBST(DEPEND_EXTRA_SED_PATTERN) | |
413 | |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
414 ### Check for pthread library |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
415 |
10951 | 416 AX_PTHREAD |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
417 ## Include pthread libs and flags early in case other tests need them. |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
418 ## They seem to be required for the OpenGL tests on Debian systems. |
9970
cc7ea6083774
configure.ac: use pthread flags and libs for tests
John W. Eaton <jwe@octave.org>
parents:
9946
diff
changeset
|
419 LIBS="$PTHREAD_LIBS $LIBS" |
cc7ea6083774
configure.ac: use pthread flags and libs for tests
John W. Eaton <jwe@octave.org>
parents:
9946
diff
changeset
|
420 CFLAGS="$CFLAGS $PTHREAD_CFLAGS" |
15123
4e0ab3b28418
Eliminate duplicate PTHREAD_CFLAGS inclusion in build process.
Rik <rik@octave.org>
parents:
15071
diff
changeset
|
421 CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS" |
8595
dee5d60257e4
Use Carbon framework to determine ScreenSize on Mac.
Thomas Treichl <Thomas.Treichl@gmx.net>
parents:
8577
diff
changeset
|
422 |
9603
8bea4e89326f
implement FLOAT_STORE to allow safer complex comparisons on x87
Jaroslav Hajek <highegg@gmail.com>
parents:
9596
diff
changeset
|
423 ### When compiling math for x87, problems may arise in some code comparing |
17924
82f096e1a805
configure.ac: If not specified, use --enable-float-truncate for MinGW and Cygwin.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
424 ### floating-point intermediate results. The root cause is the extra precision |
82f096e1a805
configure.ac: If not specified, use --enable-float-truncate for MinGW and Cygwin.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
425 ### (~80 bits) of x87 co-processor registers versus the IEEE standard 64 bits. |
82f096e1a805
configure.ac: If not specified, use --enable-float-truncate for MinGW and Cygwin.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
426 ### Generally, storing the result in a local volatile variable forces a |
82f096e1a805
configure.ac: If not specified, use --enable-float-truncate for MinGW and Cygwin.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
427 ### truncation back to 64 bits, but it also degrades performance. |
9603
8bea4e89326f
implement FLOAT_STORE to allow safer complex comparisons on x87
Jaroslav Hajek <highegg@gmail.com>
parents:
9596
diff
changeset
|
428 ### Thus, we provide a FLOAT_TRUNCATE macro that may be defined to "volatile" |
8bea4e89326f
implement FLOAT_STORE to allow safer complex comparisons on x87
Jaroslav Hajek <highegg@gmail.com>
parents:
9596
diff
changeset
|
429 ### when compiling for x87 target, or left empty for modern SSE math, that |
8bea4e89326f
implement FLOAT_STORE to allow safer complex comparisons on x87
Jaroslav Hajek <highegg@gmail.com>
parents:
9596
diff
changeset
|
430 ### doesn't suffer from this problem at all. |
17924
82f096e1a805
configure.ac: If not specified, use --enable-float-truncate for MinGW and Cygwin.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
431 ### FIXME: If no option value is given, configure uses a default heuristic |
82f096e1a805
configure.ac: If not specified, use --enable-float-truncate for MinGW and Cygwin.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
432 ### which assumes that truncation should occur for MinGW and Cygwin |
82f096e1a805
configure.ac: If not specified, use --enable-float-truncate for MinGW and Cygwin.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
433 ### systems and not for any others. It would be marginally nicer |
82f096e1a805
configure.ac: If not specified, use --enable-float-truncate for MinGW and Cygwin.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
434 ### to replace this with a test that checks whether the problem arises |
82f096e1a805
configure.ac: If not specified, use --enable-float-truncate for MinGW and Cygwin.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
435 ### and only sets the flag if necessary. However, the principal |
82f096e1a805
configure.ac: If not specified, use --enable-float-truncate for MinGW and Cygwin.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
436 ### scenario for those two systems is a cross-build where we can't |
82f096e1a805
configure.ac: If not specified, use --enable-float-truncate for MinGW and Cygwin.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
437 ### run an executable so the test wouldn't be too useful most of the |
82f096e1a805
configure.ac: If not specified, use --enable-float-truncate for MinGW and Cygwin.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
438 ### time (only native builds on MinGW and Cygwin *might* benefit). |
82f096e1a805
configure.ac: If not specified, use --enable-float-truncate for MinGW and Cygwin.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
439 ### Maybe, one could generate assembly code with -S option and inspect |
82f096e1a805
configure.ac: If not specified, use --enable-float-truncate for MinGW and Cygwin.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
440 ### it without having to run an executable, but this sounds pretty dicey. |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
441 AC_ARG_ENABLE([float-truncate], |
9603
8bea4e89326f
implement FLOAT_STORE to allow safer complex comparisons on x87
Jaroslav Hajek <highegg@gmail.com>
parents:
9596
diff
changeset
|
442 [AS_HELP_STRING([--enable-float-truncate], |
18142
d9a9e13826e6
configure.ac: Rephrase help message for --enable-float-truncate.
Rik <rik@octave.org>
parents:
18087
diff
changeset
|
443 [truncate intermediate FP results])], |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
444 [if test "$enableval" = yes; then |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
445 ac_float_truncate=volatile |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
446 else |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
447 ac_float_truncate= |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
448 fi], |
17924
82f096e1a805
configure.ac: If not specified, use --enable-float-truncate for MinGW and Cygwin.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
449 [case $host_os in |
82f096e1a805
configure.ac: If not specified, use --enable-float-truncate for MinGW and Cygwin.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
450 mingw* | cygwin*) |
82f096e1a805
configure.ac: If not specified, use --enable-float-truncate for MinGW and Cygwin.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
451 ac_float_truncate=volatile |
82f096e1a805
configure.ac: If not specified, use --enable-float-truncate for MinGW and Cygwin.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
452 ;; |
82f096e1a805
configure.ac: If not specified, use --enable-float-truncate for MinGW and Cygwin.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
453 *) |
82f096e1a805
configure.ac: If not specified, use --enable-float-truncate for MinGW and Cygwin.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
454 ac_float_truncate= |
82f096e1a805
configure.ac: If not specified, use --enable-float-truncate for MinGW and Cygwin.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
455 ;; |
82f096e1a805
configure.ac: If not specified, use --enable-float-truncate for MinGW and Cygwin.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
456 esac]) |
9603
8bea4e89326f
implement FLOAT_STORE to allow safer complex comparisons on x87
Jaroslav Hajek <highegg@gmail.com>
parents:
9596
diff
changeset
|
457 |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
458 AC_DEFINE_UNQUOTED(FLOAT_TRUNCATE, [$ac_float_truncate], |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
459 [Define to volatile if you need to truncate intermediate FP results.]) |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
460 |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
461 ### Determine extra CFLAGS that may be necessary for Octave. |
9603
8bea4e89326f
implement FLOAT_STORE to allow safer complex comparisons on x87
Jaroslav Hajek <highegg@gmail.com>
parents:
9596
diff
changeset
|
462 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
463 ## On Intel systems with gcc, we may need to compile with -mieee-fp |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
464 ## to get full support for IEEE floating point. |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
465 ## |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
466 ## On Alpha/OSF systems, we need -mieee. |
869 | 467 |
3126 | 468 ieee_fp_flag= |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
469 case $canonical_host_type in |
3887 | 470 i[[3456789]]86-*-*) |
5076 | 471 if test "$GCC" = yes; then |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
472 OCTAVE_CC_FLAG([-mieee-fp], [ |
5076 | 473 ieee_fp_flag=-mieee-fp |
474 XTRA_CFLAGS="$XTRA_CFLAGS -mieee-fp" | |
5844 | 475 AC_MSG_NOTICE([adding -mieee-fp to XTRA_CFLAGS])]) |
5076 | 476 fi |
477 if test "$GXX" = yes; then | |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
478 OCTAVE_CXX_FLAG([-mieee-fp], [ |
12451 | 479 ieee_fp_flag=-mieee-fp |
480 XTRA_CXXFLAGS="$XTRA_CXXFLAGS -mieee-fp" | |
481 AC_MSG_NOTICE([adding -mieee-fp to XTRA_CXXFLAGS])]) | |
5076 | 482 fi |
324 | 483 ;; |
3127 | 484 alpha*-*-*) |
4284 | 485 if test "$GCC" = yes; then |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
486 OCTAVE_CC_FLAG([-mieee], [ |
12451 | 487 ieee_fp_flag=-mieee |
488 XTRA_CFLAGS="$XTRA_CFLAGS -mieee" | |
489 AC_MSG_NOTICE([adding -mieee to XTRA_CFLAGS])]) | |
5076 | 490 else |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
491 OCTAVE_CC_FLAG([-ieee], [ |
12451 | 492 ieee_fp_flag=-ieee |
493 XTRA_CFLAGS="$XTRA_CFLAGS -ieee" | |
494 AC_MSG_NOTICE([adding -ieee to XTRA_CFLAGS])]) | |
5076 | 495 fi |
496 if test "$GXX" = yes; then | |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
497 OCTAVE_CXX_FLAG([-mieee], [ |
12451 | 498 ieee_fp_flag=-mieee |
499 XTRA_CXXFLAGS="$XTRA_CXXFLAGS -mieee" | |
500 AC_MSG_NOTICE([adding -mieee to XTRA_CXXFLAGS])]) | |
4284 | 501 else |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
502 OCTAVE_CXX_FLAG([-ieee], [ |
12451 | 503 ieee_fp_flag=-ieee |
504 XTRA_CXXFLAGS="$XTRA_CXXFLAGS -ieee" | |
505 AC_MSG_NOTICE([adding -ieee to XTRA_CXXFLAGS])]) | |
4284 | 506 fi |
2020 | 507 ;; |
3176 | 508 *ibm-aix4*) |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
509 OCTAVE_CC_FLAG([-mminimal-toc], [ |
3351 | 510 XTRA_CFLAGS="$XTRA_CFLAGS -mminimal-toc"]) |
3176 | 511 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
512 OCTAVE_CXX_FLAG([-mminimal-toc], [ |
3351 | 513 XTRA_CXXFLAGS="$XTRA_CXXFLAGS -mminimal-toc"]) |
3176 | 514 ;; |
324 | 515 esac |
3126 | 516 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
517 AC_SUBST(XTRA_CFLAGS) |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
518 AC_SUBST(XTRA_CXXFLAGS) |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
519 |
19816
81078b0e39e8
build: Enable OpenMP by default, remove experimental warning (bug #42176)
Mike Miller <mtmiller@ieee.org>
parents:
19801
diff
changeset
|
520 ### Test whether the compiler supports OpenMP. This is enabled by default |
81078b0e39e8
build: Enable OpenMP by default, remove experimental warning (bug #42176)
Mike Miller <mtmiller@ieee.org>
parents:
19801
diff
changeset
|
521 ### now to allow the option of using OpenMP in loadable modules. |
81078b0e39e8
build: Enable OpenMP by default, remove experimental warning (bug #42176)
Mike Miller <mtmiller@ieee.org>
parents:
19801
diff
changeset
|
522 |
81078b0e39e8
build: Enable OpenMP by default, remove experimental warning (bug #42176)
Mike Miller <mtmiller@ieee.org>
parents:
19801
diff
changeset
|
523 USE_OPENMP=yes |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
524 AC_ARG_ENABLE([openmp], |
19816
81078b0e39e8
build: Enable OpenMP by default, remove experimental warning (bug #42176)
Mike Miller <mtmiller@ieee.org>
parents:
19801
diff
changeset
|
525 [AS_HELP_STRING([--disable-openmp], |
81078b0e39e8
build: Enable OpenMP by default, remove experimental warning (bug #42176)
Mike Miller <mtmiller@ieee.org>
parents:
19801
diff
changeset
|
526 [disable OpenMP SMP multi-threading])], |
81078b0e39e8
build: Enable OpenMP by default, remove experimental warning (bug #42176)
Mike Miller <mtmiller@ieee.org>
parents:
19801
diff
changeset
|
527 [if test "$enableval" = no; then USE_OPENMP=no; fi], []) |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
528 if test $USE_OPENMP = yes; then |
19816
81078b0e39e8
build: Enable OpenMP by default, remove experimental warning (bug #42176)
Mike Miller <mtmiller@ieee.org>
parents:
19801
diff
changeset
|
529 AC_LANG_PUSH(C) |
81078b0e39e8
build: Enable OpenMP by default, remove experimental warning (bug #42176)
Mike Miller <mtmiller@ieee.org>
parents:
19801
diff
changeset
|
530 AX_OPENMP |
81078b0e39e8
build: Enable OpenMP by default, remove experimental warning (bug #42176)
Mike Miller <mtmiller@ieee.org>
parents:
19801
diff
changeset
|
531 AC_LANG_POP(C) |
81078b0e39e8
build: Enable OpenMP by default, remove experimental warning (bug #42176)
Mike Miller <mtmiller@ieee.org>
parents:
19801
diff
changeset
|
532 AC_LANG_PUSH(C++) |
81078b0e39e8
build: Enable OpenMP by default, remove experimental warning (bug #42176)
Mike Miller <mtmiller@ieee.org>
parents:
19801
diff
changeset
|
533 AX_OPENMP |
81078b0e39e8
build: Enable OpenMP by default, remove experimental warning (bug #42176)
Mike Miller <mtmiller@ieee.org>
parents:
19801
diff
changeset
|
534 AC_LANG_POP(C++) |
19828
13bc2737177c
Fix incorrect reporting of OpenMP use by configure (bug #44346).
Rik <rik@octave.org>
parents:
19825
diff
changeset
|
535 if test -n "$OPENMP_CFLAGS" && test -n "OPENMP_CXXFLAGS"; then |
13bc2737177c
Fix incorrect reporting of OpenMP use by configure (bug #44346).
Rik <rik@octave.org>
parents:
19825
diff
changeset
|
536 CFLAGS="$CFLAGS $OPENMP_CFLAGS" |
13bc2737177c
Fix incorrect reporting of OpenMP use by configure (bug #44346).
Rik <rik@octave.org>
parents:
19825
diff
changeset
|
537 CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS" |
13bc2737177c
Fix incorrect reporting of OpenMP use by configure (bug #44346).
Rik <rik@octave.org>
parents:
19825
diff
changeset
|
538 else |
13bc2737177c
Fix incorrect reporting of OpenMP use by configure (bug #44346).
Rik <rik@octave.org>
parents:
19825
diff
changeset
|
539 USE_OPENMP=no |
13bc2737177c
Fix incorrect reporting of OpenMP use by configure (bug #44346).
Rik <rik@octave.org>
parents:
19825
diff
changeset
|
540 fi |
10471
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10456
diff
changeset
|
541 fi |
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10456
diff
changeset
|
542 |
4094 | 543 ### Defaults for cross compiling. BUILD_CC and BUILD_CXX are |
544 ### the compilers that we use for building tools on the build system. | |
4098 | 545 ### For now, we assume that the only cross compiling we can do is |
4298 | 546 ### with gcc on a Unixy system, but the dedicated hacker can override these. |
4094 | 547 |
548 if test "$cross_compiling" = yes; then | |
549 BUILD_CC="gcc" | |
550 BUILD_CFLAGS="-O2 -g" | |
551 BUILD_CXX="g++" | |
552 BUILD_CXXFLAGS="-O2 -g" | |
4298 | 553 BUILD_LDFLAGS="" |
4098 | 554 BUILD_EXEEXT="" |
4094 | 555 else |
4298 | 556 BUILD_CC='$(CC)' |
557 BUILD_CFLAGS='$(CFLAGS)' | |
558 BUILD_CXX='$(CXX)' | |
559 BUILD_CXXFLAGS='$(CXXFLAGS)' | |
560 BUILD_LDFLAGS='$(LDFLAGS)' | |
561 BUILD_EXEEXT='$(EXEEXT)' | |
4094 | 562 fi |
563 | |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
564 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
|
565 [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
|
566 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
|
567 [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
|
568 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
|
569 [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
|
570 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
|
571 [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
|
572 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
|
573 [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
|
574 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
|
575 [build system executable extension (used if cross compiling)]) |
3222 | 576 |
3232 | 577 |
578 ### Look for math library. If found, this will add -lm to LIBS. | |
579 | |
15875
c18692212b90
configure.ac: Simplify test for math library.
Rik <rik@octave.org>
parents:
15874
diff
changeset
|
580 dnl Keep this check before the check for the Fortran compiler, |
c18692212b90
configure.ac: Simplify test for math library.
Rik <rik@octave.org>
parents:
15874
diff
changeset
|
581 dnl in case -lm is needed to compile Fortran programs. |
c18692212b90
configure.ac: Simplify test for math library.
Rik <rik@octave.org>
parents:
15874
diff
changeset
|
582 AC_CHECK_LIB(m, sin) |
3232 | 583 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
584 ### Determine the Fortran compiler and how to invoke it |
3232 | 585 |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
586 ## Default FFLAGS is -O. |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
587 if test x"$FFLAGS" = x""; then |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
588 FFLAGS="-O" |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
589 fi |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
590 |
19364 | 591 ## Prefer gfortran, but the user's F77 environment variable will override. |
592 AC_PROG_F77([gfortran]) | |
593 if test -z "$F77"; then | |
594 ## No gfortran found, search for any other installed compiler. | |
595 AC_PROG_F77 | |
596 fi | |
597 if test "$F77" = g77; then | |
598 AC_MSG_ERROR([g77 is not a supported Fortran compiler. Select another compiler by setting the environment variable F77 and re-running configure.]) | |
599 fi | |
600 | |
601 ## Determine calling conventions for Fortran compiler | |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
602 AC_F77_LIBRARY_LDFLAGS |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
603 AC_F77_DUMMY_MAIN |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
604 AC_F77_WRAPPERS |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
605 |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
606 F77_TOLOWER=yes |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
607 F77_APPEND_UNDERSCORE=yes |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
608 F77_APPEND_EXTRA_UNDERSCORE=yes |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
609 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
610 case $ac_cv_f77_mangling in |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
611 "upper case") F77_TOLOWER=no ;; |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
612 esac |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
613 case $ac_cv_f77_mangling in |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
614 "no underscore") F77_APPEND_UNDERSCORE=no ;; |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
615 esac |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
616 case $ac_cv_f77_mangling in |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
617 "no extra underscore") F77_APPEND_EXTRA_UNDERSCORE=no ;; |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
618 esac |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
619 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
620 case $canonical_host_type in |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
621 i[[3456789]]86-*-*) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
622 if test $ac_cv_f77_compiler_gnu = yes; then |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
623 OCTAVE_F77_FLAG([-mieee-fp]) |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
624 fi |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
625 ;; |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
626 alpha*-*-*) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
627 if test $ac_cv_f77_compiler_gnu = yes; then |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
628 OCTAVE_F77_FLAG([-mieee]) |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
629 else |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
630 OCTAVE_F77_FLAG([-ieee]) |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
631 OCTAVE_F77_FLAG([-fpe1]) |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
632 fi |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
633 ;; |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
634 powerpc-apple-machten*) |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
635 FFLAGS= |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
636 ;; |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
637 esac |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
638 |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
639 if test -n "$FFLAGS"; then |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
640 AC_MSG_NOTICE([defining FFLAGS to be $FFLAGS]) |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
641 fi |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
642 |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
643 AC_SUBST(F77_TOLOWER) |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
644 AC_SUBST(F77_APPEND_UNDERSCORE) |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
645 AC_SUBST(F77_APPEND_EXTRA_UNDERSCORE) |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
646 |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
647 if test -z "$F77"; then |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
648 AC_MSG_ERROR([in order to build Octave, you must have a compatible Fortran compiler or wrapper script for f2c that functions as a Fortran compiler installed and in your path. See the file INSTALL for more information.]) |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
649 fi |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
650 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
651 OCTAVE_CHECK_FUNC_FORTRAN_ISNAN |
14550
bc4c574ab3b6
Add configure check for isnan in fortran.
Carlo de Falco <cdf@users.sourceforge.net>
parents:
14398
diff
changeset
|
652 F77_ISNAN_MACRO= |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
653 if test $octave_cv_func_fortran_isnan = no; then |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
654 AC_MSG_NOTICE([substituting ISNAN(X) with X.NE.X in Fortran sources]) |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
655 F77_ISNAN_MACRO="s|ISNAN(\(@<:@^)@:>@*\))|(\1.NE.\1)|" |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
656 fi |
14550
bc4c574ab3b6
Add configure check for isnan in fortran.
Carlo de Falco <cdf@users.sourceforge.net>
parents:
14398
diff
changeset
|
657 AC_SUBST(F77_ISNAN_MACRO) |
bc4c574ab3b6
Add configure check for isnan in fortran.
Carlo de Falco <cdf@users.sourceforge.net>
parents:
14398
diff
changeset
|
658 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
659 OCTAVE_CHECK_SIZEOF_FORTRAN_INTEGER |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
660 if test $octave_cv_sizeof_fortran_integer = no; then |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
661 if test $USE_64_BIT_IDX_T = yes; then |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
662 case $F77 in |
10331
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
663 *gfortran*) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
664 case $F77_INTEGER_8_FLAG in |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
665 *-fdefault-integer-8*) |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
666 ;; |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
667 *) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
668 case $FFLAGS in |
10331
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
669 *-fdefault-integer-8*) |
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
670 AC_MSG_NOTICE([setting -fdefault-integer-8 in F77_INTEGER_8_FLAG instead of FFLAGS]) |
17661
1978a6c76aa9
Use user-specified SED during build process (bug #40273).
Rik <rik@octave.org>
parents:
17640
diff
changeset
|
671 FFLAGS=`echo $FFLAGS | $SED 's/-fdefault-integer-8//g'` |
10331
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
672 F77_INTEGER_8_FLAG="-fdefault-integer-8" |
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
673 ;; |
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
674 *) |
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
675 AC_MSG_NOTICE([adding -fdefault-integer-8 to F77_INTEGER_8_FLAG]) |
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
676 F77_INTEGER_8_FLAG="-fdefault-integer-8" |
12451 | 677 ## Invalidate the cache and try again. |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
678 $as_unset octave_cv_sizeof_fortran_integer |
10331
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
679 ;; |
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
680 esac |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
681 ;; |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
682 esac |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
683 ;; |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
684 esac |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
685 if test -z "$octave_cv_sizeof_fortran_integer"; then |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
686 OCTAVE_CHECK_SIZEOF_FORTRAN_INTEGER |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
687 fi |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
688 if test $octave_cv_sizeof_fortran_integer = no; then |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
689 AC_MSG_ERROR([in order to build Octave with 64-bit indexing support your Fortran compiler must have an option for setting the default integer size to 8 bytes. See the file INSTALL for more information.]) |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
690 fi |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
691 else |
10331
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
692 AC_MSG_ERROR([your Fortran compiler must have an option to make integers the same size as octave_idx_type ($OCTAVE_IDX_TYPE). See the file INSTALL for more information.]) |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
693 fi |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
694 fi |
10331
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
695 AC_SUBST(F77_INTEGER_8_FLAG) |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
696 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
697 OCTAVE_F77_FLAG([-ffloat-store], [ |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
698 AC_MSG_RESULT([setting F77_FLOAT_STORE_FLAG to -ffloat-store]) |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
699 F77_FLOAT_STORE_FLAG=-ffloat-store |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
700 AC_SUBST(F77_FLOAT_STORE_FLAG) |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
701 ]) |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
702 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
703 ### Check for the Qhull library |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
704 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
705 OCTAVE_CHECK_LIB(qhull, QHull, |
19351
2d8728156ba4
configure.ac: Check qhull warning message style to match all other libs.
Rik <rik@octave.org>
parents:
19350
diff
changeset
|
706 [Qhull library not found. This will result in loss of functionality of some geometry functions.], |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
707 [libqhull/libqhull.h qhull/libqhull.h libqhull.h qhull/qhull.h qhull.h], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
708 [qh_qhull], [], [], |
9519
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
709 [warn_qhull= |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
710 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
|
711 OCTAVE_CHECK_LIB_QHULL_OK( |
19355
22289e6e316e
build: Remove unused TEXINFO_LIBNAME definitions from Makefiles.
Rik <rik@octave.org>
parents:
19353
diff
changeset
|
712 [AC_DEFINE(HAVE_QHULL, 1, [Define to 1 if Qhull is available.])], |
19351
2d8728156ba4
configure.ac: Check qhull warning message style to match all other libs.
Rik <rik@octave.org>
parents:
19350
diff
changeset
|
713 [warn_qhull="Qhull library found, but does not seem to work properly. This will result in loss of functionality of some geometry functions. Please try recompiling the library with -fno-strict-aliasing."])]) |
6855 | 714 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
715 ### Check for PCRE regex library. |
12464
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
716 |
17821
82c94987abc6
build: Remove REGEX_CPPFLAGS from XTRA_CXXFLAGS.
Rik <rik@octave.org>
parents:
17820
diff
changeset
|
717 PCRE_LIBS= |
12464
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
718 |
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
719 pcre_fail_msg="to build Octave, you must have the PCRE library and header files installed" |
7173 | 720 |
14025
9867be070ee1
use pcre/pcre.h if it is present
John W. Eaton <jwe@octave.org>
parents:
13985
diff
changeset
|
721 AC_CHECK_HEADERS([pcre.h pcre/pcre.h]) |
9867be070ee1
use pcre/pcre.h if it is present
John W. Eaton <jwe@octave.org>
parents:
13985
diff
changeset
|
722 |
12464
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
723 AC_CACHE_CHECK([whether pcre.h defines the macros we need], |
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
724 [ac_cv_pcre_h_macros_present], |
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
725 [AC_EGREP_CPP([PCRE_HAS_MACROS_WE_NEED], [ |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
726 #if defined (HAVE_PCRE_H) |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
727 # include <pcre.h> |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
728 #elif defined (HAVE_PCRE_PCRE_H) |
15523
bf466a60651f
maint: periodic merge of stable to default
Jordi Gutiérrez Hermoso <jordigh@octave.org>
diff
changeset
|
729 # include <pcre/pcre.h> |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
730 #error "NO PCRE HEADER" |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
731 #endif |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
732 #if defined (PCRE_INFO_NAMECOUNT) \ |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
733 && defined (PCRE_INFO_NAMEENTRYSIZE) \ |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
734 && defined (PCRE_INFO_NAMETABLE) |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
735 PCRE_HAS_MACROS_WE_NEED |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
736 #endif], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
737 ac_cv_pcre_h_macros_present=yes, ac_cv_pcre_h_macros_present=no)]) |
7169 | 738 |
12464
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
739 if test $ac_cv_pcre_h_macros_present = yes; then |
17821
82c94987abc6
build: Remove REGEX_CPPFLAGS from XTRA_CXXFLAGS.
Rik <rik@octave.org>
parents:
17820
diff
changeset
|
740 ## check for pcre-config, and if so, get build variables |
12464
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
741 AC_CHECK_PROG(HAVE_PCRE_CONFIG, pcre-config, [yes], [no]) |
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
742 if test $HAVE_PCRE_CONFIG = yes; then |
17821
82c94987abc6
build: Remove REGEX_CPPFLAGS from XTRA_CXXFLAGS.
Rik <rik@octave.org>
parents:
17820
diff
changeset
|
743 PCRE_CPPFLAGS=`pcre-config --cflags` |
82c94987abc6
build: Remove REGEX_CPPFLAGS from XTRA_CXXFLAGS.
Rik <rik@octave.org>
parents:
17820
diff
changeset
|
744 PCRE_LIBS=`pcre-config --libs` |
7173 | 745 else |
17821
82c94987abc6
build: Remove REGEX_CPPFLAGS from XTRA_CXXFLAGS.
Rik <rik@octave.org>
parents:
17820
diff
changeset
|
746 PCRE_LIBS="-lpcre" |
7173 | 747 fi |
8621
f1534e248260
configure.in: check for pcre_compile, don't check for other regex functions if pcre library is found
John W. Eaton <jwe@octave.org>
parents:
8618
diff
changeset
|
748 save_LIBS="$LIBS" |
17821
82c94987abc6
build: Remove REGEX_CPPFLAGS from XTRA_CXXFLAGS.
Rik <rik@octave.org>
parents:
17820
diff
changeset
|
749 LIBS="$PCRE_LIBS $LIBS" |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
750 AC_CHECK_FUNCS([pcre_compile], |
17821
82c94987abc6
build: Remove REGEX_CPPFLAGS from XTRA_CXXFLAGS.
Rik <rik@octave.org>
parents:
17820
diff
changeset
|
751 [AC_SUBST(PCRE_CPPFLAGS) |
82c94987abc6
build: Remove REGEX_CPPFLAGS from XTRA_CXXFLAGS.
Rik <rik@octave.org>
parents:
17820
diff
changeset
|
752 AC_SUBST(PCRE_LIBS)], |
12464
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
753 [AC_MSG_ERROR([$pcre_fail_msg])]) |
8621
f1534e248260
configure.in: check for pcre_compile, don't check for other regex functions if pcre library is found
John W. Eaton <jwe@octave.org>
parents:
8618
diff
changeset
|
754 LIBS="$save_LIBS" |
7174 | 755 else |
12464
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
756 AC_MSG_ERROR([$pcre_fail_msg]) |
6133 | 757 fi |
7169 | 758 |
5270 | 759 ### Check for ZLIB library. |
3820 | 760 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
761 OCTAVE_CHECK_LIB(z, ZLIB, |
9538
d0239bddf621
use OCTAVE_CHECK_LIB to check for zlib
John W. Eaton <jwe@octave.org>
parents:
9536
diff
changeset
|
762 [ZLIB library not found. Octave will not be able to save or load compressed data files or HDF5 files.], |
d0239bddf621
use OCTAVE_CHECK_LIB to check for zlib
John W. Eaton <jwe@octave.org>
parents:
9536
diff
changeset
|
763 [zlib.h], [gzclearerr]) |
3687 | 764 |
16332
5293cee91891
conditionally define HAVE_FFTW and HAVE_ZLIB in config.h
John W. Eaton <jwe@octave.org>
parents:
16330
diff
changeset
|
765 ### Also define HAVE_ZLIB if libz is found. |
19349
043440fa7006
configure.ac: Respect without-z and without-qrupdate options when config.cache exists.
Rik <rik@octave.org>
parents:
19344
diff
changeset
|
766 if test -z "$warn_z"; then |
16332
5293cee91891
conditionally define HAVE_FFTW and HAVE_ZLIB in config.h
John W. Eaton <jwe@octave.org>
parents:
16330
diff
changeset
|
767 AC_DEFINE(HAVE_ZLIB, 1, [Define to 1 if ZLIB is available.]) |
5293cee91891
conditionally define HAVE_FFTW and HAVE_ZLIB in config.h
John W. Eaton <jwe@octave.org>
parents:
16330
diff
changeset
|
768 fi |
5293cee91891
conditionally define HAVE_FFTW and HAVE_ZLIB in config.h
John W. Eaton <jwe@octave.org>
parents:
16330
diff
changeset
|
769 |
17164 | 770 ### Check for the LLVM library |
15001
894cf2c07f92
Properly restore compiler and linker flags after llvm tests
Carlo de Falco <cdf@users.sourceforge.net>
parents:
14994
diff
changeset
|
771 |
18272
0ab9c475300a
build: Don't build JIT by default (bug #41213)
Rik <rik@octave.org>
parents:
18266
diff
changeset
|
772 build_jit=no |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
773 AC_ARG_ENABLE([jit], |
15308
a4d7909c4edb
configure.ac: Disable JIT compilation by default. Added --enable-jit to compile JIT.
Rik <rik@octave.org>
parents:
15306
diff
changeset
|
774 [AS_HELP_STRING([--enable-jit], |
a4d7909c4edb
configure.ac: Disable JIT compilation by default. Added --enable-jit to compile JIT.
Rik <rik@octave.org>
parents:
15306
diff
changeset
|
775 [(EXPERIMENTAL) enable JIT compiler])], |
18272
0ab9c475300a
build: Don't build JIT by default (bug #41213)
Rik <rik@octave.org>
parents:
18266
diff
changeset
|
776 [if test "$enableval" = yes; then |
0ab9c475300a
build: Don't build JIT by default (bug #41213)
Rik <rik@octave.org>
parents:
18266
diff
changeset
|
777 build_jit=yes |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
778 fi], |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
779 []) |
14932
1f914446157d
Locate and link with LLVM properly
Max Brister <max@2bass.com>
parents:
14931
diff
changeset
|
780 |
14990
149d1e2224f0
configure.ac: llvm include goes in CPPFLAGS not CXXFLAGS
Max Brister <max@2bass.com>
parents:
14956
diff
changeset
|
781 LLVM_CXXFLAGS= |
14899 | 782 LLVM_CPPFLAGS= |
783 LLVM_LDFLAGS= | |
784 LLVM_LIBS= | |
785 | |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
786 if test $build_jit = yes; then |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
787 |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
788 ## Find llvm-config program from environment variable or by searching |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
789 AC_ARG_VAR([LLVM_CONFIG], [path to llvm-config utility]) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
790 AC_CHECK_PROG([LLVM_CONFIG], llvm-config, llvm-config, []) |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
791 |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
792 if test -z "$LLVM_CONFIG"; then |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
793 warn_llvm="llvm-config utility not found. JIT compiler is disabled." |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
794 else |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
795 dnl Preset warning message in case compile fails |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
796 warn_llvm="LLVM was not found or is to old. JIT compiler is disabled." |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
797 |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
798 save_CPPFLAGS="$CPPFLAGS" |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
799 save_CXXFLAGS="$CXXFLAGS" |
17387
2b4ed68be0d5
Allow shared libs for LLVM (Bug #38654)
John Donoghue <john.donoghue@ieee.org>
parents:
17376
diff
changeset
|
800 save_LDFLAGS="$LDFLAGS" |
14994
bbc825cb2ea0
Use -I instead of -isystem if -isystem is not avaiable
Max Brister <max@2bass.com>
parents:
14993
diff
changeset
|
801 |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
802 ## Use -isystem if available because we don't want to see warnings in LLVM |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
803 LLVM_INCLUDE_FLAG=-I |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
804 OCTAVE_CC_FLAG([-isystem .], [ |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
805 LLVM_INCLUDE_FLAG=-isystem |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
806 AC_MSG_NOTICE([using -isystem for LLVM headers])]) |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
807 |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
808 dnl Use -isystem so we don't get warnings from llvm headers |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
809 LLVM_CPPFLAGS="$LLVM_INCLUDE_FLAG `$LLVM_CONFIG --includedir`" |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
810 LLVM_CXXFLAGS= |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
811 LLVM_LDFLAGS="-L`$LLVM_CONFIG --libdir`" |
17387
2b4ed68be0d5
Allow shared libs for LLVM (Bug #38654)
John Donoghue <john.donoghue@ieee.org>
parents:
17376
diff
changeset
|
812 |
2b4ed68be0d5
Allow shared libs for LLVM (Bug #38654)
John Donoghue <john.donoghue@ieee.org>
parents:
17376
diff
changeset
|
813 |
2b4ed68be0d5
Allow shared libs for LLVM (Bug #38654)
John Donoghue <john.donoghue@ieee.org>
parents:
17376
diff
changeset
|
814 LDFLAGS="$LDFLAGS $LLVM_LDFLAGS" |
2b4ed68be0d5
Allow shared libs for LLVM (Bug #38654)
John Donoghue <john.donoghue@ieee.org>
parents:
17376
diff
changeset
|
815 LLVM_SO=LLVM-`$LLVM_CONFIG --version` |
2b4ed68be0d5
Allow shared libs for LLVM (Bug #38654)
John Donoghue <john.donoghue@ieee.org>
parents:
17376
diff
changeset
|
816 AC_CHECK_LIB([$LLVM_SO], [LLVMBuildAdd], [LLVM_LIBS="-l$LLVM_SO"], [LLVM_LIBS=`$LLVM_CONFIG --libs`]) |
14994
bbc825cb2ea0
Use -I instead of -isystem if -isystem is not avaiable
Max Brister <max@2bass.com>
parents:
14993
diff
changeset
|
817 |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
818 dnl |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
819 dnl Define some extra flags that LLVM requires in order to include headers. |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
820 dnl Ideally we should get these from llvm-config, but llvm-config isn't |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
821 dnl very helpful. |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
822 dnl |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
823 CPPFLAGS="-D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS $LLVM_CPPFLAGS $CPPFLAGS" |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
824 CXXFLAGS="$LLVM_CXXFLAGS $CXXFLAGS" |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
825 AC_LANG_PUSH(C++) |
17820
3488d987eb50
build: Remove LLVM_(CPPFLAGS|CXXFLAGS) from XTRA_CXXFLAGS.
Rik <rik@octave.org>
parents:
17819
diff
changeset
|
826 AC_CHECK_HEADER([llvm/Support/TargetSelect.h], [warn_llvm=""]) |
17196
bc20614022aa
build: Redo LLVM macros to disable JIT rather than stop build if headers not found.
Rik <rik@octave.org>
parents:
17180
diff
changeset
|
827 |
bc20614022aa
build: Redo LLVM macros to disable JIT rather than stop build if headers not found.
Rik <rik@octave.org>
parents:
17180
diff
changeset
|
828 have_function_h=no |
bc20614022aa
build: Redo LLVM macros to disable JIT rather than stop build if headers not found.
Rik <rik@octave.org>
parents:
17180
diff
changeset
|
829 AC_CHECK_HEADERS([llvm/IR/Function.h llvm/Function.h], |
bc20614022aa
build: Redo LLVM macros to disable JIT rather than stop build if headers not found.
Rik <rik@octave.org>
parents:
17180
diff
changeset
|
830 [have_function_h=yes; break]) |
bc20614022aa
build: Redo LLVM macros to disable JIT rather than stop build if headers not found.
Rik <rik@octave.org>
parents:
17180
diff
changeset
|
831 if test $have_function_h = no; then |
bc20614022aa
build: Redo LLVM macros to disable JIT rather than stop build if headers not found.
Rik <rik@octave.org>
parents:
17180
diff
changeset
|
832 warn_llvm="Missing LLVM file Function.h. JIT compiler is disabled." |
bc20614022aa
build: Redo LLVM macros to disable JIT rather than stop build if headers not found.
Rik <rik@octave.org>
parents:
17180
diff
changeset
|
833 fi |
bc20614022aa
build: Redo LLVM macros to disable JIT rather than stop build if headers not found.
Rik <rik@octave.org>
parents:
17180
diff
changeset
|
834 have_irbuilder_h=no |
bc20614022aa
build: Redo LLVM macros to disable JIT rather than stop build if headers not found.
Rik <rik@octave.org>
parents:
17180
diff
changeset
|
835 AC_CHECK_HEADERS([llvm/Support/IRBuilder.h llvm/IR/IRBuilder.h \ |
bc20614022aa
build: Redo LLVM macros to disable JIT rather than stop build if headers not found.
Rik <rik@octave.org>
parents:
17180
diff
changeset
|
836 llvm/IRBuilder.h], [have_irbuilder_h=yes; break]) |
bc20614022aa
build: Redo LLVM macros to disable JIT rather than stop build if headers not found.
Rik <rik@octave.org>
parents:
17180
diff
changeset
|
837 if test $have_irbuilder_h = no; then |
bc20614022aa
build: Redo LLVM macros to disable JIT rather than stop build if headers not found.
Rik <rik@octave.org>
parents:
17180
diff
changeset
|
838 warn_llvm="Missing LLVM file IRBuilder.h. JIT compiler is disabled." |
bc20614022aa
build: Redo LLVM macros to disable JIT rather than stop build if headers not found.
Rik <rik@octave.org>
parents:
17180
diff
changeset
|
839 fi |
bc20614022aa
build: Redo LLVM macros to disable JIT rather than stop build if headers not found.
Rik <rik@octave.org>
parents:
17180
diff
changeset
|
840 have_llvm_data_h=no |
bc20614022aa
build: Redo LLVM macros to disable JIT rather than stop build if headers not found.
Rik <rik@octave.org>
parents:
17180
diff
changeset
|
841 AC_CHECK_HEADERS([llvm/Target/TargetData.h llvm/IR/DataLayout.h \ |
bc20614022aa
build: Redo LLVM macros to disable JIT rather than stop build if headers not found.
Rik <rik@octave.org>
parents:
17180
diff
changeset
|
842 llvm/DataLayout.h], [have_llvm_data_h=yes; break]) |
bc20614022aa
build: Redo LLVM macros to disable JIT rather than stop build if headers not found.
Rik <rik@octave.org>
parents:
17180
diff
changeset
|
843 if test $have_llvm_data_h = no; then |
bc20614022aa
build: Redo LLVM macros to disable JIT rather than stop build if headers not found.
Rik <rik@octave.org>
parents:
17180
diff
changeset
|
844 warn_llvm="Missing LLVM file TargetData.h. JIT compiler is disabled." |
bc20614022aa
build: Redo LLVM macros to disable JIT rather than stop build if headers not found.
Rik <rik@octave.org>
parents:
17180
diff
changeset
|
845 fi |
bc20614022aa
build: Redo LLVM macros to disable JIT rather than stop build if headers not found.
Rik <rik@octave.org>
parents:
17180
diff
changeset
|
846 |
18831
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18586
diff
changeset
|
847 AC_CHECK_HEADERS([llvm/IR/Verifier.h]) |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18586
diff
changeset
|
848 |
17031
38bcfd413db0
Handle LLVM API incoherence. Octave now works with LLVM 3.0, 3.1, and 3.2
LYH <lyh.kernel@gmail.com>
parents:
16961
diff
changeset
|
849 OCTAVE_LLVM_FUNCTION_ADDATTRIBUTE_API |
38bcfd413db0
Handle LLVM API incoherence. Octave now works with LLVM 3.0, 3.1, and 3.2
LYH <lyh.kernel@gmail.com>
parents:
16961
diff
changeset
|
850 OCTAVE_LLVM_FUNCTION_ADDFNATTR_API |
38bcfd413db0
Handle LLVM API incoherence. Octave now works with LLVM 3.0, 3.1, and 3.2
LYH <lyh.kernel@gmail.com>
parents:
16961
diff
changeset
|
851 OCTAVE_LLVM_CALLINST_ADDATTRIBUTE_API |
18831
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18586
diff
changeset
|
852 OCTAVE_LLVM_RAW_FD_OSTREAM_API |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18586
diff
changeset
|
853 OCTAVE_LLVM_LEGACY_PASSMANAGER_API |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
854 AC_LANG_POP(C++) |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
855 CPPFLAGS="$save_CPPFLAGS" |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
856 CXXFLAGS="$save_CXXFLAGS" |
17387
2b4ed68be0d5
Allow shared libs for LLVM (Bug #38654)
John Donoghue <john.donoghue@ieee.org>
parents:
17376
diff
changeset
|
857 LDFLAGS="$save_LDFLAGS" |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
858 fi |
14993
06f2e9bdade6
configure.ac: Skip compiling JIT if LLVM_CONFIG is not specified
Max Brister <max@2bass.com>
parents:
14990
diff
changeset
|
859 |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
860 if test -z "$warn_llvm"; then |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
861 AC_DEFINE(HAVE_LLVM, 1, [Define to 1 if LLVM is available.]) |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
862 else |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
863 build_jit=no |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
864 LLVM_CPPFLAGS= |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
865 LLVM_CXXFLAGS= |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
866 LLVM_LDFLAGS= |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
867 LLVM_LIBS= |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
868 OCTAVE_CONFIGURE_WARNING([warn_llvm]) |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
869 fi |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
870 dnl FIXME: Re-instate when JIT is enabled by default |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
871 dnl else |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
872 dnl ## JIT build disabled |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
873 dnl warn_llvm="JIT compiler disabled, some performance loss for loops" |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
874 dnl OCTAVE_CONFIGURE_WARNING([warn_llvm]) |
14899 | 875 fi |
876 | |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
877 AC_SUBST(LLVM_CPPFLAGS) |
14990
149d1e2224f0
configure.ac: llvm include goes in CPPFLAGS not CXXFLAGS
Max Brister <max@2bass.com>
parents:
14956
diff
changeset
|
878 AC_SUBST(LLVM_CXXFLAGS) |
14899 | 879 AC_SUBST(LLVM_LDFLAGS) |
880 AC_SUBST(LLVM_LIBS) | |
18338
7a1a71e3f328
configure.ac: Fix broken build with AMCOND_HAVE_LLVM.
Rik <rik@octave.org>
parents:
18328
diff
changeset
|
881 AM_CONDITIONAL([AMCOND_HAVE_LLVM], [test -z "$warn_llvm"]) |
14899 | 882 |
9538
d0239bddf621
use OCTAVE_CHECK_LIB to check for zlib
John W. Eaton <jwe@octave.org>
parents:
9536
diff
changeset
|
883 ### Check for HDF5 library. |
5270 | 884 |
9542
f5ec5dc66824
use OCTAVE_CHECK_LIBRARY to check for HDF5
John W. Eaton <jwe@octave.org>
parents:
9540
diff
changeset
|
885 save_CPPFLAGS="$CPPFLAGS" |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
886 save_LIBS="$LIBS" |
9542
f5ec5dc66824
use OCTAVE_CHECK_LIBRARY to check for HDF5
John W. Eaton <jwe@octave.org>
parents:
9540
diff
changeset
|
887 CPPFLAGS="$Z_CPPFLAGS $CPPFLAGS" |
f5ec5dc66824
use OCTAVE_CHECK_LIBRARY to check for HDF5
John W. Eaton <jwe@octave.org>
parents:
9540
diff
changeset
|
888 LIBS="$Z_LDFLAGS $Z_LIBS $LIBS" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
889 OCTAVE_CHECK_LIB(hdf5, HDF5, |
9542
f5ec5dc66824
use OCTAVE_CHECK_LIBRARY to check for HDF5
John W. Eaton <jwe@octave.org>
parents:
9540
diff
changeset
|
890 [HDF5 library not found. Octave will not be able to save or load HDF5 data files.], |
f5ec5dc66824
use OCTAVE_CHECK_LIBRARY to check for HDF5
John W. Eaton <jwe@octave.org>
parents:
9540
diff
changeset
|
891 [hdf5.h], [H5Gget_num_objs], [], [], |
f5ec5dc66824
use OCTAVE_CHECK_LIBRARY to check for HDF5
John W. Eaton <jwe@octave.org>
parents:
9540
diff
changeset
|
892 [warn_hdf5= |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
893 OCTAVE_CHECK_HDF5_HAS_VER_16_API |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
894 AC_DEFINE(HAVE_HDF5, 1, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
895 [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
|
896 if test $have_msvc = yes; then |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
897 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
|
898 fi |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
899 ]) |
9542
f5ec5dc66824
use OCTAVE_CHECK_LIBRARY to check for HDF5
John W. Eaton <jwe@octave.org>
parents:
9540
diff
changeset
|
900 CPPFLAGS="$save_CPPFLAGS" |
f5ec5dc66824
use OCTAVE_CHECK_LIBRARY to check for HDF5
John W. Eaton <jwe@octave.org>
parents:
9540
diff
changeset
|
901 LIBS="$save_LIBS" |
5270 | 902 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
903 ### Check for FFTW library. Default to Fortran FFTPACK if it is not available. |
5203 | 904 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
905 ## Check for FFTW header and library. |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
906 OCTAVE_CHECK_LIB(fftw3, FFTW3, |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
907 [FFTW3 library not found. The slower FFTPACK library will be used instead.], |
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
908 [fftw3.h], [fftw_plan_dft_1d]) |
3827 | 909 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
910 OCTAVE_CHECK_LIB(fftw3f, FFTW3F, |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
911 [FFTW3F library not found. The slower FFTPACK library will be used instead.], |
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
912 [fftw3.h], [fftwf_plan_dft_1d]) |
3827 | 913 |
19344
88847d5d1a96
configure.ac: Fix handling of --without-fftw3[f] options.
Rik <rik@octave.org>
parents:
18991
diff
changeset
|
914 ## 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
|
915 build_fftw_threads=yes |
15960
bde7731b2b83
added FFTW multithreaded library support
Andreas Weber <andy.weber.aw@gmail.com>
parents:
15946
diff
changeset
|
916 AC_ARG_ENABLE([fftw-threads], |
bde7731b2b83
added FFTW multithreaded library support
Andreas Weber <andy.weber.aw@gmail.com>
parents:
15946
diff
changeset
|
917 [AS_HELP_STRING([--disable-fftw-threads], |
bde7731b2b83
added FFTW multithreaded library support
Andreas Weber <andy.weber.aw@gmail.com>
parents:
15946
diff
changeset
|
918 [disable Multi-threaded FFTW])], |
bde7731b2b83
added FFTW multithreaded library support
Andreas Weber <andy.weber.aw@gmail.com>
parents:
15946
diff
changeset
|
919 [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
|
920 build_fftw_threads=no |
15960
bde7731b2b83
added FFTW multithreaded library support
Andreas Weber <andy.weber.aw@gmail.com>
parents:
15946
diff
changeset
|
921 fi], |
bde7731b2b83
added FFTW multithreaded library support
Andreas Weber <andy.weber.aw@gmail.com>
parents:
15946
diff
changeset
|
922 []) |
bde7731b2b83
added FFTW multithreaded library support
Andreas Weber <andy.weber.aw@gmail.com>
parents:
15946
diff
changeset
|
923 |
19344
88847d5d1a96
configure.ac: Fix handling of --without-fftw3[f] options.
Rik <rik@octave.org>
parents:
18991
diff
changeset
|
924 ## Octave is currently unable to use FFTW unless |
88847d5d1a96
configure.ac: Fix handling of --without-fftw3[f] options.
Rik <rik@octave.org>
parents:
18991
diff
changeset
|
925 ## both float and double versions are available. |
16332
5293cee91891
conditionally define HAVE_FFTW and HAVE_ZLIB in config.h
John W. Eaton <jwe@octave.org>
parents:
16330
diff
changeset
|
926 |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
927 AM_CONDITIONAL([AMCOND_HAVE_FFTW], |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
928 [test -n "$FFTW3_LIBS" && test -n "$FFTW3F_LIBS"]) |
3827 | 929 |
16332
5293cee91891
conditionally define HAVE_FFTW and HAVE_ZLIB in config.h
John W. Eaton <jwe@octave.org>
parents:
16330
diff
changeset
|
930 if test -n "$FFTW3_LIBS" && test -n "$FFTW3F_LIBS"; then |
5293cee91891
conditionally define HAVE_FFTW and HAVE_ZLIB in config.h
John W. Eaton <jwe@octave.org>
parents:
16330
diff
changeset
|
931 AC_DEFINE(HAVE_FFTW, 1, [Define if you have both FFTW3 and FFTW3F libraries.]) |
19344
88847d5d1a96
configure.ac: Fix handling of --without-fftw3[f] options.
Rik <rik@octave.org>
parents:
18991
diff
changeset
|
932 else |
88847d5d1a96
configure.ac: Fix handling of --without-fftw3[f] options.
Rik <rik@octave.org>
parents:
18991
diff
changeset
|
933 ## --without-fftw3 given, or one of the FFTW3 libs not installed. |
88847d5d1a96
configure.ac: Fix handling of --without-fftw3[f] options.
Rik <rik@octave.org>
parents:
18991
diff
changeset
|
934 ## Don't check for FFTW threads as this is now pointless. |
88847d5d1a96
configure.ac: Fix handling of --without-fftw3[f] options.
Rik <rik@octave.org>
parents:
18991
diff
changeset
|
935 build_fftw_threads=no |
88847d5d1a96
configure.ac: Fix handling of --without-fftw3[f] options.
Rik <rik@octave.org>
parents:
18991
diff
changeset
|
936 fi |
88847d5d1a96
configure.ac: Fix handling of --without-fftw3[f] options.
Rik <rik@octave.org>
parents:
18991
diff
changeset
|
937 |
88847d5d1a96
configure.ac: Fix handling of --without-fftw3[f] options.
Rik <rik@octave.org>
parents:
18991
diff
changeset
|
938 ## Check for the multithreaded FFTW library. |
88847d5d1a96
configure.ac: Fix handling of --without-fftw3[f] options.
Rik <rik@octave.org>
parents:
18991
diff
changeset
|
939 ## Fallback to singlethreaded if not found or disabled |
88847d5d1a96
configure.ac: Fix handling of --without-fftw3[f] options.
Rik <rik@octave.org>
parents:
18991
diff
changeset
|
940 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
|
941 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
|
942 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
|
943 fi |
5293cee91891
conditionally define HAVE_FFTW and HAVE_ZLIB in config.h
John W. Eaton <jwe@octave.org>
parents:
16330
diff
changeset
|
944 |
15271
648dabbb4c6b
build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
15257
diff
changeset
|
945 ## Subdirectory of liboctave/cruft to build if FFTW is not found. |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
946 FFT_DIR="fftpack" |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
947 AC_SUBST(FFT_DIR) |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
948 |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
949 ### Check for GLPK library and header. |
5235 | 950 |
9540
79b5fe2d5646
use Z_LIBS in checks for curl and glpk libraries
John W. Eaton <jwe@octave.org>
parents:
9538
diff
changeset
|
951 save_CPPFLAGS="$CPPFLAGS" |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
952 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
|
953 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
|
954 LIBS="$Z_LDFLAGS $Z_LIBS $LIBS" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
955 OCTAVE_CHECK_LIB(glpk, GLPK, |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
956 [GLPK library not found. The glpk function for solving linear programs will be disabled.], |
17241
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17196
diff
changeset
|
957 [glpk/glpk.h glpk.h], [glp_simplex], [], [], |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17196
diff
changeset
|
958 [warn_glpk= |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17196
diff
changeset
|
959 OCTAVE_CHECK_LIB_GLPK_OK( |
19355
22289e6e316e
build: Remove unused TEXINFO_LIBNAME definitions from Makefiles.
Rik <rik@octave.org>
parents:
19353
diff
changeset
|
960 [AC_DEFINE(HAVE_GLPK, 1, [Define to 1 if GLPK is available.])], |
17241
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17196
diff
changeset
|
961 [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
|
962 LIBS="$save_LIBS" |
79b5fe2d5646
use Z_LIBS in checks for curl and glpk libraries
John W. Eaton <jwe@octave.org>
parents:
9538
diff
changeset
|
963 CPPFLAGS="$save_CPPFLAGS" |
5235 | 964 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
965 ### Checks for cURL header and library. |
6043 | 966 |
9540
79b5fe2d5646
use Z_LIBS in checks for curl and glpk libraries
John W. Eaton <jwe@octave.org>
parents:
9538
diff
changeset
|
967 save_CPPFLAGS="$CPPFLAGS" |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
968 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
|
969 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
|
970 LIBS="$Z_LDFLAGS $Z_LIBS $LIBS" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
971 OCTAVE_CHECK_LIB(curl, cURL, |
9880 | 972 [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
|
973 [curl/curl.h], [curl_easy_escape]) |
15323
c42bf5cadb60
Add check for CURLOPT_DIRLISTONLY in libcurl
Mike Miller <mtmiller@ieee.org>
parents:
15317
diff
changeset
|
974 if test -z "$warn_curl"; then |
15338
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
975 ## 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
|
976 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
|
977 [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
|
978 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
15323
c42bf5cadb60
Add check for CURLOPT_DIRLISTONLY in libcurl
Mike Miller <mtmiller@ieee.org>
parents:
15317
diff
changeset
|
979 #include <curl/curl.h> |
c42bf5cadb60
Add check for CURLOPT_DIRLISTONLY in libcurl
Mike Miller <mtmiller@ieee.org>
parents:
15317
diff
changeset
|
980 ]], [[ |
c42bf5cadb60
Add check for CURLOPT_DIRLISTONLY in libcurl
Mike Miller <mtmiller@ieee.org>
parents:
15317
diff
changeset
|
981 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
|
982 ]])], |
16080
c53f8f706c55
Reverse logic of libcurl feature test result
Mike Miller <mtmiller@ieee.org>
parents:
16079
diff
changeset
|
983 [octave_cv_curl_has_curlopt_dirlistonly=yes], |
c53f8f706c55
Reverse logic of libcurl feature test result
Mike Miller <mtmiller@ieee.org>
parents:
16079
diff
changeset
|
984 [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
|
985 ]) |
16080
c53f8f706c55
Reverse logic of libcurl feature test result
Mike Miller <mtmiller@ieee.org>
parents:
16079
diff
changeset
|
986 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
|
987 AC_DEFINE(CURLOPT_DIRLISTONLY, CURLOPT_FTPLISTONLY, |
16079
3a90c3f4046d
Fix typo in changeset dc39c1d84c5b
Mike Miller <mtmiller@ieee.org>
parents:
16078
diff
changeset
|
988 [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
|
989 fi |
15323
c42bf5cadb60
Add check for CURLOPT_DIRLISTONLY in libcurl
Mike Miller <mtmiller@ieee.org>
parents:
15317
diff
changeset
|
990 fi |
9540
79b5fe2d5646
use Z_LIBS in checks for curl and glpk libraries
John W. Eaton <jwe@octave.org>
parents:
9538
diff
changeset
|
991 LIBS="$save_LIBS" |
79b5fe2d5646
use Z_LIBS in checks for curl and glpk libraries
John W. Eaton <jwe@octave.org>
parents:
9538
diff
changeset
|
992 CPPFLAGS="$save_CPPFLAGS" |
6133 | 993 |
19464
8fe2780c1491
update configure.ac to build and configure sndfile audio file utilities
Vytautas Jančauskas <unaudio@gmail.com>
parents:
17465
diff
changeset
|
994 ### Check for sndfile |
8fe2780c1491
update configure.ac to build and configure sndfile audio file utilities
Vytautas Jančauskas <unaudio@gmail.com>
parents:
17465
diff
changeset
|
995 |
19470
23833e1bfa2e
check for PortAudio
Vytautas Jančauskas <unaudio@gmail.com>
parents:
19467
diff
changeset
|
996 warn_sndfile="sndfile library fails tests. The audioinfo, audioread and audiowrite functions for reading and writing audio files will not be fully functional." |
19467
e30c88336ee9
Added checks for sndfile in configure.ac
Vytautas Jančauskas <unaudio@gmail.com>
parents:
19466
diff
changeset
|
997 |
19502
97c9ba013ed1
configure.ac: Add --without-portaudio and --without-sndfile options
Mike Miller <mtmiller@ieee.org>
parents:
19470
diff
changeset
|
998 check_sndfile=no |
97c9ba013ed1
configure.ac: Add --without-portaudio and --without-sndfile options
Mike Miller <mtmiller@ieee.org>
parents:
19470
diff
changeset
|
999 AC_ARG_WITH([sndfile], |
97c9ba013ed1
configure.ac: Add --without-portaudio and --without-sndfile options
Mike Miller <mtmiller@ieee.org>
parents:
19470
diff
changeset
|
1000 [AS_HELP_STRING([--without-sndfile], |
97c9ba013ed1
configure.ac: Add --without-portaudio and --without-sndfile options
Mike Miller <mtmiller@ieee.org>
parents:
19470
diff
changeset
|
1001 [don't use sndfile library, disable audio file I/O])], |
97c9ba013ed1
configure.ac: Add --without-portaudio and --without-sndfile options
Mike Miller <mtmiller@ieee.org>
parents:
19470
diff
changeset
|
1002 [if test x"$withval" = x"no"; then |
97c9ba013ed1
configure.ac: Add --without-portaudio and --without-sndfile options
Mike Miller <mtmiller@ieee.org>
parents:
19470
diff
changeset
|
1003 warn_sndfile="--without-sndfile specified. The audioinfo, audioread and audiowrite functions for reading and writing audio files will not be fully functional." |
97c9ba013ed1
configure.ac: Add --without-portaudio and --without-sndfile options
Mike Miller <mtmiller@ieee.org>
parents:
19470
diff
changeset
|
1004 else |
97c9ba013ed1
configure.ac: Add --without-portaudio and --without-sndfile options
Mike Miller <mtmiller@ieee.org>
parents:
19470
diff
changeset
|
1005 check_sndfile=yes |
97c9ba013ed1
configure.ac: Add --without-portaudio and --without-sndfile options
Mike Miller <mtmiller@ieee.org>
parents:
19470
diff
changeset
|
1006 fi], |
97c9ba013ed1
configure.ac: Add --without-portaudio and --without-sndfile options
Mike Miller <mtmiller@ieee.org>
parents:
19470
diff
changeset
|
1007 [check_sndfile=yes]) |
97c9ba013ed1
configure.ac: Add --without-portaudio and --without-sndfile options
Mike Miller <mtmiller@ieee.org>
parents:
19470
diff
changeset
|
1008 |
97c9ba013ed1
configure.ac: Add --without-portaudio and --without-sndfile options
Mike Miller <mtmiller@ieee.org>
parents:
19470
diff
changeset
|
1009 if test $check_sndfile = yes; then |
97c9ba013ed1
configure.ac: Add --without-portaudio and --without-sndfile options
Mike Miller <mtmiller@ieee.org>
parents:
19470
diff
changeset
|
1010 PKG_CHECK_EXISTS([sndfile], [ |
97c9ba013ed1
configure.ac: Add --without-portaudio and --without-sndfile options
Mike Miller <mtmiller@ieee.org>
parents:
19470
diff
changeset
|
1011 SNDFILE_CPPFLAGS=`$PKG_CONFIG --cflags-only-I sndfile` |
97c9ba013ed1
configure.ac: Add --without-portaudio and --without-sndfile options
Mike Miller <mtmiller@ieee.org>
parents:
19470
diff
changeset
|
1012 SNDFILE_LDFLAGS=`$PKG_CONFIG --libs-only-L sndfile` |
97c9ba013ed1
configure.ac: Add --without-portaudio and --without-sndfile options
Mike Miller <mtmiller@ieee.org>
parents:
19470
diff
changeset
|
1013 SNDFILE_LIBS=`$PKG_CONFIG --libs-only-l sndfile` |
97c9ba013ed1
configure.ac: Add --without-portaudio and --without-sndfile options
Mike Miller <mtmiller@ieee.org>
parents:
19470
diff
changeset
|
1014 warn_sndfile= |
97c9ba013ed1
configure.ac: Add --without-portaudio and --without-sndfile options
Mike Miller <mtmiller@ieee.org>
parents:
19470
diff
changeset
|
1015 ]) |
97c9ba013ed1
configure.ac: Add --without-portaudio and --without-sndfile options
Mike Miller <mtmiller@ieee.org>
parents:
19470
diff
changeset
|
1016 fi |
19467
e30c88336ee9
Added checks for sndfile in configure.ac
Vytautas Jančauskas <unaudio@gmail.com>
parents:
19466
diff
changeset
|
1017 |
e30c88336ee9
Added checks for sndfile in configure.ac
Vytautas Jančauskas <unaudio@gmail.com>
parents:
19466
diff
changeset
|
1018 if test -z "$warn_sndfile"; then |
19502
97c9ba013ed1
configure.ac: Add --without-portaudio and --without-sndfile options
Mike Miller <mtmiller@ieee.org>
parents:
19470
diff
changeset
|
1019 AC_DEFINE(HAVE_SNDFILE, 1, [Define to 1 if sndfile is available.]) |
19467
e30c88336ee9
Added checks for sndfile in configure.ac
Vytautas Jančauskas <unaudio@gmail.com>
parents:
19466
diff
changeset
|
1020 else |
e30c88336ee9
Added checks for sndfile in configure.ac
Vytautas Jančauskas <unaudio@gmail.com>
parents:
19466
diff
changeset
|
1021 SNDFILE_CPPFLAGS= |
e30c88336ee9
Added checks for sndfile in configure.ac
Vytautas Jančauskas <unaudio@gmail.com>
parents:
19466
diff
changeset
|
1022 SNDFILE_LDFLAGS= |
e30c88336ee9
Added checks for sndfile in configure.ac
Vytautas Jančauskas <unaudio@gmail.com>
parents:
19466
diff
changeset
|
1023 SNDFILE_LIBS= |
e30c88336ee9
Added checks for sndfile in configure.ac
Vytautas Jančauskas <unaudio@gmail.com>
parents:
19466
diff
changeset
|
1024 fi |
19466
3c35ee570366
configure.ac: fix a typo where magick flags were used instead of sndfile ones
Vytautas Jančauskas <unaudio@gmail.com>
parents:
19465
diff
changeset
|
1025 AC_SUBST(SNDFILE_CPPFLAGS) |
3c35ee570366
configure.ac: fix a typo where magick flags were used instead of sndfile ones
Vytautas Jančauskas <unaudio@gmail.com>
parents:
19465
diff
changeset
|
1026 AC_SUBST(SNDFILE_LDFLAGS) |
3c35ee570366
configure.ac: fix a typo where magick flags were used instead of sndfile ones
Vytautas Jančauskas <unaudio@gmail.com>
parents:
19465
diff
changeset
|
1027 AC_SUBST(SNDFILE_LIBS) |
19464
8fe2780c1491
update configure.ac to build and configure sndfile audio file utilities
Vytautas Jančauskas <unaudio@gmail.com>
parents:
17465
diff
changeset
|
1028 |
19470
23833e1bfa2e
check for PortAudio
Vytautas Jančauskas <unaudio@gmail.com>
parents:
19467
diff
changeset
|
1029 ### Check for PortAudio |
23833e1bfa2e
check for PortAudio
Vytautas Jančauskas <unaudio@gmail.com>
parents:
19467
diff
changeset
|
1030 |
23833e1bfa2e
check for PortAudio
Vytautas Jančauskas <unaudio@gmail.com>
parents:
19467
diff
changeset
|
1031 warn_portaudio="PortAudio library fails tests. The audioplayer, audiorecorder classes and audiodevinfo function for audio playback and recording will not be fully functional." |
23833e1bfa2e
check for PortAudio
Vytautas Jančauskas <unaudio@gmail.com>
parents:
19467
diff
changeset
|
1032 |
19502
97c9ba013ed1
configure.ac: Add --without-portaudio and --without-sndfile options
Mike Miller <mtmiller@ieee.org>
parents:
19470
diff
changeset
|
1033 check_portaudio=no |
97c9ba013ed1
configure.ac: Add --without-portaudio and --without-sndfile options
Mike Miller <mtmiller@ieee.org>
parents:
19470
diff
changeset
|
1034 AC_ARG_WITH([portaudio], |
97c9ba013ed1
configure.ac: Add --without-portaudio and --without-sndfile options
Mike Miller <mtmiller@ieee.org>
parents:
19470
diff
changeset
|
1035 [AS_HELP_STRING([--without-portaudio], |
97c9ba013ed1
configure.ac: Add --without-portaudio and --without-sndfile options
Mike Miller <mtmiller@ieee.org>
parents:
19470
diff
changeset
|
1036 [don't use PortAudio library, disable audio playback and recording])], |
97c9ba013ed1
configure.ac: Add --without-portaudio and --without-sndfile options
Mike Miller <mtmiller@ieee.org>
parents:
19470
diff
changeset
|
1037 [if test x"$withval" = x"no"; then |
97c9ba013ed1
configure.ac: Add --without-portaudio and --without-sndfile options
Mike Miller <mtmiller@ieee.org>
parents:
19470
diff
changeset
|
1038 warn_portaudio="--without-portaudio specified. The audioplayer, audiorecorder classes and audiodevinfo function for audio playback and recording will not be fully functional." |
97c9ba013ed1
configure.ac: Add --without-portaudio and --without-sndfile options
Mike Miller <mtmiller@ieee.org>
parents:
19470
diff
changeset
|
1039 else |
97c9ba013ed1
configure.ac: Add --without-portaudio and --without-sndfile options
Mike Miller <mtmiller@ieee.org>
parents:
19470
diff
changeset
|
1040 check_portaudio=yes |
97c9ba013ed1
configure.ac: Add --without-portaudio and --without-sndfile options
Mike Miller <mtmiller@ieee.org>
parents:
19470
diff
changeset
|
1041 fi], |
97c9ba013ed1
configure.ac: Add --without-portaudio and --without-sndfile options
Mike Miller <mtmiller@ieee.org>
parents:
19470
diff
changeset
|
1042 [check_portaudio=yes]) |
97c9ba013ed1
configure.ac: Add --without-portaudio and --without-sndfile options
Mike Miller <mtmiller@ieee.org>
parents:
19470
diff
changeset
|
1043 |
97c9ba013ed1
configure.ac: Add --without-portaudio and --without-sndfile options
Mike Miller <mtmiller@ieee.org>
parents:
19470
diff
changeset
|
1044 if test $check_portaudio = yes; then |
97c9ba013ed1
configure.ac: Add --without-portaudio and --without-sndfile options
Mike Miller <mtmiller@ieee.org>
parents:
19470
diff
changeset
|
1045 PKG_CHECK_EXISTS([portaudio-2.0 >= 19], [ |
97c9ba013ed1
configure.ac: Add --without-portaudio and --without-sndfile options
Mike Miller <mtmiller@ieee.org>
parents:
19470
diff
changeset
|
1046 PORTAUDIO_CPPFLAGS=`$PKG_CONFIG --cflags-only-I portaudio-2.0` |
97c9ba013ed1
configure.ac: Add --without-portaudio and --without-sndfile options
Mike Miller <mtmiller@ieee.org>
parents:
19470
diff
changeset
|
1047 PORTAUDIO_LDFLAGS=`$PKG_CONFIG --libs-only-L portaudio-2.0` |
97c9ba013ed1
configure.ac: Add --without-portaudio and --without-sndfile options
Mike Miller <mtmiller@ieee.org>
parents:
19470
diff
changeset
|
1048 PORTAUDIO_LIBS=`$PKG_CONFIG --libs-only-l portaudio-2.0` |
97c9ba013ed1
configure.ac: Add --without-portaudio and --without-sndfile options
Mike Miller <mtmiller@ieee.org>
parents:
19470
diff
changeset
|
1049 warn_portaudio= |
97c9ba013ed1
configure.ac: Add --without-portaudio and --without-sndfile options
Mike Miller <mtmiller@ieee.org>
parents:
19470
diff
changeset
|
1050 ]) |
97c9ba013ed1
configure.ac: Add --without-portaudio and --without-sndfile options
Mike Miller <mtmiller@ieee.org>
parents:
19470
diff
changeset
|
1051 fi |
19470
23833e1bfa2e
check for PortAudio
Vytautas Jančauskas <unaudio@gmail.com>
parents:
19467
diff
changeset
|
1052 |
23833e1bfa2e
check for PortAudio
Vytautas Jančauskas <unaudio@gmail.com>
parents:
19467
diff
changeset
|
1053 if test -z "$warn_portaudio"; then |
19502
97c9ba013ed1
configure.ac: Add --without-portaudio and --without-sndfile options
Mike Miller <mtmiller@ieee.org>
parents:
19470
diff
changeset
|
1054 AC_DEFINE(HAVE_PORTAUDIO, 1, [Define to 1 if PortAudio is available.]) |
19470
23833e1bfa2e
check for PortAudio
Vytautas Jančauskas <unaudio@gmail.com>
parents:
19467
diff
changeset
|
1055 else |
23833e1bfa2e
check for PortAudio
Vytautas Jančauskas <unaudio@gmail.com>
parents:
19467
diff
changeset
|
1056 PORTAUDIO_CPPFLAGS= |
23833e1bfa2e
check for PortAudio
Vytautas Jančauskas <unaudio@gmail.com>
parents:
19467
diff
changeset
|
1057 PORTAUDIO_LDFLAGS= |
23833e1bfa2e
check for PortAudio
Vytautas Jančauskas <unaudio@gmail.com>
parents:
19467
diff
changeset
|
1058 PORTAUDIO_LIBS= |
23833e1bfa2e
check for PortAudio
Vytautas Jančauskas <unaudio@gmail.com>
parents:
19467
diff
changeset
|
1059 fi |
23833e1bfa2e
check for PortAudio
Vytautas Jančauskas <unaudio@gmail.com>
parents:
19467
diff
changeset
|
1060 AC_SUBST(PORTAUDIO_CPPFLAGS) |
23833e1bfa2e
check for PortAudio
Vytautas Jančauskas <unaudio@gmail.com>
parents:
19467
diff
changeset
|
1061 AC_SUBST(PORTAUDIO_LDFLAGS) |
23833e1bfa2e
check for PortAudio
Vytautas Jančauskas <unaudio@gmail.com>
parents:
19467
diff
changeset
|
1062 AC_SUBST(PORTAUDIO_LIBS) |
23833e1bfa2e
check for PortAudio
Vytautas Jančauskas <unaudio@gmail.com>
parents:
19467
diff
changeset
|
1063 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1064 ### Check for either of Graphics/ImageMagick++ libraries |
9575
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
1065 |
11216
5036b0ff9597
configure.ac: Properly m4 quote AS_HELP_STRING.
Rik <octave@nomad.inbox5.com>
parents:
11214
diff
changeset
|
1066 AC_ARG_WITH([magick], |
5036b0ff9597
configure.ac: Properly m4 quote AS_HELP_STRING.
Rik <octave@nomad.inbox5.com>
parents:
11214
diff
changeset
|
1067 [AS_HELP_STRING([--with-magick=LIB], |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1068 [select library to use for image I/O (options: GraphicsMagick(default) or ImageMagick)])], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1069 [magick="$withval"], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1070 [magick="GraphicsMagick"]) |
11040
9ac165a67747
Modified configure.ac to allow specification of ImageMagick or GraphicsMagick. GraphicsMagick is still the default option.
John Swensen <jpswensen@gmail.com>
parents:
10986
diff
changeset
|
1071 |
9ac165a67747
Modified configure.ac to allow specification of ImageMagick or GraphicsMagick. GraphicsMagick is still the default option.
John Swensen <jpswensen@gmail.com>
parents:
10986
diff
changeset
|
1072 warn_magick="$magick++ library not found. The imread function for reading image files will not be fully functional." |
9575
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
1073 |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
1074 MAGICK_CPPFLAGS= |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
1075 MAGICK_LDFLAGS= |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
1076 MAGICK_LIBS= |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
1077 |
11040
9ac165a67747
Modified configure.ac to allow specification of ImageMagick or GraphicsMagick. GraphicsMagick is still the default option.
John Swensen <jpswensen@gmail.com>
parents:
10986
diff
changeset
|
1078 PKG_CHECK_EXISTS([$magick++], [ |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1079 ## Make sure we only get -I, -L, and -l flags. Some Graphics/ImageMagick++ |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1080 ## packages add extra flags that are useful when building |
11041 | 1081 ## Graphics/ImageMagick++ extentions. These extra flags break the |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
1082 ## Octave build. |
17816
e6317049225b
build: Remove FreeType and Fontconfig CPPFLAGS from XTRA_CXXFLAGS.
Rik <rik@octave.org>
parents:
17797
diff
changeset
|
1083 MAGICK_CPPFLAGS=`$PKG_CONFIG --cflags-only-I $magick++` |
11040
9ac165a67747
Modified configure.ac to allow specification of ImageMagick or GraphicsMagick. GraphicsMagick is still the default option.
John Swensen <jpswensen@gmail.com>
parents:
10986
diff
changeset
|
1084 MAGICK_LDFLAGS=`$PKG_CONFIG --libs-only-L $magick++` |
9ac165a67747
Modified configure.ac to allow specification of ImageMagick or GraphicsMagick. GraphicsMagick is still the default option.
John Swensen <jpswensen@gmail.com>
parents:
10986
diff
changeset
|
1085 MAGICK_LIBS=`$PKG_CONFIG --libs-only-l $magick++` |
9575
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
1086 |
11040
9ac165a67747
Modified configure.ac to allow specification of ImageMagick or GraphicsMagick. GraphicsMagick is still the default option.
John Swensen <jpswensen@gmail.com>
parents:
10986
diff
changeset
|
1087 warn_magick="$magick++ library fails tests. The imread function for reading image files will not be fully functional." |
7926
d74f996e005d
__magick_read__.cc: configuration and style fixes
John W. Eaton <jwe@octave.org>
parents:
7921
diff
changeset
|
1088 |
9575
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
1089 save_CPPFLAGS="$CPPFLAGS" |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
1090 save_LIBS="$LIBS" |
9583
8dc1531e2149
correctly save and restore LIBS and CPPFLAGS when checking for GraphicsMagick++
John W. Eaton <jwe@octave.org>
parents:
9575
diff
changeset
|
1091 CPPFLAGS="$MAGICK_CPPFLAGS $CPPFLAGS" |
8dc1531e2149
correctly save and restore LIBS and CPPFLAGS when checking for GraphicsMagick++
John W. Eaton <jwe@octave.org>
parents:
9575
diff
changeset
|
1092 LIBS="$MAGICK_LDFLAGS $MAGICK_LIBS $LIBS" |
9575
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
1093 AC_LANG_PUSH(C++) |
15338
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1094 AC_CHECK_HEADER([Magick++.h], [ |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1095 AC_CACHE_CHECK([for Magick::ColorRGB in Magick++.h], |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1096 [octave_cv_func_magick_colorrgb], |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1097 [AC_PREPROC_IFELSE([AC_LANG_SOURCE([[ |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1098 #include <Magick++.h> |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1099 ]], [[ |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1100 Magick::ColorRGB c; |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1101 ]])], |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1102 octave_cv_func_magick_colorrgb=yes, |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1103 octave_cv_func_magick_colorrgb=no) |
9575
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
1104 ]) |
15338
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1105 if test $octave_cv_func_magick_colorrgb = yes; then |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1106 warn_magick= |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1107 fi |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1108 ]) |
9575
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
1109 AC_LANG_POP(C++) |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
1110 CPPFLAGS="$save_CPPFLAGS" |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
1111 LIBS="$save_LIBS" |
15452
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
1112 |
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
1113 AC_CHECK_FUNCS([setlocale], [], |
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
1114 [warn_magick="$magick++ requires setlocale function. The imread function for reading image files will not be fully functional."]) |
9575
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
1115 ]) |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
1116 |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
1117 if test -z "$warn_magick"; then |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1118 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
|
1119 [Define to 1 if Graphics/ImageMagick++ is available.]) |
7937
6661387827d6
Allow build without GraphicsMagick installed
David Bateman <dbateman@free.fr>
parents:
7934
diff
changeset
|
1120 else |
9575
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
1121 MAGICK_CPPFLAGS= |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
1122 MAGICK_LDFLAGS= |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
1123 MAGICK_LIBS= |
7926
d74f996e005d
__magick_read__.cc: configuration and style fixes
John W. Eaton <jwe@octave.org>
parents:
7921
diff
changeset
|
1124 fi |
9575
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
1125 AC_SUBST(MAGICK_CPPFLAGS) |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
1126 AC_SUBST(MAGICK_LDFLAGS) |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
1127 AC_SUBST(MAGICK_LIBS) |
6043 | 1128 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1129 ### Check for X11 libraries |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1130 |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1131 AC_PATH_X |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1132 if test "$have_x" = yes; then |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1133 AC_DEFINE(HAVE_X_WINDOWS, 1, [Define to 1 if you have X11.]) |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1134 |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1135 if test "$x_includes" != "NONE"; then |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1136 X11_INCFLAGS="$x_includes" |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1137 fi |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1138 AC_SUBST(X11_INCFLAGS) |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1139 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1140 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
|
1141 AC_CHECK_LIB([X11], XrmInitialize, [X11_LIBS="-lX11"], [X11_LIBS=]) |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1142 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
|
1143 AC_CHECK_LIB([X11], XrmInitialize, |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1144 [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
|
1145 fi |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1146 AC_SUBST(X11_LIBS) |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1147 fi |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1148 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1149 ### Check for the Carbon framework on MacOSX systems |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1150 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
|
1151 [[#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
|
1152 [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
|
1153 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
|
1154 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
|
1155 [Define to 1 if framework CARBON is available.]) |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1156 CARBON_LIBS="-Wl,-framework -Wl,Carbon" |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1157 AC_MSG_NOTICE([adding -Wl,-framework -Wl,Carbon to CARBON_LIBS]) |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1158 AC_SUBST(CARBON_LIBS) |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1159 fi |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1160 |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1161 ### Check for list of libraries needed for native graphics renderer. |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1162 |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1163 native_graphics=yes |
7944
c2449e91f50a
configure.in: fix FTGL test to handle either FTGL/ftgl.h or ftgl.h
John W. Eaton <jwe@octave.org>
parents:
7937
diff
changeset
|
1164 warn_freetype="" |
7863
2a62d45fa21d
added check for FTGL library
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7834
diff
changeset
|
1165 |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1166 check_opengl=no |
11208
a44ba1cdfbb5
handle --without-opengl configure option
John W. Eaton <jwe@octave.org>
parents:
11119
diff
changeset
|
1167 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
|
1168 [AS_HELP_STRING([--without-opengl], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1169 [don't use OpenGL libraries, disable native graphics])], |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1170 [if test x"$withval" = x"no"; then |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1171 native_graphics=no |
11208
a44ba1cdfbb5
handle --without-opengl configure option
John W. Eaton <jwe@octave.org>
parents:
11119
diff
changeset
|
1172 warn_opengl="--without-opengl specified. Native graphics will be disabled." |
14605
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
1173 OCTAVE_CONFIGURE_WARNING([warn_opengl]) |
11208
a44ba1cdfbb5
handle --without-opengl configure option
John W. Eaton <jwe@octave.org>
parents:
11119
diff
changeset
|
1174 else |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1175 check_opengl=yes |
11208
a44ba1cdfbb5
handle --without-opengl configure option
John W. Eaton <jwe@octave.org>
parents:
11119
diff
changeset
|
1176 fi], |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1177 [check_opengl=yes]) |
11208
a44ba1cdfbb5
handle --without-opengl configure option
John W. Eaton <jwe@octave.org>
parents:
11119
diff
changeset
|
1178 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1179 ## 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
|
1180 if test $check_opengl = yes; then |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1181 OCTAVE_CHECK_LIB_OPENGL |
11208
a44ba1cdfbb5
handle --without-opengl configure option
John W. Eaton <jwe@octave.org>
parents:
11119
diff
changeset
|
1182 fi |
a44ba1cdfbb5
handle --without-opengl configure option
John W. Eaton <jwe@octave.org>
parents:
11119
diff
changeset
|
1183 |
19733
08033d583435
more consistently use _CPPFLAGS and _LDFLAGS variables
John W. Eaton <jwe@octave.org>
parents:
19732
diff
changeset
|
1184 FLTK_CPPFLAGS= |
08033d583435
more consistently use _CPPFLAGS and _LDFLAGS variables
John W. Eaton <jwe@octave.org>
parents:
19732
diff
changeset
|
1185 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
|
1186 FLTK_LIBS= |
10571
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1187 |
11214
7f19b2b6e093
Remove redundant warning when 'without-opengl' option used.
Rik <octave@nomad.inbox5.com>
parents:
11209
diff
changeset
|
1188 if test -z "$OPENGL_LIBS"; then |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1189 if test $check_opengl = yes; then |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1190 native_graphics=no |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1191 warn_fltk_opengl="OpenGL libs (GL and GLU) not found. Native graphics will be disabled." |
14605
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
1192 OCTAVE_CONFIGURE_WARNING([warn_fltk_opengl]) |
11214
7f19b2b6e093
Remove redundant warning when 'without-opengl' option used.
Rik <octave@nomad.inbox5.com>
parents:
11209
diff
changeset
|
1193 fi |
7f19b2b6e093
Remove redundant warning when 'without-opengl' option used.
Rik <octave@nomad.inbox5.com>
parents:
11209
diff
changeset
|
1194 fi |
7f19b2b6e093
Remove redundant warning when 'without-opengl' option used.
Rik <octave@nomad.inbox5.com>
parents:
11209
diff
changeset
|
1195 |
7944
c2449e91f50a
configure.in: fix FTGL test to handle either FTGL/ftgl.h or ftgl.h
John W. Eaton <jwe@octave.org>
parents:
7937
diff
changeset
|
1196 if test -n "$OPENGL_LIBS"; then |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1197 AC_DEFINE(HAVE_OPENGL, 1, [Define to 1 if OpenGL is available.]) |
7863
2a62d45fa21d
added check for FTGL library
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7834
diff
changeset
|
1198 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1199 ## Check for FreeType 2 library |
9845
722bd8f6a750
configure.ac: fix freetype check
John W. Eaton <jwe@octave.org>
parents:
9817
diff
changeset
|
1200 |
15831
1cdca9bf7b7e
USe pkg-config for freetype2 configure check.
John W. Eaton <jwe@octave.org>
parents:
15536
diff
changeset
|
1201 PKG_CHECK_MODULES([FT2], [freetype2], [ |
1cdca9bf7b7e
USe pkg-config for freetype2 configure check.
John W. Eaton <jwe@octave.org>
parents:
15536
diff
changeset
|
1202 min_ft2_version=9.03 |
17816
e6317049225b
build: Remove FreeType and Fontconfig CPPFLAGS from XTRA_CXXFLAGS.
Rik <rik@octave.org>
parents:
17797
diff
changeset
|
1203 AC_MSG_CHECKING([for FreeType2 version >= $min_ft2_version]) |
15831
1cdca9bf7b7e
USe pkg-config for freetype2 configure check.
John W. Eaton <jwe@octave.org>
parents:
15536
diff
changeset
|
1204 $PKG_CONFIG freetype2 --atleast-version=$min_ft2_version |
1cdca9bf7b7e
USe pkg-config for freetype2 configure check.
John W. Eaton <jwe@octave.org>
parents:
15536
diff
changeset
|
1205 ac_status=$? |
1cdca9bf7b7e
USe pkg-config for freetype2 configure check.
John W. Eaton <jwe@octave.org>
parents:
15536
diff
changeset
|
1206 if test $ac_status = 0; then |
1cdca9bf7b7e
USe pkg-config for freetype2 configure check.
John W. Eaton <jwe@octave.org>
parents:
15536
diff
changeset
|
1207 AC_MSG_RESULT(yes) |
1cdca9bf7b7e
USe pkg-config for freetype2 configure check.
John W. Eaton <jwe@octave.org>
parents:
15536
diff
changeset
|
1208 AC_DEFINE(HAVE_FREETYPE, 1, [Define to 1 if you have Freetype library.]) |
17330
219552139c18
Allow to compile with older freetype on RHEL5 (bug #39823).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
17298
diff
changeset
|
1209 save_LIBS="$LIBS" |
219552139c18
Allow to compile with older freetype on RHEL5 (bug #39823).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
17298
diff
changeset
|
1210 LIBS="$FT2_LIBS $LIBS" |
219552139c18
Allow to compile with older freetype on RHEL5 (bug #39823).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
17298
diff
changeset
|
1211 AC_CHECK_FUNCS([FT_Reference_Face]) |
219552139c18
Allow to compile with older freetype on RHEL5 (bug #39823).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
17298
diff
changeset
|
1212 LIBS="$save_LIBS" |
15831
1cdca9bf7b7e
USe pkg-config for freetype2 configure check.
John W. Eaton <jwe@octave.org>
parents:
15536
diff
changeset
|
1213 else |
1cdca9bf7b7e
USe pkg-config for freetype2 configure check.
John W. Eaton <jwe@octave.org>
parents:
15536
diff
changeset
|
1214 AC_MSG_RESULT(no) |
17816
e6317049225b
build: Remove FreeType and Fontconfig CPPFLAGS from XTRA_CXXFLAGS.
Rik <rik@octave.org>
parents:
17797
diff
changeset
|
1215 warn_freetype="FreeType library >= 9.03 not found. Native graphics will be disabled." |
15831
1cdca9bf7b7e
USe pkg-config for freetype2 configure check.
John W. Eaton <jwe@octave.org>
parents:
15536
diff
changeset
|
1216 fi]) |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1217 |
14605
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
1218 if test -n "$warn_freetype"; then |
17816
e6317049225b
build: Remove FreeType and Fontconfig CPPFLAGS from XTRA_CXXFLAGS.
Rik <rik@octave.org>
parents:
17797
diff
changeset
|
1219 native_graphics=no |
14605
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
1220 OCTAVE_CONFIGURE_WARNING([warn_freetype]) |
19733
08033d583435
more consistently use _CPPFLAGS and _LDFLAGS variables
John W. Eaton <jwe@octave.org>
parents:
19732
diff
changeset
|
1221 else |
08033d583435
more consistently use _CPPFLAGS and _LDFLAGS variables
John W. Eaton <jwe@octave.org>
parents:
19732
diff
changeset
|
1222 FT2_CPPFLAGS="$FT2_CFLAGS" |
14605
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
1223 fi |
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
1224 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1225 ## Check for fontconfig library |
9403
4af6e29449c1
[mq]: graphics_text_engine
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9259
diff
changeset
|
1226 |
10571
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1227 warn_fontconfig="" |
18025
7c0f59b688fc
configure.ac: Check for Xft library before building native graphics.
Rik <rik@octave.org>
parents:
17989
diff
changeset
|
1228 if test $native_graphics = 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
|
1229 PKG_CHECK_MODULES(FONTCONFIG, [fontconfig], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1230 [have_fontconfig=yes |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1231 OPENGL_LIBS="$FONTCONFIG_LIBS $OPENGL_LIBS" |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1232 AC_DEFINE(HAVE_FONTCONFIG, 1, [Define to 1 if fontconfig is present.])], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1233 [have_fontconfig=no |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1234 warn_fontconfig="Fontconfig library not found. Native graphics will be disabled."]) |
10571
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1235 fi |
9403
4af6e29449c1
[mq]: graphics_text_engine
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9259
diff
changeset
|
1236 |
14605
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
1237 if test -n "$warn_fontconfig"; then |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1238 native_graphics=no |
14605
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
1239 OCTAVE_CONFIGURE_WARNING([warn_fontconfig]) |
19733
08033d583435
more consistently use _CPPFLAGS and _LDFLAGS variables
John W. Eaton <jwe@octave.org>
parents:
19732
diff
changeset
|
1240 else |
08033d583435
more consistently use _CPPFLAGS and _LDFLAGS variables
John W. Eaton <jwe@octave.org>
parents:
19732
diff
changeset
|
1241 FONTCONFIG_CPPFLAGS="$FONTCONFIG_CFLAGS" |
14605
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
1242 fi |
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
1243 |
18025
7c0f59b688fc
configure.ac: Check for Xft library before building native graphics.
Rik <rik@octave.org>
parents:
17989
diff
changeset
|
1244 ## Check for Xft library (when using X11) |
7c0f59b688fc
configure.ac: Check for Xft library before building native graphics.
Rik <rik@octave.org>
parents:
17989
diff
changeset
|
1245 |
7c0f59b688fc
configure.ac: Check for Xft library before building native graphics.
Rik <rik@octave.org>
parents:
17989
diff
changeset
|
1246 warn_xft="" |
7c0f59b688fc
configure.ac: Check for Xft library before building native graphics.
Rik <rik@octave.org>
parents:
17989
diff
changeset
|
1247 if test $native_graphics = yes && test "$have_x" = yes; then |
7c0f59b688fc
configure.ac: Check for Xft library before building native graphics.
Rik <rik@octave.org>
parents:
17989
diff
changeset
|
1248 PKG_CHECK_MODULES(XFT, [xft], |
7c0f59b688fc
configure.ac: Check for Xft library before building native graphics.
Rik <rik@octave.org>
parents:
17989
diff
changeset
|
1249 [AC_DEFINE(HAVE_XFT, 1, [Define to 1 if Xft is present.])], |
7c0f59b688fc
configure.ac: Check for Xft library before building native graphics.
Rik <rik@octave.org>
parents:
17989
diff
changeset
|
1250 [warn_xft="Xft library not found. Native graphics will be disabled."]) |
7c0f59b688fc
configure.ac: Check for Xft library before building native graphics.
Rik <rik@octave.org>
parents:
17989
diff
changeset
|
1251 fi |
7c0f59b688fc
configure.ac: Check for Xft library before building native graphics.
Rik <rik@octave.org>
parents:
17989
diff
changeset
|
1252 |
7c0f59b688fc
configure.ac: Check for Xft library before building native graphics.
Rik <rik@octave.org>
parents:
17989
diff
changeset
|
1253 if test -n "$warn_xft"; then |
7c0f59b688fc
configure.ac: Check for Xft library before building native graphics.
Rik <rik@octave.org>
parents:
17989
diff
changeset
|
1254 native_graphics=no |
7c0f59b688fc
configure.ac: Check for Xft library before building native graphics.
Rik <rik@octave.org>
parents:
17989
diff
changeset
|
1255 OCTAVE_CONFIGURE_WARNING([warn_xft]) |
7c0f59b688fc
configure.ac: Check for Xft library before building native graphics.
Rik <rik@octave.org>
parents:
17989
diff
changeset
|
1256 fi |
7c0f59b688fc
configure.ac: Check for Xft library before building native graphics.
Rik <rik@octave.org>
parents:
17989
diff
changeset
|
1257 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1258 ## Check for FLTK (www.fltk.org) library |
11041 | 1259 |
19582
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1260 check_fltk=no |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1261 AC_ARG_WITH([fltk], |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1262 [AS_HELP_STRING([--without-fltk], |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1263 [don't use FLTK libraries, disable native graphics])], |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1264 [if test x"$withval" = x"no"; then |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1265 native_graphics=no |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1266 warn_fltk="--without-fltk specified. Native graphics will be disabled." |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1267 OCTAVE_CONFIGURE_WARNING([warn_fltk]) |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1268 else |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1269 check_fltk=yes |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1270 fi], |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1271 [check_fltk=yes]) |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1272 |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1273 if test $check_fltk = yes; then |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1274 AC_ARG_WITH([fltk-prefix], |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1275 [AS_HELP_STRING([--with-fltk-prefix=PFX], |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1276 [prefix where FLTK is installed (optional)])], |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1277 [fltk_prefix="$withval"], |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1278 [fltk_prefix=""]) |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1279 |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1280 AC_ARG_WITH([fltk-exec-prefix], |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1281 [AS_HELP_STRING([--with-fltk-exec-prefix=PFX], |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1282 [exec prefix where FLTK is installed (optional)])], |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1283 [fltk_exec_prefix="$withval"], |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1284 [fltk_exec_prefix=""]) |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1285 |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1286 if test x"$fltk_exec_prefix" != x""; then |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1287 fltk_args="$fltk_args --exec-prefix=$fltk_exec_prefix" |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1288 if test "x${FLTK_CONFIG+set}" != xset ; then |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1289 FLTK_CONFIG="$fltk_exec_prefix/bin/fltk-config" |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1290 fi |
10571
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1291 fi |
19582
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1292 |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1293 if test x"$fltk_prefix" != x""; then |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1294 fltk_args="$fltk_args --prefix=$fltk_prefix" |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1295 if test x${FLTK_CONFIG+set} != xset ; then |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1296 FLTK_CONFIG="$fltk_prefix/bin/fltk-config" |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1297 fi |
10571
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1298 fi |
19582
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1299 |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1300 AC_PATH_PROG([FLTK_CONFIG], [fltk-config], [no]) |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1301 |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1302 warn_fltk_config="" |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1303 warn_fltk_opengl="" |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1304 |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1305 if test "$FLTK_CONFIG" = no; then |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1306 native_graphics=no |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1307 warn_fltk_config="FLTK config script not found. Native graphics will be disabled." |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1308 OCTAVE_CONFIGURE_WARNING([warn_fltk_config]) |
15338
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1309 else |
19733
08033d583435
more consistently use _CPPFLAGS and _LDFLAGS variables
John W. Eaton <jwe@octave.org>
parents:
19732
diff
changeset
|
1310 FLTK_CPPFLAGS=`$FLTK_CONFIG $fltkconf_args --use-gl --cflags` |
19582
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1311 FLTK_LDFLAGS=`$FLTK_CONFIG $fltkconf_args --use-gl --ldflags` |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1312 |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1313 case $host_os in |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1314 mingw*) |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1315 FLTK_LDFLAGS=`echo $FLTK_LDFLAGS | $SED -e 's/-mwindows//g'` |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1316 ;; |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1317 esac |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1318 |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1319 AC_CACHE_CHECK([for OpenGL support in FLTK], |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1320 [octave_cv_fltk_opengl_support], |
19733
08033d583435
more consistently use _CPPFLAGS and _LDFLAGS variables
John W. Eaton <jwe@octave.org>
parents:
19732
diff
changeset
|
1321 [save_CPPFLAGS="$CPPFLAGS" |
08033d583435
more consistently use _CPPFLAGS and _LDFLAGS variables
John W. Eaton <jwe@octave.org>
parents:
19732
diff
changeset
|
1322 CPPFLAGS="$CFLAGS $FLTK_CPPFLAGS" |
19582
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1323 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1324 #include <FL/gl.h> |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1325 ]], [[ |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1326 int nothing = 0; |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1327 ]])], |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1328 octave_cv_fltk_opengl_support=no, |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1329 octave_cv_fltk_opengl_support=yes) |
19733
08033d583435
more consistently use _CPPFLAGS and _LDFLAGS variables
John W. Eaton <jwe@octave.org>
parents:
19732
diff
changeset
|
1330 CPPFLAGS="$save_CPPFLAGS" |
19582
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1331 ]) |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1332 if test $octave_cv_fltk_opengl_support = no; then |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1333 warn_fltk_opengl="FLTK does not have OpenGL support. Native graphics will be disabled." |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1334 else |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1335 AC_DEFINE(HAVE_FLTK, 1, [Define to 1 if FLTK is available.]) |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1336 fi |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1337 |
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
|
1338 if test -n "$warn_fltk_opengl"; then |
19582
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1339 native_graphics=no |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1340 OCTAVE_CONFIGURE_WARNING([warn_fltk_opengl]) |
27c5f42a7a64
configure.ac: Add a --without-fltk build option (bug #37773)
Sebastian Schoeps <sebastian@schoeps.org>
parents:
19508
diff
changeset
|
1341 fi |
10571
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1342 fi |
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1343 fi |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1344 fi |
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1345 |
19733
08033d583435
more consistently use _CPPFLAGS and _LDFLAGS variables
John W. Eaton <jwe@octave.org>
parents:
19732
diff
changeset
|
1346 AC_SUBST(FLTK_CPPFLAGS) |
08033d583435
more consistently use _CPPFLAGS and _LDFLAGS variables
John W. Eaton <jwe@octave.org>
parents:
19732
diff
changeset
|
1347 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
|
1348 AC_SUBST(FLTK_LIBS) |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1349 |
17797
06a850f83dd4
build: Remove embedded gl2ps. Require gl2ps as external dependency.
Rik <rik@octave.org>
parents:
17792
diff
changeset
|
1350 ## Check for gl2ps which is required for printing with OpenGL graphics |
06a850f83dd4
build: Remove embedded gl2ps. Require gl2ps as external dependency.
Rik <rik@octave.org>
parents:
17792
diff
changeset
|
1351 if test $native_graphics = yes; then |
06a850f83dd4
build: Remove embedded gl2ps. Require gl2ps as external dependency.
Rik <rik@octave.org>
parents:
17792
diff
changeset
|
1352 AC_CHECK_HEADERS([gl2ps.h], |
06a850f83dd4
build: Remove embedded gl2ps. Require gl2ps as external dependency.
Rik <rik@octave.org>
parents:
17792
diff
changeset
|
1353 [GL2PS_LIBS="-lgl2ps"], |
18056
ab2614be700c
configure.ac: add warning on disabling OpenGL printing to the final summary.
Carnë Draug <carandraug@octave.org>
parents:
18036
diff
changeset
|
1354 [warn_gl2ps="gl2ps library not found. OpenGL printing is disabled." |
ab2614be700c
configure.ac: add warning on disabling OpenGL printing to the final summary.
Carnë Draug <carandraug@octave.org>
parents:
18036
diff
changeset
|
1355 OCTAVE_CONFIGURE_WARNING([warn_gl2ps])]) |
17797
06a850f83dd4
build: Remove embedded gl2ps. Require gl2ps as external dependency.
Rik <rik@octave.org>
parents:
17792
diff
changeset
|
1356 fi |
06a850f83dd4
build: Remove embedded gl2ps. Require gl2ps as external dependency.
Rik <rik@octave.org>
parents:
17792
diff
changeset
|
1357 |
06a850f83dd4
build: Remove embedded gl2ps. Require gl2ps as external dependency.
Rik <rik@octave.org>
parents:
17792
diff
changeset
|
1358 AC_SUBST(GL2PS_LIBS) |
06a850f83dd4
build: Remove embedded gl2ps. Require gl2ps as external dependency.
Rik <rik@octave.org>
parents:
17792
diff
changeset
|
1359 |
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
|
1360 if test -n "$OPENGL_LIBS"; then |
bf25e9f7c22a
use FLTK_CFLAGS and FLTK_LIBS instead of GRAPHICS_CFLAGS and GRAPHICS_LIBS
John W. Eaton <jwe@octave.org>
parents:
19703
diff
changeset
|
1361 ## Check for OSMesa which is needed for offscreen rendering with OpenGL |
bf25e9f7c22a
use FLTK_CFLAGS and FLTK_LIBS instead of GRAPHICS_CFLAGS and GRAPHICS_LIBS
John W. Eaton <jwe@octave.org>
parents:
19703
diff
changeset
|
1362 ## FIXME: Check for version >= 9.0.0 |
bf25e9f7c22a
use FLTK_CFLAGS and FLTK_LIBS instead of GRAPHICS_CFLAGS and GRAPHICS_LIBS
John W. Eaton <jwe@octave.org>
parents:
19703
diff
changeset
|
1363 OCTAVE_CHECK_LIB(OSMesa, OSMesa, |
bf25e9f7c22a
use FLTK_CFLAGS and FLTK_LIBS instead of GRAPHICS_CFLAGS and GRAPHICS_LIBS
John W. Eaton <jwe@octave.org>
parents:
19703
diff
changeset
|
1364 [OSMesa library not found. Offscreen rendering with OpenGL will be disabled.], |
bf25e9f7c22a
use FLTK_CFLAGS and FLTK_LIBS instead of GRAPHICS_CFLAGS and GRAPHICS_LIBS
John W. Eaton <jwe@octave.org>
parents:
19703
diff
changeset
|
1365 [osmesa.h GL/osmesa.h], [OSMesaCreateContext]) |
bf25e9f7c22a
use FLTK_CFLAGS and FLTK_LIBS instead of GRAPHICS_CFLAGS and GRAPHICS_LIBS
John W. Eaton <jwe@octave.org>
parents:
19703
diff
changeset
|
1366 fi |
19703
a81177f4bfe6
Add __osmesa_print__.cc for offscreen rendering with OpenGL
Andreas Weber <andy.weber.aw@gmail.com>
parents:
19697
diff
changeset
|
1367 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1368 ### Start determination of shared vs. static libraries |
3827 | 1369 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1370 ## Use -static if compiling on Alpha OSF/1 1.3 systems. |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1371 case $canonical_host_type in |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1372 alpha*-dec-osf1.3) |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1373 LD_STATIC_FLAG=-static |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1374 ;; |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1375 esac |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1376 if test -n "$LD_STATIC_FLAG"; then |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1377 AC_MSG_NOTICE([defining LD_STATIC_FLAG to be $LD_STATIC_FLAG]) |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1378 fi |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1379 AC_SUBST(LD_STATIC_FLAG) |
3827 | 1380 |
3130 | 1381 OCTAVE_PROG_AR |
3012 | 1382 |
9801
13868ea67c71
configure.ac: fail if LT_INIT is not defined
John W. Eaton <jwe@octave.org>
parents:
9799
diff
changeset
|
1383 ifdef([LT_INIT], [], [ |
13868ea67c71
configure.ac: fail if LT_INIT is not defined
John W. Eaton <jwe@octave.org>
parents:
9799
diff
changeset
|
1384 errprint([error: you must have libtool 2.2.2 or a more recent version |
13868ea67c71
configure.ac: fail if LT_INIT is not defined
John W. Eaton <jwe@octave.org>
parents:
9799
diff
changeset
|
1385 ]) |
13868ea67c71
configure.ac: fail if LT_INIT is not defined
John W. Eaton <jwe@octave.org>
parents:
9799
diff
changeset
|
1386 m4exit([1])]) |
13868ea67c71
configure.ac: fail if LT_INIT is not defined
John W. Eaton <jwe@octave.org>
parents:
9799
diff
changeset
|
1387 |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1388 LT_PREREQ([2.2.2]) |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1389 LT_INIT([disable-static dlopen win32-dll]) |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1390 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1391 if test x"$enable_shared" = x"yes"; then |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1392 SHARED_LIBS=yes |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1393 else |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1394 SHARED_LIBS=no |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1395 fi |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1396 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1397 if test x"$enable_static" = x"yes"; then |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1398 STATIC_LIBS=yes |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1399 else |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1400 STATIC_LIBS=no |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1401 fi |
3012 | 1402 |
6137 | 1403 XTRA_CRUFT_SH_LDFLAGS= |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1404 if test $have_msvc = yes; then |
10123
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1405 FLIBS="$FLIBS -lkernel32" |
17932
87db35b69cfd
* configure.ac (XTRA_CRUFT_SH_LDFLAGS): Remove "-def" for MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
17924
diff
changeset
|
1406 XTRA_CRUFT_SH_LDFLAGS="-Wl,cruft/cruft.def" |
10123
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1407 fi |
6137 | 1408 AC_SUBST(XTRA_CRUFT_SH_LDFLAGS) |
6102 | 1409 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1410 ### Check for BLAS and LAPACK libraries: |
10721
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1411 |
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1412 ## Need to adjust FFLAGS to include correct integer size. |
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1413 save_FFLAGS="$FFLAGS" |
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1414 FFLAGS="$FFLAGS $F77_INTEGER_8_FLAG" |
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1415 |
17976
437e51a0c25d
Assume yes for ax_blas_f77_func_ok when cross-compiling.
Rik <rik@octave.org>
parents:
17964
diff
changeset
|
1416 AX_BLAS_WITH_F77_FUNC([:], [:], |
17989
4465699450c2
configure.ac: Don't use internal macro variable ax_blas_f77_func_ok.
Rik <rik@octave.org>
parents:
17976
diff
changeset
|
1417 [ax_blas_ok=yes |
4465699450c2
configure.ac: Don't use internal macro variable ax_blas_f77_func_ok.
Rik <rik@octave.org>
parents:
17976
diff
changeset
|
1418 AC_MSG_CHECKING([BLAS can be called from Fortran]) |
4465699450c2
configure.ac: Don't use internal macro variable ax_blas_f77_func_ok.
Rik <rik@octave.org>
parents:
17976
diff
changeset
|
1419 AC_MSG_RESULT([yes assumed for cross compilation])]) |
10951 | 1420 AX_LAPACK([:], [:]) |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1421 |
10721
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1422 ## Restore FFLAGS. |
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1423 FFLAGS="$save_FFLAGS" |
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1424 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1425 ## If necessary, try again with -ff2c in FFLAGS |
17989
4465699450c2
configure.ac: Don't use internal macro variable ax_blas_f77_func_ok.
Rik <rik@octave.org>
parents:
17976
diff
changeset
|
1426 if test $ax_blas_ok = no; then |
12538
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1427 save_FFLAGS="$FFLAGS" |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1428 FFLAGS="-ff2c $FFLAGS $F77_INTEGER_8_FLAG" |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1429 |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1430 AX_BLAS_WITH_F77_FUNC([:], [:]) |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1431 AX_LAPACK([:], [:]) |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1432 |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1433 ## Restore FFLAGS, with -ff2c if that was helpful |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1434 |
17989
4465699450c2
configure.ac: Don't use internal macro variable ax_blas_f77_func_ok.
Rik <rik@octave.org>
parents:
17976
diff
changeset
|
1435 if test $ax_blas_ok = yes; then |
4465699450c2
configure.ac: Don't use internal macro variable ax_blas_f77_func_ok.
Rik <rik@octave.org>
parents:
17976
diff
changeset
|
1436 FFLAGS="-ff2c $save_FFLAGS" |
4465699450c2
configure.ac: Don't use internal macro variable ax_blas_f77_func_ok.
Rik <rik@octave.org>
parents:
17976
diff
changeset
|
1437 else |
12538
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1438 FFLAGS="$save_FFLAGS" |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1439 fi |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1440 fi |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1441 |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1442 ## On OSX, try again with a wrapper library (without -ff2c!) |
17989
4465699450c2
configure.ac: Don't use internal macro variable ax_blas_f77_func_ok.
Rik <rik@octave.org>
parents:
17976
diff
changeset
|
1443 if test $ax_blas_ok = no; then |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
1444 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
1445 darwin*) |
12538
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1446 ## test if wrapper functions help |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1447 octave_blaswrap_save_CFLAGS="$CFLAGS" |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1448 CFLAGS="$CFLAGS -DUSE_BLASWRAP" |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1449 AC_LANG_PUSH(C) |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1450 AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ |
15271
648dabbb4c6b
build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
15257
diff
changeset
|
1451 #include "liboctave/cruft/misc/blaswrap.c" |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1452 ]])], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1453 [mv conftest.$ac_objext blaswrap.$ac_objext |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1454 octave_blaswrap_save_BLAS_LIBS="$BLAS_LIBS" |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1455 BLAS_LIBS="blaswrap.$ac_objext -framework vecLib" |
12538
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1456 |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1457 save_FFLAGS="$FFLAGS" |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1458 FFLAGS="$FFLAGS $F77_INTEGER_8_FLAG" |
12538
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1459 |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1460 AX_BLAS_WITH_F77_FUNC([:], [:]) |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1461 AX_LAPACK([:], [:]) |
12538
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1462 |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1463 ## Restore FFLAGS. |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1464 FFLAGS="$save_FFLAGS" |
12538
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1465 |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1466 ## remove temp file |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1467 rm -f blaswrap.$ac_objext], |
15271
648dabbb4c6b
build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
15257
diff
changeset
|
1468 [AC_MSG_FAILURE([cannot compile liboctave/cruft/misc/blaswrap.c])]) |
12538
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1469 AC_LANG_POP(C) |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1470 CFLAGS="$octave_blaswrap_save_CFLAGS" |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1471 |
17989
4465699450c2
configure.ac: Don't use internal macro variable ax_blas_f77_func_ok.
Rik <rik@octave.org>
parents:
17976
diff
changeset
|
1472 if test $ax_blas_ok = no; then |
12538
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1473 BLAS_LIBS="$octave_blaswrap_save_BLAS_LIBS" |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1474 else |
15271
648dabbb4c6b
build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
15257
diff
changeset
|
1475 ## wrapper in cruft, remove from BLAS_LIBS |
17661
1978a6c76aa9
Use user-specified SED during build process (bug #40273).
Rik <rik@octave.org>
parents:
17640
diff
changeset
|
1476 BLAS_LIBS=`echo $BLAS_LIBS | $SED -e 's/blaswrap.[[^ ]]* //g'` |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1477 AC_DEFINE(USE_BLASWRAP, 1, |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1478 [Define to 1 if BLAS functions need to be wrapped (potentially needed for 64-bit OSX only).]) |
12538
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1479 fi |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1480 ;; |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1481 esac |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1482 fi |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1483 |
17989
4465699450c2
configure.ac: Don't use internal macro variable ax_blas_f77_func_ok.
Rik <rik@octave.org>
parents:
17976
diff
changeset
|
1484 if test $ax_blas_ok = no; then |
4465699450c2
configure.ac: Don't use internal macro variable ax_blas_f77_func_ok.
Rik <rik@octave.org>
parents:
17976
diff
changeset
|
1485 if test $USE_64_BIT_IDX_T = yes && test "$ax_blas_integer_size_ok" = no; then |
10721
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1486 ## Attempt to be more informative. |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1487 AC_MSG_ERROR([BLAS doesn't seem to support 64-bit integers. This is incompatible with --enable-64.]) |
10721
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1488 else |
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1489 AC_MSG_ERROR([A BLAS library was detected but found incompatible with your Fortran 77 compiler settings.]) |
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1490 fi |
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1491 fi |
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1492 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1493 if test $ax_blas_ok = no || test $ax_lapack_ok = no; then |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1494 AC_MSG_ERROR([BLAS and LAPACK libraries are required]) |
9799
cfd0aa788ae1
remove reference blas and lapack sources
John W. Eaton <jwe@octave.org>
parents:
9794
diff
changeset
|
1495 fi |
3690 | 1496 |
10721
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1497 ### Check for the qrupdate library |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1498 |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
1499 ## No need to adjust FFLAGS because only link is attempted. |
10721
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1500 ## 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
|
1501 save_LIBS="$LIBS" |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1502 LIBS="$LAPACK_LIBS $BLAS_LIBS $FLIBS $LIBS" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1503 OCTAVE_CHECK_LIB(qrupdate, qrupdate, |
9571
263a8ed419b0
configure.in: style fixes for messages
John W. Eaton <jwe@octave.org>
parents:
9570
diff
changeset
|
1504 [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
|
1505 [], |
9707
6f5c4c82c5fc
avoid ugly F77 names in configure
Jaroslav Hajek <highegg@gmail.com>
parents:
9648
diff
changeset
|
1506 [sqr1up], |
6f5c4c82c5fc
avoid ugly F77 names in configure
Jaroslav Hajek <highegg@gmail.com>
parents:
9648
diff
changeset
|
1507 [Fortran 77], [don't use qrupdate, disable QR & Cholesky updating functions]) |
9708 | 1508 |
19349
043440fa7006
configure.ac: Respect without-z and without-qrupdate options when config.cache exists.
Rik <rik@octave.org>
parents:
19344
diff
changeset
|
1509 ## Additional check to see if qrupdate lib found supports LU updates |
043440fa7006
configure.ac: Respect without-z and without-qrupdate options when config.cache exists.
Rik <rik@octave.org>
parents:
19344
diff
changeset
|
1510 if test -z "$warn_qrupdate"; then |
15361
01c4f5d8a656
configure.ac: Cache results for QRUPDATE_LUU autoconf test.
Rik <rik@octave.org>
parents:
15350
diff
changeset
|
1511 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
|
1512 [octave_cv_func_slup1up], |
01c4f5d8a656
configure.ac: Cache results for QRUPDATE_LUU autoconf test.
Rik <rik@octave.org>
parents:
15350
diff
changeset
|
1513 [LIBS="$LIBS $QRUPDATE_LIBS" |
01c4f5d8a656
configure.ac: Cache results for QRUPDATE_LUU autoconf test.
Rik <rik@octave.org>
parents:
15350
diff
changeset
|
1514 AC_LANG_PUSH([Fortran 77]) |
01c4f5d8a656
configure.ac: Cache results for QRUPDATE_LUU autoconf test.
Rik <rik@octave.org>
parents:
15350
diff
changeset
|
1515 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
|
1516 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
|
1517 AC_LANG_POP([Fortran 77]) |
01c4f5d8a656
configure.ac: Cache results for QRUPDATE_LUU autoconf test.
Rik <rik@octave.org>
parents:
15350
diff
changeset
|
1518 ]) |
01c4f5d8a656
configure.ac: Cache results for QRUPDATE_LUU autoconf test.
Rik <rik@octave.org>
parents:
15350
diff
changeset
|
1519 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
|
1520 AC_DEFINE(HAVE_QRUPDATE_LUU, 1, [Define to 1 if qrupdate supports LU updates.]) |
9708 | 1521 fi |
1522 fi | |
9570
1ab56c73ec7c
use OCTAVE_CHECK_LIBRARY to check for qrupdate library
John W. Eaton <jwe@octave.org>
parents:
9568
diff
changeset
|
1523 LIBS="$save_LIBS" |
8547
d66c9b6e506a
imported patch qrupdate.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8417
diff
changeset
|
1524 |
16318
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
1525 if test $USE_64_BIT_IDX_T = yes; then |
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
1526 CHOLMOD_TAG="_l_" |
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
1527 CXSPARSE_TAG="_dl_" |
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
1528 UMFPACK_TAG="_zl_" |
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
1529 else |
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
1530 CHOLMOD_TAG="_" |
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
1531 CXSPARSE_TAG="_di_" |
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
1532 UMFPACK_TAG="_zi_" |
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
1533 fi |
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
1534 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1535 ### Check for AMD library |
7619 | 1536 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1537 OCTAVE_CHECK_LIB(amd, AMD, |
9571
263a8ed419b0
configure.in: style fixes for messages
John W. Eaton <jwe@octave.org>
parents:
9570
diff
changeset
|
1538 [AMD library not found. This will result in some lack of functionality for sparse matrices.], |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1539 [suitesparse/amd.h ufsparse/amd.h amd/amd.h amd.h], |
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1540 [amd_postorder], |
10003
2ea3110e15ed
Use M4 quoting for arguments to autoconf macros containing variables
Rik <rdrider0-list@yahoo.com>
parents:
9989
diff
changeset
|
1541 [], [don't use AMD library, disable some sparse matrix functionality]) |
5451 | 1542 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1543 ### Check for CAMD library |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1544 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1545 OCTAVE_CHECK_LIB(camd, CAMD, |
9571
263a8ed419b0
configure.in: style fixes for messages
John W. Eaton <jwe@octave.org>
parents:
9570
diff
changeset
|
1546 [CAMD library not found. This will result in some lack of functionality for sparse matrices.], |
15938
398ae067e811
configure.ac: Fix CAMD/COLAMD/CCOLAMD/CXSparse include search directories
Kyle Guinn <elyk03@gmail.com>
parents:
15932
diff
changeset
|
1547 [suitesparse/camd.h ufsparse/camd.h camd/camd.h camd.h], |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1548 [camd_postorder], |
10003
2ea3110e15ed
Use M4 quoting for arguments to autoconf macros containing variables
Rik <rdrider0-list@yahoo.com>
parents:
9989
diff
changeset
|
1549 [], [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
|
1550 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1551 ### Check for COLAMD library |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1552 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1553 OCTAVE_CHECK_LIB(colamd, COLAMD, |
9571
263a8ed419b0
configure.in: style fixes for messages
John W. Eaton <jwe@octave.org>
parents:
9570
diff
changeset
|
1554 [COLAMD library not found. This will result in some lack of functionality for sparse matrices.], |
15938
398ae067e811
configure.ac: Fix CAMD/COLAMD/CCOLAMD/CXSparse include search directories
Kyle Guinn <elyk03@gmail.com>
parents:
15932
diff
changeset
|
1555 [suitesparse/colamd.h ufsparse/colamd.h colamd/colamd.h colamd.h], |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1556 [colamd], |
10003
2ea3110e15ed
Use M4 quoting for arguments to autoconf macros containing variables
Rik <rdrider0-list@yahoo.com>
parents:
9989
diff
changeset
|
1557 [], [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
|
1558 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1559 ### Check for CCOLAMD library |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1560 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1561 OCTAVE_CHECK_LIB(ccolamd, CCOLAMD, |
9571
263a8ed419b0
configure.in: style fixes for messages
John W. Eaton <jwe@octave.org>
parents:
9570
diff
changeset
|
1562 [CCOLAMD library not found. This will result in some lack of functionality for sparse matrices.], |
15938
398ae067e811
configure.ac: Fix CAMD/COLAMD/CCOLAMD/CXSparse include search directories
Kyle Guinn <elyk03@gmail.com>
parents:
15932
diff
changeset
|
1563 [suitesparse/ccolamd.h ufsparse/ccolamd.h ccolamd/ccolamd.h ccolamd.h], |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1564 [ccolamd], |
10003
2ea3110e15ed
Use M4 quoting for arguments to autoconf macros containing variables
Rik <rdrider0-list@yahoo.com>
parents:
9989
diff
changeset
|
1565 [], [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
|
1566 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1567 ### Check for CHOLMOD library. |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1568 ### If your cholmod library requires cblas, then you will need to |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1569 ### configure with --with-cholmod="-lcholmod -lcblas". |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1570 |
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1571 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
|
1572 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
|
1573 OCTAVE_CHECK_LIB(cholmod, CHOLMOD, |
9571
263a8ed419b0
configure.in: style fixes for messages
John W. Eaton <jwe@octave.org>
parents:
9570
diff
changeset
|
1574 [CHOLMOD library not found. This will result in some lack of functionality for sparse matrices.], |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1575 [suitesparse/cholmod.h ufsparse/cholmod.h cholmod/cholmod.h cholmod.h], |
16318
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
1576 [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
|
1577 [], [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
|
1578 LIBS="$save_LIBS" |
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1579 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1580 ### Check for CXSparse library |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1581 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1582 OCTAVE_CHECK_LIB(cxsparse, CXSparse, |
9571
263a8ed419b0
configure.in: style fixes for messages
John W. Eaton <jwe@octave.org>
parents:
9570
diff
changeset
|
1583 [CXSparse library not found. This will result in some lack of functionality for sparse matrices.], |
15938
398ae067e811
configure.ac: Fix CAMD/COLAMD/CCOLAMD/CXSparse include search directories
Kyle Guinn <elyk03@gmail.com>
parents:
15932
diff
changeset
|
1584 [suitesparse/cs.h ufsparse/cs.h cxsparse/cs.h cs.h], |
16318
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
1585 [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
|
1586 [C++], [don't use CXSparse library, disable some sparse matrix functionality]) |
6024 | 1587 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1588 ### Check for UMFPACK library. |
5226 | 1589 |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1590 save_LIBS="$LIBS" |
9787
cc5bb7b5679f
use AMD_CPPFLAGS when checking for UMFPACK
David Grundberg <davidg@cs.umu.se>
parents:
9763
diff
changeset
|
1591 save_CPPFLAGS="$CPPFLAGS" |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1592 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
|
1593 CPPFLAGS="$AMD_CPPFLAGS $CPPFLAGS" |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1594 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
|
1595 [UMFPACK not found. This will result in some lack of functionality for sparse matrices.], |
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1596 [suitesparse/umfpack.h ufsparse/umfpack.h umfpack/umfpack.h umfpack.h], |
16318
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
1597 [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
|
1598 [], [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
|
1599 CPPFLAGS="$save_CPPFLAGS" |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1600 LIBS="$save_LIBS" |
5512 | 1601 |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1602 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
|
1603 ## 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
|
1604 $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
|
1605 $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
|
1606 save_LIBS="$LIBS" |
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1607 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
|
1608 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
|
1609 [UMFPACK not found. This will result in some lack of functionality for sparse matrices.], |
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1610 [suitesparse/umfpack.h ufsparse/umfpack.h umfpack/umfpack.h umfpack.h], |
16318
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
1611 [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
|
1612 [], [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
|
1613 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
|
1614 UMFPACK_LIBS="$UMFPACK_LIBS -lcblas" |
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1615 fi |
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1616 LIBS="$save_LIBS" |
6133 | 1617 fi |
5513 | 1618 |
15329
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1619 ## Test features of the installed UMFPACK library |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1620 |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1621 if test -n "$UMFPACK_LIBS"; then |
15329
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1622 ## SuiteSparse >= 4.0 needs additional link library for SuiteSparse_time() |
18266
975480e1be4b
configure.ac: Add AMD_CPPFLAGS to UMFPACK tests (bug #41209).
Kyle Guinn <elyk03@gmail.com>
parents:
18264
diff
changeset
|
1623 save_CPPFLAGS="$CPPFLAGS" |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1624 save_LIBS="$LIBS"; |
18266
975480e1be4b
configure.ac: Add AMD_CPPFLAGS to UMFPACK tests (bug #41209).
Kyle Guinn <elyk03@gmail.com>
parents:
18264
diff
changeset
|
1625 CPPFLAGS="$UMFPACK_CPPFLAGS $AMD_CPPFLAGS $CPPFLAGS" |
15349
90c2b2d777bf
configure.ac: Fix building of Octave with ancient versions of SuiteSparse (3.2.X)
Rik <rik@octave.org>
parents:
15346
diff
changeset
|
1626 LIBS="$UMFPACK_LIBS $AMD_LDFLAGS $AMD_LIBS $BLAS_LIBS $FLIBS $LIBS" |
15329
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1627 xtra_libs= |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1628 OCTAVE_UMFPACK_NEED_SUITESPARSE_TIME |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1629 if test $octave_cv_umfpack_need_suitesparse_time = yes; then |
15329
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1630 AC_CHECK_LIB([rt], [clock_gettime], [xtra_libs="-lrt"], [xtra_libs=]) |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1631 ## FIXME: This library list is only accurate for Linux, Mac OS X. |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1632 ## Possibly need other library names for MinGW, Cygwin. |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1633 AC_SEARCH_LIBS([SuiteSparse_time], |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1634 [suitesparseconfig SuiteSparse], |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1635 [], [], [$xtra_libs]) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1636 case $ac_cv_search_SuiteSparse_time in |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
1637 -l*) |
15329
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1638 UMFPACK_LIBS="$UMFPACK_LIBS $ac_cv_search_SuiteSparse_time" |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1639 ;; |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1640 no) |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1641 UMFPACK_LIBS= |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1642 AC_MSG_WARN([UMFPACK library found but is missing SuiteSparse_time functionality.]) |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1643 AC_MSG_WARN([UMFPACK library will be disabled.]) |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1644 ;; |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1645 esac |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1646 fi |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1647 LIBS="$save_LIBS" |
18266
975480e1be4b
configure.ac: Add AMD_CPPFLAGS to UMFPACK tests (bug #41209).
Kyle Guinn <elyk03@gmail.com>
parents:
18264
diff
changeset
|
1648 CPPFLAGS="$save_CPPFLAGS" |
15329
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1649 |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1650 ## Check for UMFPACK separately split complex matrix and RHS. |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1651 if test -n "$UMFPACK_LIBS"; then |
18266
975480e1be4b
configure.ac: Add AMD_CPPFLAGS to UMFPACK tests (bug #41209).
Kyle Guinn <elyk03@gmail.com>
parents:
18264
diff
changeset
|
1652 save_CPPFLAGS="$CPPFLAGS" |
15329
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1653 save_LIBS="$LIBS"; |
18266
975480e1be4b
configure.ac: Add AMD_CPPFLAGS to UMFPACK tests (bug #41209).
Kyle Guinn <elyk03@gmail.com>
parents:
18264
diff
changeset
|
1654 CPPFLAGS="$UMFPACK_CPPFLAGS $AMD_CPPFLAGS $CPPFLAGS" |
15349
90c2b2d777bf
configure.ac: Fix building of Octave with ancient versions of SuiteSparse (3.2.X)
Rik <rik@octave.org>
parents:
15346
diff
changeset
|
1655 LIBS="$UMFPACK_LIBS $CHOLMOD_LDFLAGS $CHOLMOD_LIBS $AMD_LDFLAGS $AMD_LIBS $COLAMD_LDFLAGS $COLAMD_LIBS $LAPACK_LIBS $BLAS_LIBS $FLIBS $LIBS $xtra_libs" |
15329
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1656 OCTAVE_UMFPACK_SEPARATE_SPLIT |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1657 LIBS="$save_LIBS" |
18266
975480e1be4b
configure.ac: Add AMD_CPPFLAGS to UMFPACK tests (bug #41209).
Kyle Guinn <elyk03@gmail.com>
parents:
18264
diff
changeset
|
1658 CPPFLAGS="$save_CPPFLAGS" |
15329
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1659 fi |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1660 fi |
5226 | 1661 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1662 ### Check for ARPACK library. |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1663 |
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
|
1664 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
|
1665 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
|
1666 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
|
1667 [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
|
1668 [], |
834df9f10963
remove ARPACK files from sources and restore configure checks for external ARPACK library
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
1669 [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
|
1670 [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
|
1671 [warn_arpack= |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1672 OCTAVE_CHECK_LIB_ARPACK_OK( |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1673 [AC_DEFINE(HAVE_ARPACK, 1, [Define to 1 if ARPACK is available.])], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1674 [warn_arpack="ARPACK library found, but does not seem to work properly -- disabling eigs function"])]) |
14144
834df9f10963
remove ARPACK files from sources and restore configure checks for external ARPACK library
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
1675 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
|
1676 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1677 ### Check for readline library. |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1678 |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1679 OCTAVE_ENABLE_READLINE |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1680 |
4128 | 1681 ### Enable dynamic linking. --enable-shared implies this, so |
1682 ### --enable-dl is only need if you are only building static libraries | |
1683 ### and want to try dynamic linking too (works on some systems, for | |
1684 ### example, OS X and Windows). | |
1685 | |
11216
5036b0ff9597
configure.ac: Properly m4 quote AS_HELP_STRING.
Rik <octave@nomad.inbox5.com>
parents:
11214
diff
changeset
|
1686 AC_ARG_ENABLE([dl], |
15238
c4779a180134
avoid confusing --disable-foo (default is yes) configure help messages
John W. Eaton <jwe@octave.org>
parents:
15237
diff
changeset
|
1687 [AS_HELP_STRING([--disable-dl], |
c4779a180134
avoid confusing --disable-foo (default is yes) configure help messages
John W. Eaton <jwe@octave.org>
parents:
15237
diff
changeset
|
1688 [disable loading of dynamically linked modules])], |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1689 [case $enableval in |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1690 yes) ENABLE_DYNAMIC_LINKING=yes ;; |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1691 no) ENABLE_DYNAMIC_LINKING=no ;; |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1692 *) AC_MSG_ERROR([bad value $enableval for --enable-dl]) ;; |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1693 esac], |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1694 [ENABLE_DYNAMIC_LINKING=no]) |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1695 |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1696 if test $STATIC_LIBS = no && test $SHARED_LIBS = no; then |
15925
1fbeccd44271
configure.ac: Clarify warning about disabling static AND shared libraries.
Rik <rik@octave.org>
parents:
15919
diff
changeset
|
1697 AC_MSG_ERROR([You can't disable building both static AND shared libraries!]) |
3034 | 1698 fi |
1699 | |
2813 | 1700 CPICFLAG=-fPIC |
1701 CXXPICFLAG=-fPIC | |
1702 FPICFLAG=-fPIC | |
1703 SHLEXT=so | |
4190 | 1704 SHLLIB='$(SHLEXT)' |
4102 | 1705 SHLBIN= |
4138 | 1706 SHLEXT_VER='$(SHLEXT).$(version)' |
1707 SHLLIB_VER='$(SHLLIB).$(version)' | |
1708 SHLBIN_VER='$(SHLBIN).$(version)' | |
4126 | 1709 SHLLINKEXT= |
6051 | 1710 LIBPRE=lib |
9186
49a0c58a7dcf
Added SHLPRE for SHLEXT instead of SHLLIBPRE
marco_atzeri@yahoo.it
parents:
9178
diff
changeset
|
1711 SHLPRE=lib |
9189
8a348e4be8bb
repair damage done when applying changeset 49a0c58a7dcf
John W. Eaton <jwe@octave.org>
parents:
9187
diff
changeset
|
1712 SHLLIBPRE=lib |
8618
f8b3ece45bda
use separate prefix for shllib and shlbin files
John W. Eaton <jwe@octave.org>
parents:
8607
diff
changeset
|
1713 SHLBINPRE=lib |
4323 | 1714 SH_LD='$(CXX)' |
2813 | 1715 SH_LDFLAGS=-shared |
4759 | 1716 DL_LD='$(SH_LD)' |
1717 DL_LDFLAGS='$(SH_LDFLAGS)' | |
1718 MKOCTFILE_DL_LDFLAGS='$(DL_LDFLAGS)' | |
3036 | 1719 SONAME_FLAGS= |
4199 | 1720 NO_OCT_FILE_STRIP=false |
4323 | 1721 TEMPLATE_AR='$(AR)' |
3775 | 1722 TEMPLATE_ARFLAGS="$ARFLAGS" |
6137 | 1723 CRUFT_DLL_DEFS= |
1724 OCTAVE_DLL_DEFS= | |
1725 OCTINTERP_DLL_DEFS= | |
15257
7ee62f559a73
Fix compilation under Windows with GUI and LLVM enabled.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15238
diff
changeset
|
1726 OCTGUI_DLL_DEFS= |
7825
13871b7de124
Import sources for OpenGL-based renderer.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7789
diff
changeset
|
1727 OCTGRAPHICS_DLL_DEFS= |
4104 | 1728 library_path_var=LD_LIBRARY_PATH |
9613
16907d1153d1
attempt to fix LD_PRELOAD for Cygwin
John W. Eaton <jwe@octave.org>
parents:
9610
diff
changeset
|
1729 ldpreloadsep=" " |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1730 case $canonical_host_type in |
6668 | 1731 *-*-386bsd* | *-*-netbsd*) |
2813 | 1732 SH_LD=ld |
1733 SH_LDFLAGS=-Bshareable | |
1734 ;; | |
6668 | 1735 *-*-openbsd*) |
1736 SH_LDFLAGS='-shared -fPIC' | |
1737 ;; | |
4323 | 1738 *-*-freebsd*) |
5508 | 1739 SH_LDFLAGS="-shared -Wl,-x" |
4323 | 1740 ;; |
3127 | 1741 alpha*-dec-osf*) |
2813 | 1742 CPICFLAG= |
1743 CXXPICFLAG= | |
1744 FPICFLAG= | |
4283 | 1745 SH_LDFLAGS="-shared -Wl,-expect_unresolved -Wl,'*'" |
2813 | 1746 ;; |
3956 | 1747 *-*-darwin*) |
15195 | 1748 DL_LDFLAGS='-bundle -bundle_loader $(top_builddir)/libinterp/octave $(LDFLAGS)' |
18432
c71cbbae9443
avoid substituting shell variable references in mkoctfile.cc
John W. Eaton <jwe@octave.org>
parents:
18378
diff
changeset
|
1749 MKOCTFILE_DL_LDFLAGS='-bundle -bundle_loader $(bindir)/octave-$(version)$(EXEEXT)' |
4759 | 1750 SH_LDFLAGS='-dynamiclib -single_module $(LDFLAGS)' |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1751 case $canonical_host_type in |
7266 | 1752 powerpc-*) |
1753 CXXPICFLAG= | |
1754 CPICFLAG= | |
1755 FPICFLAG= | |
1756 ;; | |
1757 esac | |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
1758 SHLEXT=dylib |
4759 | 1759 SHLLIB='$(SHLEXT)' |
1760 SHLEXT_VER='$(version).$(SHLEXT)' | |
1761 SHLLIB_VER='$(version).$(SHLLIB)' | |
4199 | 1762 NO_OCT_FILE_STRIP=true |
4786 | 1763 SONAME_FLAGS='-install_name $(octlibdir)/$@' |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
1764 library_path_var=DYLD_LIBRARY_PATH |
3956 | 1765 ;; |
8675
43c6012bd4c2
configure.in: separate cases for cygwin and mingw
Benjamin Lindner <lindnerben@gmx.net>
parents:
8659
diff
changeset
|
1766 *-*-cygwin*) |
9054
0735e427c6c0
configure fixes for cygwin
Marco Atzeri <marco_atzeri@yahoo.it>
parents:
9049
diff
changeset
|
1767 CPICFLAG= |
0735e427c6c0
configure fixes for cygwin
Marco Atzeri <marco_atzeri@yahoo.it>
parents:
9049
diff
changeset
|
1768 CXXPICFLAG= |
0735e427c6c0
configure fixes for cygwin
Marco Atzeri <marco_atzeri@yahoo.it>
parents:
9049
diff
changeset
|
1769 FPICFLAG= |
0735e427c6c0
configure fixes for cygwin
Marco Atzeri <marco_atzeri@yahoo.it>
parents:
9049
diff
changeset
|
1770 LIBPRE=lib |
9186
49a0c58a7dcf
Added SHLPRE for SHLEXT instead of SHLLIBPRE
marco_atzeri@yahoo.it
parents:
9178
diff
changeset
|
1771 SHLPRE=cyg |
9241
60bbc66bb0e2
Correct my previous mistake for cygwin SHLBIN and SHLBINPRE
Marco Atzeri <marco_atzeri@yahoo.it>
parents:
9231
diff
changeset
|
1772 SHLBINPRE=cyg |
8644
fac8c78b4fb9
configure.in: fix shared library definitions for Cygwin and MinGW
Marco Atzeri <marco_atzeri@yahoo.it>
parents:
8641
diff
changeset
|
1773 SHLEXT=dll |
fac8c78b4fb9
configure.in: fix shared library definitions for Cygwin and MinGW
Marco Atzeri <marco_atzeri@yahoo.it>
parents:
8641
diff
changeset
|
1774 SHLLIB=dll.a |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
1775 SHLBIN=dll |
5451 | 1776 DL_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc" |
5414 | 1777 SH_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-auto-image-base" |
9241
60bbc66bb0e2
Correct my previous mistake for cygwin SHLBIN and SHLBINPRE
Marco Atzeri <marco_atzeri@yahoo.it>
parents:
9231
diff
changeset
|
1778 SONAME_FLAGS='-Wl,--out-implib=$(patsubst $(SHLPRE)%,$(LIBPRE)%,$@).a' |
9613
16907d1153d1
attempt to fix LD_PRELOAD for Cygwin
John W. Eaton <jwe@octave.org>
parents:
9610
diff
changeset
|
1779 ldpreloadsep=":" |
4102 | 1780 ;; |
8675
43c6012bd4c2
configure.in: separate cases for cygwin and mingw
Benjamin Lindner <lindnerben@gmx.net>
parents:
8659
diff
changeset
|
1781 *-*-mingw*) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1782 if test $have_msvc = yes; then |
10123
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1783 DL_LDFLAGS="-shared" |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1784 CPICFLAG= |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1785 CXXPICFLAG= |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1786 FPICFLAG= |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1787 SHLEXT=dll |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1788 SHLLIB=lib |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1789 SHLBIN=dll |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1790 LIBPRE= |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1791 SHLPRE= |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1792 SHLLIBPRE= |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1793 SHLBINPRE= |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1794 SH_LDFLAGS="-shared" |
17661
1978a6c76aa9
Use user-specified SED during build process (bug #40273).
Rik <rik@octave.org>
parents:
17640
diff
changeset
|
1795 if test -n "`echo $CFLAGS | $GREP -e '-g'`" || test -n "`echo $CXXFLAGS | $GREP -e '-g'`"; then |
10123
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1796 DL_LDFLAGS="$DL_LDFLAGS -g" |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1797 SH_LDFLAGS="$SH_LDFLAGS -g" |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1798 fi |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1799 NO_OCT_FILE_STRIP=true |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1800 library_path_var=PATH |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1801 ## Extra compilation flags. |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1802 CRUFT_DLL_DEFS="-DCRUFT_DLL" |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1803 OCTAVE_DLL_DEFS="-DOCTAVE_DLL" |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1804 OCTINTERP_DLL_DEFS="-DOCTINTERP_DLL" |
15257
7ee62f559a73
Fix compilation under Windows with GUI and LLVM enabled.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15238
diff
changeset
|
1805 OCTGUI_DLL_DEFS="-DOCTGUI_DLL" |
10123
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1806 OCTGRAPHICS_DLL_DEFS="-DOCTGRAPHICS_DLL" |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1807 else |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1808 CPICFLAG= |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1809 CXXPICFLAG= |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1810 FPICFLAG= |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1811 SHLEXT=dll |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1812 SHLLIB=dll.a |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1813 SHLBIN=dll |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1814 DL_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc" |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1815 SH_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-auto-image-base" |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1816 SONAME_FLAGS='-Wl,--out-implib=$@.a' |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1817 library_path_var=PATH |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1818 fi |
8675
43c6012bd4c2
configure.in: separate cases for cygwin and mingw
Benjamin Lindner <lindnerben@gmx.net>
parents:
8659
diff
changeset
|
1819 ;; |
8618
f8b3ece45bda
use separate prefix for shllib and shlbin files
John W. Eaton <jwe@octave.org>
parents:
8607
diff
changeset
|
1820 |
6089 | 1821 *-*-msdosmsvc) |
6794 | 1822 DL_LDFLAGS="-shared" |
6051 | 1823 CPICFLAG= |
1824 CXXPICFLAG= | |
1825 FPICFLAG= | |
1826 SHLEXT=dll | |
1827 SHLLIB=lib | |
1828 SHLBIN=dll | |
1829 LIBPRE= | |
9186
49a0c58a7dcf
Added SHLPRE for SHLEXT instead of SHLLIBPRE
marco_atzeri@yahoo.it
parents:
9178
diff
changeset
|
1830 SHLPRE= |
9189
8a348e4be8bb
repair damage done when applying changeset 49a0c58a7dcf
John W. Eaton <jwe@octave.org>
parents:
9187
diff
changeset
|
1831 SHLLIBPRE= |
8618
f8b3ece45bda
use separate prefix for shllib and shlbin files
John W. Eaton <jwe@octave.org>
parents:
8607
diff
changeset
|
1832 SHLBINPRE= |
6794 | 1833 SH_LDFLAGS="-shared" |
17661
1978a6c76aa9
Use user-specified SED during build process (bug #40273).
Rik <rik@octave.org>
parents:
17640
diff
changeset
|
1834 if test -n "`echo $CFLAGS | $GREP -e '-g'`" || test -n "`echo $CXXFLAGS | $GREP -e '-g'`"; then |
6794 | 1835 DL_LDFLAGS="$DL_LDFLAGS -g" |
1836 SH_LDFLAGS="$SH_LDFLAGS -g" | |
1837 fi | |
6255 | 1838 NO_OCT_FILE_STRIP=true |
6100 | 1839 library_path_var=PATH |
6087 | 1840 ## Extra compilation flags. |
6137 | 1841 CRUFT_DLL_DEFS="-DCRUFT_DLL" |
1842 OCTAVE_DLL_DEFS="-DOCTAVE_DLL" | |
15257
7ee62f559a73
Fix compilation under Windows with GUI and LLVM enabled.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15238
diff
changeset
|
1843 OCTGUI_DLL_DEFS="-DOCTGUI_DLL" |
7825
13871b7de124
Import sources for OpenGL-based renderer.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7789
diff
changeset
|
1844 OCTGRAPHICS_DLL_DEFS="-DOCTGRAPHICS_DLL" |
6051 | 1845 ;; |
3740 | 1846 *-*-linux* | *-*-gnu*) |
4906 | 1847 MKOCTFILE_DL_LDFLAGS="-shared -Wl,-Bsymbolic" |
4283 | 1848 SONAME_FLAGS='-Wl,-soname -Wl,$@' |
2813 | 1849 ;; |
3887 | 1850 i[[3456]]86-*-sco3.2v5*) |
4283 | 1851 SONAME_FLAGS='-Wl,-h -Wl,$@' |
3160 | 1852 SH_LDFLAGS=-G |
1853 ;; | |
2813 | 1854 rs6000-ibm-aix* | powerpc-ibm-aix*) |
1855 CPICFLAG= | |
1856 CXXPICFLAG= | |
1857 FPICFLAG= | |
9172
cd68431b395a
configure.in: shared library fixes for AIX and HPUX
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9171
diff
changeset
|
1858 library_path_var=LIBPATH |
2813 | 1859 ;; |
1860 hppa*-hp-hpux*) | |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1861 if test $ac_cv_f77_compiler_gnu = yes; then |
2813 | 1862 FPICFLAG=-fPIC |
1863 else | |
1864 FPICFLAG=+Z | |
1865 fi | |
1866 SHLEXT=sl | |
1867 SH_LDFLAGS="-shared -fPIC" | |
9172
cd68431b395a
configure.in: shared library fixes for AIX and HPUX
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9171
diff
changeset
|
1868 library_path_var=SHLIB_PATH |
cd68431b395a
configure.in: shared library fixes for AIX and HPUX
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9171
diff
changeset
|
1869 ;; |
cd68431b395a
configure.in: shared library fixes for AIX and HPUX
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9171
diff
changeset
|
1870 ia64*-hp-hpux*) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1871 if test $ac_cv_f77_compiler_gnu = yes; then |
9172
cd68431b395a
configure.in: shared library fixes for AIX and HPUX
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9171
diff
changeset
|
1872 FPICFLAG=-fPIC |
cd68431b395a
configure.in: shared library fixes for AIX and HPUX
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9171
diff
changeset
|
1873 else |
cd68431b395a
configure.in: shared library fixes for AIX and HPUX
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9171
diff
changeset
|
1874 FPICFLAG=+Z |
cd68431b395a
configure.in: shared library fixes for AIX and HPUX
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9171
diff
changeset
|
1875 fi |
cd68431b395a
configure.in: shared library fixes for AIX and HPUX
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9171
diff
changeset
|
1876 SH_LDFLAGS="-shared -fPIC" |
2813 | 1877 ;; |
1878 *-sgi-*) | |
1879 CPICFLAG= | |
1880 CXXPICFLAG= | |
1881 FPICFLAG= | |
1882 ;; | |
1883 sparc-sun-sunos4*) | |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1884 if test $ac_cv_f77_compiler_gnu = yes; then |
2813 | 1885 FPICFLAG=-fPIC |
1886 else | |
1887 FPICFLAG=-PIC | |
1888 fi | |
3059 | 1889 SH_LD=ld |
1890 SH_LDFLAGS="-assert nodefinitions" | |
2813 | 1891 ;; |
3606 | 1892 sparc-sun-solaris2* | i386-pc-solaris2*) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1893 if test $ac_cv_f77_compiler_gnu = yes; then |
2813 | 1894 FPICFLAG=-fPIC |
1895 else | |
3775 | 1896 FPICFLAG=-KPIC |
1897 fi | |
1898 if test "$GCC" = yes; then | |
1899 CPICFLAG=-fPIC | |
1900 else | |
1901 CPICFLAG=-KPIC | |
2813 | 1902 fi |
3775 | 1903 if test "$GXX" = yes; then |
1904 CXXPICFLAG=-fPIC | |
1905 SH_LDFLAGS=-shared | |
1906 else | |
1907 CXXPICFLAG=-KPIC | |
1908 SH_LDFLAGS=-G | |
1909 fi | |
6087 | 1910 ## Template closures in archive libraries need a different mechanism. |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1911 if test "$GXX" != yes; then |
4323 | 1912 TEMPLATE_AR='$(CXX)' |
3775 | 1913 TEMPLATE_ARFLAGS="-xar -o" |
1914 fi | |
2813 | 1915 ;; |
1916 esac | |
1917 | |
5844 | 1918 AC_MSG_NOTICE([defining FPICFLAG to be $FPICFLAG]) |
1919 AC_MSG_NOTICE([defining CPICFLAG to be $CPICFLAG]) | |
1920 AC_MSG_NOTICE([defining CXXPICFLAG to be $CXXPICFLAG]) | |
1921 AC_MSG_NOTICE([defining SHLEXT to be $SHLEXT]) | |
1922 AC_MSG_NOTICE([defining SHLLIB to be $SHLLIB]) | |
1923 AC_MSG_NOTICE([defining SHLBIN to be $SHLBIN]) | |
1924 AC_MSG_NOTICE([defining SHLEXT_VER to be $SHLEXT_VER]) | |
1925 AC_MSG_NOTICE([defining SHLLIB_VER to be $SHLLIB_VER]) | |
1926 AC_MSG_NOTICE([defining SHLBIN_VER to be $SHLBIN_VER]) | |
1927 AC_MSG_NOTICE([defining SHLLINKEXT to be $SHLLINKEXT]) | |
6051 | 1928 AC_MSG_NOTICE([defining LIBPRE to be $LIBPRE]) |
9186
49a0c58a7dcf
Added SHLPRE for SHLEXT instead of SHLLIBPRE
marco_atzeri@yahoo.it
parents:
9178
diff
changeset
|
1929 AC_MSG_NOTICE([defining SHLPRE to be $SHLPRE]) |
9189
8a348e4be8bb
repair damage done when applying changeset 49a0c58a7dcf
John W. Eaton <jwe@octave.org>
parents:
9187
diff
changeset
|
1930 AC_MSG_NOTICE([defining SHLLIBPRE to be $SHLLIBPRE]) |
8618
f8b3ece45bda
use separate prefix for shllib and shlbin files
John W. Eaton <jwe@octave.org>
parents:
8607
diff
changeset
|
1931 AC_MSG_NOTICE([defining SHLBINPRE to be $SHLBINPRE]) |
5844 | 1932 AC_MSG_NOTICE([defining SH_LD to be $SH_LD]) |
1933 AC_MSG_NOTICE([defining SH_LDFLAGS to be $SH_LDFLAGS]) | |
1934 AC_MSG_NOTICE([defining DL_LD to be $DL_LD]) | |
1935 AC_MSG_NOTICE([defining DL_LDFLAGS to be $DL_LDFLAGS]) | |
1936 AC_MSG_NOTICE([defining MKOCTFILE_DL_LDFLAGS to be $MKOCTFILE_DL_LDFLAGS]) | |
1937 AC_MSG_NOTICE([defining SONAME_FLAGS to be $SONAME_FLAGS]) | |
1938 AC_MSG_NOTICE([defining NO_OCT_FILE_STRIP to be $NO_OCT_FILE_STRIP]) | |
1939 AC_MSG_NOTICE([defining TEMPLATE_AR to be $TEMPLATE_AR]) | |
1940 AC_MSG_NOTICE([defining TEMPLATE_ARFLAGS to be $TEMPLATE_ARFLAGS]) | |
6137 | 1941 AC_MSG_NOTICE([defining CRUFT_DLL_DEFS to be $CRUFT_DLL_DEFS]) |
1942 AC_MSG_NOTICE([defining OCTAVE_DLL_DEFS to be $OCTAVE_DLL_DEFS]) | |
1943 AC_MSG_NOTICE([defining OCTINTERP_DLL_DEFS to be $OCTINTERP_DLL_DEFS]) | |
15257
7ee62f559a73
Fix compilation under Windows with GUI and LLVM enabled.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15238
diff
changeset
|
1944 AC_MSG_NOTICE([defining OCTGUI_DLL_DEFS to be $OCTGUI_DLL_DEFS]) |
7825
13871b7de124
Import sources for OpenGL-based renderer.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7789
diff
changeset
|
1945 AC_MSG_NOTICE([defining OCTGRAPHICS_DLL_DEFS to be $OCTGRAPHICS_DLL_DEFS]) |
5844 | 1946 AC_MSG_NOTICE([defining library_path_var to be $library_path_var]) |
2813 | 1947 AC_SUBST(FPICFLAG) |
1948 AC_SUBST(CPICFLAG) | |
1949 AC_SUBST(CXXPICFLAG) | |
1950 AC_SUBST(SHLEXT) | |
4102 | 1951 AC_SUBST(SHLLIB) |
1952 AC_SUBST(SHLBIN) | |
4126 | 1953 AC_SUBST(SHLEXT_VER) |
1954 AC_SUBST(SHLLIB_VER) | |
1955 AC_SUBST(SHLBIN_VER) | |
1956 AC_SUBST(SHLLINKEXT) | |
6051 | 1957 AC_SUBST(LIBPRE) |
9186
49a0c58a7dcf
Added SHLPRE for SHLEXT instead of SHLLIBPRE
marco_atzeri@yahoo.it
parents:
9178
diff
changeset
|
1958 AC_SUBST(SHLPRE) |
9189
8a348e4be8bb
repair damage done when applying changeset 49a0c58a7dcf
John W. Eaton <jwe@octave.org>
parents:
9187
diff
changeset
|
1959 AC_SUBST(SHLLIBPRE) |
8618
f8b3ece45bda
use separate prefix for shllib and shlbin files
John W. Eaton <jwe@octave.org>
parents:
8607
diff
changeset
|
1960 AC_SUBST(SHLBINPRE) |
2813 | 1961 AC_SUBST(SH_LD) |
1962 AC_SUBST(SH_LDFLAGS) | |
4759 | 1963 AC_SUBST(DL_LD) |
1964 AC_SUBST(DL_LDFLAGS) | |
1965 AC_SUBST(MKOCTFILE_DL_LDFLAGS) | |
3036 | 1966 AC_SUBST(SONAME_FLAGS) |
4199 | 1967 AC_SUBST(NO_OCT_FILE_STRIP) |
3775 | 1968 AC_SUBST(TEMPLATE_AR) |
1969 AC_SUBST(TEMPLATE_ARFLAGS) | |
6141 | 1970 AC_SUBST(CRUFT_DLL_DEFS) |
1971 AC_SUBST(OCTAVE_DLL_DEFS) | |
1972 AC_SUBST(OCTINTERP_DLL_DEFS) | |
15257
7ee62f559a73
Fix compilation under Windows with GUI and LLVM enabled.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15238
diff
changeset
|
1973 AC_SUBST(OCTGUI_DLL_DEFS) |
7825
13871b7de124
Import sources for OpenGL-based renderer.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7789
diff
changeset
|
1974 AC_SUBST(OCTGRAPHICS_DLL_DEFS) |
4104 | 1975 AC_SUBST(library_path_var) |
9613
16907d1153d1
attempt to fix LD_PRELOAD for Cygwin
John W. Eaton <jwe@octave.org>
parents:
9610
diff
changeset
|
1976 AC_SUBST(ldpreloadsep) |
4102 | 1977 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1978 ### More configure argument checking related to linking |
13024
f3c53fea9fb5
maint: more linking tweaks
John W. Eaton <jwe@octave.org>
parents:
13016
diff
changeset
|
1979 |
f3c53fea9fb5
maint: more linking tweaks
John W. Eaton <jwe@octave.org>
parents:
13016
diff
changeset
|
1980 AC_ARG_ENABLE([no-undefined], |
15238
c4779a180134
avoid confusing --disable-foo (default is yes) configure help messages
John W. Eaton <jwe@octave.org>
parents:
15237
diff
changeset
|
1981 [AS_HELP_STRING([--disable-no-undefined], |
c4779a180134
avoid confusing --disable-foo (default is yes) configure help messages
John W. Eaton <jwe@octave.org>
parents:
15237
diff
changeset
|
1982 [don't pass -no-undefined to libtool when linking Octave and its shared libraries])], |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1983 [case $enableval in |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1984 yes) NO_UNDEFINED_LDFLAG="-no-undefined" ;; |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1985 no) NO_UNDEFINED_LDFLAG="" ;; |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1986 *) AC_MSG_ERROR([bad value $enableval for --disable-no-undefined]) ;; |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1987 esac], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1988 [NO_UNDEFINED_LDFLAG="-no-undefined"]) |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1989 AC_SUBST(NO_UNDEFINED_LDFLAG) |
4388 | 1990 |
13024
f3c53fea9fb5
maint: more linking tweaks
John W. Eaton <jwe@octave.org>
parents:
13016
diff
changeset
|
1991 AC_ARG_ENABLE([link-all-dependencies], |
f3c53fea9fb5
maint: more linking tweaks
John W. Eaton <jwe@octave.org>
parents:
13016
diff
changeset
|
1992 [AS_HELP_STRING([--enable-link-all-dependencies], |
f3c53fea9fb5
maint: more linking tweaks
John W. Eaton <jwe@octave.org>
parents:
13016
diff
changeset
|
1993 [link Octave and its shared libraries with all dependencies, not just those immediately referenced (should not be needed on most systems)])], |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1994 [case $enableval in |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1995 yes) link_all_deps=yes ;; |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
1996 no) link_all_deps=no ;; |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1997 *) AC_MSG_ERROR([bad value $enableval for --enable-link-all-depenencies]) |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1998 ;; |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1999 esac], |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2000 [link_all_deps=no]) |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2001 AM_CONDITIONAL([AMCOND_LINK_ALL_DEPS], [test $link_all_deps = yes]) |
3249 | 2002 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2003 ## Dynamic linking is now enabled only if we are building shared |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2004 ## libs and some API for dynamic linking has been detected. |
9171
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2005 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
2006 ## FIXME: A lot of the following duplicates the functionality of |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2007 ## code generated by the dlopen option for LT_INIT. |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2008 |
3705 | 2009 LD_CXX='$(CXX)' |
3232 | 2010 RDYNAMIC_FLAG= |
4110 | 2011 DL_API_MSG="" |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2012 dlopen_api=no |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2013 shl_load_api=no |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2014 loadlibrary_api=no |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2015 dyld_api=no |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2016 |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2017 if test $SHARED_LIBS = yes || test $ENABLE_DYNAMIC_LINKING = yes; then |
4163 | 2018 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
2019 case $lt_cv_dlopen in |
10036
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
2020 dlopen) |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2021 dlopen_api=yes |
10036
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
2022 DL_API_MSG="(dlopen)" |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2023 AC_DEFINE(HAVE_DLOPEN_API, 1, |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2024 [Define to 1 if your system has dlopen, dlsym, dlerror, and dlclose for dynamic linking.]) |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2025 OCTAVE_CXX_FLAG([-rdynamic], [RDYNAMIC_FLAG=-rdynamic]) |
10036
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
2026 ;; |
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
2027 shl_load) |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2028 shl_load_api=yes |
10036
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
2029 DL_API_MSG="(shl_load)" |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2030 AC_DEFINE(HAVE_SHL_LOAD_API, 1, |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2031 [Define to 1 if your system has shl_load and shl_findsym for dynamic linking.]) |
10036
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
2032 ;; |
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
2033 LoadLibrary) |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2034 loadlibrary_api=yes |
10036
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
2035 DL_API_MSG="(LoadLibrary)" |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2036 AC_DEFINE(HAVE_LOADLIBRARY_API, 1, |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2037 [Define to 1 if your system has LoadLibrary for dynamic linking.]) |
10036
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
2038 ;; |
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
2039 dyld) |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2040 dyld_api=yes |
10036
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
2041 DL_API_MSG="(dyld)" |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2042 AC_DEFINE(HAVE_DYLD_API, 1, |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2043 [Define to 1 if your system has dyld for dynamic linking.]) |
10036
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
2044 ;; |
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
2045 esac |
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
2046 |
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
2047 DL_LIBS="$lt_cv_dlopen_libs" |
9515 | 2048 AC_SUBST(DL_LIBS) |
4110 | 2049 |
13010
edc5ec6e949b
maint: allow --enable-static --disable-dl to work again
John W. Eaton <jwe@octave.org>
parents:
12772
diff
changeset
|
2050 ## Disable dynamic linking if capability is not present. |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2051 if test $dlopen_api = yes \ |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2052 || test $shl_load_api = yes \ |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2053 || test $loadlibrary_api = yes \ |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2054 || test $dyld_api = yes; then |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2055 # some form of dynamic linking present |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2056 ENABLE_DYNAMIC_LINKING=yes |
13010
edc5ec6e949b
maint: allow --enable-static --disable-dl to work again
John W. Eaton <jwe@octave.org>
parents:
12772
diff
changeset
|
2057 else |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2058 ENABLE_DYNAMIC_LINKING=no |
1978 | 2059 fi |
4163 | 2060 fi |
2061 | |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2062 if test $ENABLE_DYNAMIC_LINKING = yes; then |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
2063 AC_DEFINE(ENABLE_DYNAMIC_LINKING, 1, [Define to 1 if using dynamic linking.]) |
13010
edc5ec6e949b
maint: allow --enable-static --disable-dl to work again
John W. Eaton <jwe@octave.org>
parents:
12772
diff
changeset
|
2064 fi |
edc5ec6e949b
maint: allow --enable-static --disable-dl to work again
John W. Eaton <jwe@octave.org>
parents:
12772
diff
changeset
|
2065 |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2066 AM_CONDITIONAL([AMCOND_ENABLE_DYNAMIC_LINKING], |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2067 [test $ENABLE_DYNAMIC_LINKING = yes]) |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2068 |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2069 if test $SHARED_LIBS = yes; then |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
2070 LIBOCTINTERP="-loctinterp$SHLLINKEXT" |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
2071 LIBOCTAVE="-loctave$SHLLINKEXT" |
1978 | 2072 else |
15195 | 2073 LIBOCTINTERP='$(top_builddir)/libinterp/liboctinterp.$(LIBEXT)' |
10004
e517da95bf98
Eliminate TOPDIR variable in favor of built-in automake variables
Rik <rdrider0-list@yahoo.com>
parents:
10003
diff
changeset
|
2074 LIBOCTAVE='$(top_builddir)/liboctave/liboctave.$(LIBEXT)' |
1664 | 2075 fi |
4163 | 2076 |
4110 | 2077 AC_SUBST(LD_CXX) |
3232 | 2078 AC_SUBST(RDYNAMIC_FLAG) |
4128 | 2079 AC_SUBST(ENABLE_DYNAMIC_LINKING) |
4110 | 2080 AC_SUBST(LIBOCTINTERP) |
2081 AC_SUBST(LIBOCTAVE) | |
1901 | 2082 |
8998
a48fba01e4ac
optimize isnan/isinf/isfinite mappers
Jaroslav Hajek <highegg@gmail.com>
parents:
8940
diff
changeset
|
2083 |
15932
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
2084 if test "$cross_compiling" = yes && test -n "$ac_tool_prefix"; then |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
2085 CROSS_TOOL_PREFIX="$ac_tool_prefix" |
17770
4dcbbfaa4e22
Correctly set MKOCTFILE_XXXX tools in cross compile mode (Bug #40321)
John Donoghue <john.donoghue@ieee.org>
parents:
17744
diff
changeset
|
2086 MKOCTFILE_AR='$(shell echo $(AR) | $(SED) "s,$(CROSS_TOOL_PREFIX),,")' |
4dcbbfaa4e22
Correctly set MKOCTFILE_XXXX tools in cross compile mode (Bug #40321)
John Donoghue <john.donoghue@ieee.org>
parents:
17744
diff
changeset
|
2087 MKOCTFILE_CC='$(shell echo $(CC) | $(SED) "s,$(CROSS_TOOL_PREFIX),,")' |
4dcbbfaa4e22
Correctly set MKOCTFILE_XXXX tools in cross compile mode (Bug #40321)
John Donoghue <john.donoghue@ieee.org>
parents:
17744
diff
changeset
|
2088 MKOCTFILE_CXX='$(shell echo $(CXX) | $(SED) "s,$(CROSS_TOOL_PREFIX),,")' |
4dcbbfaa4e22
Correctly set MKOCTFILE_XXXX tools in cross compile mode (Bug #40321)
John Donoghue <john.donoghue@ieee.org>
parents:
17744
diff
changeset
|
2089 MKOCTFILE_DL_LD='$(shell echo $(DL_LD) | $(SED) "s,$(CROSS_TOOL_PREFIX),,")' |
4dcbbfaa4e22
Correctly set MKOCTFILE_XXXX tools in cross compile mode (Bug #40321)
John Donoghue <john.donoghue@ieee.org>
parents:
17744
diff
changeset
|
2090 MKOCTFILE_F77='$(shell echo $(F77) | $(SED) "s,$(CROSS_TOOL_PREFIX),,")' |
4dcbbfaa4e22
Correctly set MKOCTFILE_XXXX tools in cross compile mode (Bug #40321)
John Donoghue <john.donoghue@ieee.org>
parents:
17744
diff
changeset
|
2091 MKOCTFILE_LD_CXX='$(shell echo $(LD_CXX) | $(SED) "s,$(CROSS_TOOL_PREFIX),,")' |
4dcbbfaa4e22
Correctly set MKOCTFILE_XXXX tools in cross compile mode (Bug #40321)
John Donoghue <john.donoghue@ieee.org>
parents:
17744
diff
changeset
|
2092 MKOCTFILE_RANLIB='$(shell echo $(RANLIB) | $(SED) "s,$(CROSS_TOOL_PREFIX),,")' |
15932
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
2093 else |
15945
a653526ea4a5
use mkoctfile, not octave_config_info to get default pkg compiler tools
John W. Eaton <jwe@octave.org>
parents:
15938
diff
changeset
|
2094 MKOCTFILE_AR="$AR" |
15932
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
2095 MKOCTFILE_CC="$CC" |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
2096 MKOCTFILE_CXX="$CXX" |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
2097 MKOCTFILE_DL_LD="$DL_LD" |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
2098 MKOCTFILE_F77="$F77" |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
2099 MKOCTFILE_LD_CXX="$LD_CXX" |
15945
a653526ea4a5
use mkoctfile, not octave_config_info to get default pkg compiler tools
John W. Eaton <jwe@octave.org>
parents:
15938
diff
changeset
|
2100 MKOCTFILE_RANLIB="$RANLIB" |
15932
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
2101 fi |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
2102 AC_MSG_NOTICE([defining CROSS_TOOL_PREFIX to be $CROSS_TOOL_PREFIX]) |
15945
a653526ea4a5
use mkoctfile, not octave_config_info to get default pkg compiler tools
John W. Eaton <jwe@octave.org>
parents:
15938
diff
changeset
|
2103 AC_MSG_NOTICE([defining MKOCTFILE_AR to be $MKOCTFILE_AR]) |
15932
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
2104 AC_MSG_NOTICE([defining MKOCTFILE_CC to be $MKOCTFILE_CC]) |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
2105 AC_MSG_NOTICE([defining MKOCTFILE_CXX to be $MKOCTFILE_CXX]) |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
2106 AC_MSG_NOTICE([defining MKOCTFILE_DL_LD to be $MKOCTFILE_DL_LD]) |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
2107 AC_MSG_NOTICE([defining MKOCTFILE_F77 to be $MKOCTFILE_F77]) |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
2108 AC_MSG_NOTICE([defining MKOCTFILE_LD_CXX to be $MKOCTFILE_LD_CXX]) |
15945
a653526ea4a5
use mkoctfile, not octave_config_info to get default pkg compiler tools
John W. Eaton <jwe@octave.org>
parents:
15938
diff
changeset
|
2109 AC_MSG_NOTICE([defining MKOCTFILE_RANLIB to be $MKOCTFILE_RANLIB]) |
15932
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
2110 AC_SUBST(CROSS_TOOL_PREFIX) |
15945
a653526ea4a5
use mkoctfile, not octave_config_info to get default pkg compiler tools
John W. Eaton <jwe@octave.org>
parents:
15938
diff
changeset
|
2111 AC_SUBST(MKOCTFILE_AR) |
15932
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
2112 AC_SUBST(MKOCTFILE_CC) |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
2113 AC_SUBST(MKOCTFILE_CXX) |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
2114 AC_SUBST(MKOCTFILE_DL_LD) |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
2115 AC_SUBST(MKOCTFILE_F77) |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
2116 AC_SUBST(MKOCTFILE_LD_CXX) |
15945
a653526ea4a5
use mkoctfile, not octave_config_info to get default pkg compiler tools
John W. Eaton <jwe@octave.org>
parents:
15938
diff
changeset
|
2117 AC_SUBST(MKOCTFILE_RANLIB) |
15932
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
2118 |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
2119 ### Check for existence of various libraries |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
2120 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2121 ## OS-specific test for dirent, opendir. |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2122 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2123 mingw*) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
2124 if test $have_msvc = yes; then |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2125 AC_CHECK_LIB([dirent], [opendir]) |
10123
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
2126 LIBS="$LIBS -ladvapi32 -lgdi32 -lws2_32 -luser32 -lkernel32" |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
2127 else |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
2128 LIBS="$LIBS -lgdi32 -lws2_32 -luser32 -lkernel32" |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
2129 fi |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2130 LIBS="$LIBS -lgdi32 -lws2_32 -luser32 -lkernel32" |
956 | 2131 ;; |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2132 msdosmsvc) |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2133 AC_CHECK_LIB([dirent], [opendir]) |
10123
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
2134 LIBS="$LIBS -ladvapi32 -lgdi32 -lws2_32 -luser32 -lkernel32" |
956 | 2135 ;; |
2136 esac | |
2137 | |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2138 ## Find a termlib to use. |
15302
a8cfbc1911e4
build: Set TERM_LIBS before checking for READLINE.
Rik <rik@octave.org>
parents:
15298
diff
changeset
|
2139 OCTAVE_CHECK_LIB_TERMLIB |
8185
69c5cce38c29
implement 64-bit arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents:
8169
diff
changeset
|
2140 |
869 | 2141 ### Checks for header files. |
2142 | |
832 | 2143 AC_HEADER_DIRENT |
1377 | 2144 AC_HEADER_SYS_WAIT |
2097 | 2145 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2146 ## C headers |
4051 | 2147 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2148 dnl Use multiple AC_CHECKs to avoid line continuations '\' in list |
16078
9439f3b5c5fa
Restore default floating point state after calling Java
Mike Miller <mtmiller@ieee.org>
parents:
16068
diff
changeset
|
2149 AC_CHECK_HEADERS([curses.h direct.h dlfcn.h floatingpoint.h fpu_control.h]) |
9439f3b5c5fa
Restore default floating point state after calling Java
Mike Miller <mtmiller@ieee.org>
parents:
16068
diff
changeset
|
2150 AC_CHECK_HEADERS([grp.h ieeefp.h inttypes.h locale.h memory.h ncurses.h]) |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2151 AC_CHECK_HEADERS([poll.h pthread.h pwd.h sunmath.h sys/ioctl.h]) |
17196
bc20614022aa
build: Redo LLVM macros to disable JIT rather than stop build if headers not found.
Rik <rik@octave.org>
parents:
17180
diff
changeset
|
2152 AC_CHECK_HEADERS([sys/param.h sys/poll.h sys/resource.h]) |
17946 | 2153 AC_CHECK_HEADERS([sys/select.h termcap.h]) |
3887 | 2154 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2155 ## C++ headers |
4051 | 2156 |
2157 AC_LANG_PUSH(C++) | |
15134
edae65062740
build: Move unordered_map header tests to acinclude.m4 and add caching of results.
Rik <rik@octave.org>
parents:
15130
diff
changeset
|
2158 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2159 AC_CHECK_HEADERS([sstream]) |
15134
edae65062740
build: Move unordered_map header tests to acinclude.m4 and add caching of results.
Rik <rik@octave.org>
parents:
15130
diff
changeset
|
2160 OCTAVE_UNORDERED_MAP_HEADERS |
edae65062740
build: Move unordered_map header tests to acinclude.m4 and add caching of results.
Rik <rik@octave.org>
parents:
15130
diff
changeset
|
2161 |
4051 | 2162 AC_LANG_POP(C++) |
2163 | |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2164 ## Find a termio header to include. |
1901 | 2165 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
2166 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
|
2167 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
|
2168 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
|
2169 AC_CHECK_HEADERS([fnmatch.h], have_fnmatch_h=yes, have_fnmatch_h=no) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2170 AC_CHECK_HEADERS([conio.h], have_conio_h=yes, have_conio_h=no) |
3249 | 2171 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
2172 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
|
2173 && test $have_termio_h != yes \ |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
2174 && test $have_sgtty_h != yes; then |
4064 | 2175 AC_MSG_WARN([I couldn't find termios.h, termio.h, or sgtty.h!]) |
832 | 2176 fi |
869 | 2177 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2178 ## 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
|
2179 if test $have_msvc = yes; then |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2180 AC_DEFINE(NOMINMAX, 1, [Define to 1 if you want to avoid min/max macro definition in Windows headers.]) |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2181 fi |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2182 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2183 ### Determine types and size of types. |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2184 |
15172
c7d466a02065
configure.ac: Add checks for a few missing types.
Rik <rik@octave.org>
parents:
15170
diff
changeset
|
2185 AC_TYPE_INT64_T |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2186 AC_TYPE_MODE_T |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2187 AC_TYPE_OFF_T |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2188 AC_TYPE_PID_T |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2189 AC_TYPE_SIZE_T |
15172
c7d466a02065
configure.ac: Add checks for a few missing types.
Rik <rik@octave.org>
parents:
15170
diff
changeset
|
2190 AC_TYPE_SSIZE_T |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2191 AC_TYPE_UID_T |
15172
c7d466a02065
configure.ac: Add checks for a few missing types.
Rik <rik@octave.org>
parents:
15170
diff
changeset
|
2192 AC_TYPE_UINT64_T |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2193 AC_CHECK_TYPES([dev_t, ino_t]) |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2194 AC_CHECK_TYPES([long long int, unsigned long long int]) |
15172
c7d466a02065
configure.ac: Add checks for a few missing types.
Rik <rik@octave.org>
parents:
15170
diff
changeset
|
2195 AC_CHECK_TYPES([ptrdiff_t]) |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2196 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2197 ## How big are ints and how are they oriented? |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2198 ## These could probably be eliminated in favor of run-time checks. |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2199 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2200 AC_CHECK_SIZEOF([short]) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2201 AC_CHECK_SIZEOF([int]) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2202 AC_CHECK_SIZEOF([long]) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2203 AC_CHECK_SIZEOF([long long]) |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2204 ## Check for long double type (for 64-bit integers) |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2205 AC_CHECK_SIZEOF([long double]) |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2206 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2207 ### Check structures and existence of necessary members |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2208 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2209 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
|
2210 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
|
2211 AC_CHECK_MEMBERS([struct group.gr_passwd]) |
3887 | 2212 |
1186 | 2213 AC_STRUCT_TIMEZONE |
8998
a48fba01e4ac
optimize isnan/isinf/isfinite mappers
Jaroslav Hajek <highegg@gmail.com>
parents:
8940
diff
changeset
|
2214 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2215 ### Check compiler characteristics. |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2216 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2217 ## Does compiler have support for new friend template declarations? |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2218 OCTAVE_CXX_NEW_FRIEND_TEMPLATE_DECL |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2219 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2220 ## Does reinterpret_cast fail for function pointers? |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2221 OCTAVE_CXX_BROKEN_REINTERPRET_CAST |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2222 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2223 ## Check if C++ compiler allows placement delete. |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2224 OCTAVE_CXX_PLACEMENT_DELETE |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2225 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2226 ## Check if C++ compiler can auto allocate variable sized arrays. |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2227 OCTAVE_CXX_DYNAMIC_AUTO_ARRAYS |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2228 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2229 ## Check that C compiler and libraries support IEEE754 data format. |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2230 OCTAVE_IEEE754_DATA_FORMAT |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2231 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2232 ## Is C++ runtime library ISO compliant? |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2233 OCTAVE_CXX_ISO_COMPLIANT_LIBRARY |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2234 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2235 ## Are bit_and, bit_or, and bit_xor defined as templated operators? |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2236 OCTAVE_CXX_BITWISE_OP_TEMPLATES |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2237 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2238 ## Can complex class set components independently? |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2239 OCTAVE_CXX_COMPLEX_SETTERS |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2240 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2241 ## Are there functions to access real/imag parts of numbers via references? |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2242 OCTAVE_CXX_COMPLEX_REFERENCE_ACCESSORS |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2243 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2244 ## Check if fast integer arithmetics based on bit tricks is available. |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2245 OCTAVE_FAST_INT_OPS |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2246 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2247 ## Does the C compiler handle alloca() and const correctly? |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2248 AC_FUNC_ALLOCA |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2249 |
15130
f635710b3090
configure.ac: Add AM_PROG_CC_C_O check for Automake subdir-objects support in C compiler.
Rik <rik@octave.org>
parents:
15127
diff
changeset
|
2250 ## Does the C compiler support Automake subdir-objects option? |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
2251 AM_PROG_CC_C_O |
15130
f635710b3090
configure.ac: Add AM_PROG_CC_C_O check for Automake subdir-objects support in C compiler.
Rik <rik@octave.org>
parents:
15127
diff
changeset
|
2252 |
15142
f4684192158e
configure.ac: Split gnulib initialization into 2 parts to match recommended usage.
Rik <rik@octave.org>
parents:
15141
diff
changeset
|
2253 ### gnulib initialization: part 2 |
f4684192158e
configure.ac: Split gnulib initialization into 2 parts to match recommended usage.
Rik <rik@octave.org>
parents:
15141
diff
changeset
|
2254 ### After all include and path modifications have taken place |
f4684192158e
configure.ac: Split gnulib initialization into 2 parts to match recommended usage.
Rik <rik@octave.org>
parents:
15141
diff
changeset
|
2255 ### and at the same priority level as function checks. |
f4684192158e
configure.ac: Split gnulib initialization into 2 parts to match recommended usage.
Rik <rik@octave.org>
parents:
15141
diff
changeset
|
2256 |
f4684192158e
configure.ac: Split gnulib initialization into 2 parts to match recommended usage.
Rik <rik@octave.org>
parents:
15141
diff
changeset
|
2257 gl_INIT |
f4684192158e
configure.ac: Split gnulib initialization into 2 parts to match recommended usage.
Rik <rik@octave.org>
parents:
15141
diff
changeset
|
2258 |
1788 | 2259 ### Checks for functions and variables. |
869 | 2260 |
15452
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2261 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
|
2262 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
|
2263 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
|
2264 AC_CHECK_FUNCS([ctermid dup2]) |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2265 AC_CHECK_FUNCS([endgrent endpwent execvp expm1 expm1f fork]) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2266 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
|
2267 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
|
2268 AC_CHECK_FUNCS([isascii kill]) |
ffd1a99733bd
build: Check for isascii() before using it.
Rik <rik@octave.org>
parents:
15846
diff
changeset
|
2269 AC_CHECK_FUNCS([lgamma lgammaf lgamma_r lgammaf_r]) |
15452
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2270 AC_CHECK_FUNCS([log1p log1pf pipe]) |
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2271 AC_CHECK_FUNCS([realpath resolvepath roundl]) |
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2272 AC_CHECK_FUNCS([select setgrent setpwent siglongjmp strsignal]) |
18523
c936beeda029
delete unused files
Lasse Schuirmann <lasse@schuirmann.net>
parents:
18515
diff
changeset
|
2273 AC_CHECK_FUNCS([tcgetattr tcsetattr tgammaf toascii]) |
17946 | 2274 AC_CHECK_FUNCS([umask waitpid]) |
15452
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2275 AC_CHECK_FUNCS([_kbhit]) |
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2276 |
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2277 dnl There are no workarounds in the code for missing these functions. |
15454
9b9f6dba39e0
build: Use putenv module from gnulib.
Rik <rik@octave.org>
parents:
15453
diff
changeset
|
2278 AC_CHECK_FUNCS([modf pow sqrt sqrtf], [], |
15452
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2279 [AC_MSG_ERROR([Missing function required to build Octave])]) |
1300 | 2280 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2281 ## exp2, round, tgamma function checks |
9171
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2282 AC_LANG_PUSH(C++) |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2283 AC_CHECK_DECLS([exp2, round, tgamma], [], [], [[#include <cmath>]]) |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2284 AC_CHECK_FUNCS([exp2 round tgamma]) |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2285 AH_VERBATIM([Z_FUNCS_AND_DECLS], [ |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2286 #if defined (__cplusplus) |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2287 extern "C" { |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2288 #endif |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2289 #if HAVE_EXP2 && ! HAVE_DECL_EXP2 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2290 double exp2 (double); |
9171
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2291 #endif |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2292 #if HAVE_ROUND && ! HAVE_DECL_ROUND |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2293 double round (double); |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2294 #endif |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2295 #if HAVE_TGAMMA && ! HAVE_DECL_TGAMMA |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2296 double tgamma (double); |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2297 #endif |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2298 #if defined (__cplusplus) |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2299 } |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2300 #endif |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2301 ]) |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2302 AC_LANG_POP(C++) |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2303 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2304 ## Look in <cmath> for the IEEE functions isnan, isinf, isfinite that we need. |
4163 | 2305 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2306 OCTAVE_CHECK_FUNC_CMATH(isnan) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2307 OCTAVE_CHECK_FUNC_CMATH(isinf) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2308 OCTAVE_CHECK_FUNC_CMATH(isfinite) |
18540
89bd70fae066
fix initialization problem for Inf, NaN, and NA values (bug #41667)
John W. Eaton <jwe@octave.org>
parents:
18536
diff
changeset
|
2309 OCTAVE_CHECK_FUNC_CMATH(signbit) |
4110 | 2310 |
15874
11d5a7276b6d
configure.ac: Remove some no longer accurate comments.
Rik <rik@octave.org>
parents:
15873
diff
changeset
|
2311 ## Check for Inf and NaN functions |
956 | 2312 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
2313 case $canonical_host_type in |
1384 | 2314 m68k-hp-hpux*) |
15874
11d5a7276b6d
configure.ac: Remove some no longer accurate comments.
Rik <rik@octave.org>
parents:
15873
diff
changeset
|
2315 ## I am told that Inf and NaN don't work on m68k HP sytems. |
956 | 2316 ;; |
2317 *) | |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2318 AC_CHECK_FUNCS([finite isnan isinf signbit]) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2319 AC_CHECK_FUNCS([_finite _isnan]) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2320 AC_CHECK_DECLS([signbit], , , [#include <math.h>]) |
6103 | 2321 ;; |
2322 esac | |
2323 | |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2324 ## Check for nonstandard, but common math functions, that we need. |
1076 | 2325 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2326 dnl Use multiple AC_CHECKs to avoid line continuations '\' in list |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2327 AC_CHECK_FUNCS([acosh acoshf asinh asinhf atanh atanhf cbrt cbrtf]) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2328 AC_CHECK_FUNCS([erf erff erfc erfcf exp2f hypotf _hypotf log2 log2f]) |
1076 | 2329 |
15852
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2330 ## 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
|
2331 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
|
2332 [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
|
2333 [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
|
2334 #include <math.h> |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2335 ]], [[ |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2336 double x = M_LN2;]])], |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2337 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
|
2338 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
|
2339 ]) |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2340 |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2341 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
|
2342 ## 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
|
2343 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
|
2344 [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
|
2345 [save_CPPFLAGS="$CPPFLAGS" |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2346 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
|
2347 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
|
2348 #include <math.h> |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2349 ]], [[ |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2350 double x = M_LN2;]])], |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2351 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
|
2352 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
|
2353 CPPFLAGS="$save_CPPFLAGS" |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2354 ]) |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2355 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
|
2356 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
|
2357 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
|
2358 [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
|
2359 CPPFLAGS="$CPPFLAGS -D_USE_MATH_DEFINES" |
1978 | 2360 fi |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
2361 fi |
15852
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2362 |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2363 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
|
2364 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
|
2365 [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
|
2366 else |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2367 AC_MSG_ERROR([MATH DEFINES in math.h such as M_PI are required to build Octave]) |
4163 | 2368 fi |
2369 | |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2370 ## Windows-specific tests for extra #defines |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2371 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2372 msdosmsvc | mingw*) |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2373 AC_MSG_CHECKING([for required _WIN32_WINNT]) |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2374 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2375 #include <windows.h> |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2376 #if _WIN32_WINNT < 0x0403 |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2377 #error "Wrong version" |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2378 #endif |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2379 ]], [])], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2380 [AC_MSG_RESULT([none])], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2381 [AC_DEFINE(_WIN32_WINNT, 0x0403, |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2382 [Define to 0x0403 to access InitializeCriticalSectionAndSpinCount.]) |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2383 AC_MSG_RESULT([0x0403])]) |
956 | 2384 ;; |
2385 esac | |
2386 | |
15452
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2387 ## Windows-specific use of functions |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2388 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2389 msdosmsvc | mingw*) |
15452
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2390 AC_CHECK_FUNCS([setvbuf], [], |
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2391 [AC_MSG_ERROR([Missing function required to build Octave])]) |
18352
c460566106f0
configure.ac: Find Qt libs in framework option for Macs (bug #41236)
Michael C. Grant <mcg@cvxr.com>
parents:
18342
diff
changeset
|
2392 ;; |
15452
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2393 esac |
3130 | 2394 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2395 ## Cygwin kluge for getrusage. |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2396 AC_CHECK_FUNCS([getrusage]) |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2397 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2398 cygwin*) |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2399 AC_DEFINE(RUSAGE_TIMES_ONLY, 1, |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2400 [Define to 1 if your struct rusage only has time information.]) |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2401 ;; |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2402 esac |
869 | 2403 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2404 ## Check for CGDisplayBitsPerPixel function on Mac OSX systems with Carbon |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
2405 if test $have_framework_carbon = yes; then |
15145
142e377e7e28
configure.ac: Don't run OCTAVE_CARBON_CGDISPLAYBITSPERPIXEL unless Carbon Framework is present.
Rik <rik@octave.org>
parents:
15143
diff
changeset
|
2406 OCTAVE_CARBON_CGDISPLAYBITSPERPIXEL |
142e377e7e28
configure.ac: Don't run OCTAVE_CARBON_CGDISPLAYBITSPERPIXEL unless Carbon Framework is present.
Rik <rik@octave.org>
parents:
15143
diff
changeset
|
2407 fi |
3887 | 2408 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2409 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
|
2410 |
1388 | 2411 AC_FUNC_CLOSEDIR_VOID |
1225 | 2412 |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
2413 ## Check return type of matherr() |
15143
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2414 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
|
2415 [octave_cv_func_matherr_type], |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2416 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2417 #include <math.h> |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2418 ]], [[ |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2419 struct exception *x; |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2420 x->type; |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2421 x->name; |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2422 ]])], |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2423 octave_cv_func_matherr_type=yes, |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2424 octave_cv_func_matherr_type=no) |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2425 ]) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
2426 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
|
2427 AC_DEFINE(EXCEPTION_IN_MATH, 1, |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2428 [Define to 1 if math.h declares struct exception for matherr().]) |
2488 | 2429 fi |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
2430 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2431 ## Signal stuff. |
869 | 2432 |
5844 | 2433 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
|
2434 [[#include <signal.h> |
5844 | 2435 /* NetBSD declares sys_siglist in unistd.h. */ |
2436 #if HAVE_UNISTD_H | |
2437 # include <unistd.h> | |
2438 #endif | |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2439 ]]) |
2633 | 2440 |
16012
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2441 ### Need to disable building documentation if either gnuplot or |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2442 ### makeinfo are missing. Skip this warning if building docs was |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2443 ### disabled with a configure option. |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2444 |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2445 if test -n "$DOCDIR"; then |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2446 if test -n "$warn_gnuplot"; then |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2447 DOCDIR= |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2448 warn_docs_gnuplot="building documentation disabled because gnuplot was not found; make dist will fail" |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2449 OCTAVE_CONFIGURE_WARNING([warn_docs_gnuplot]) |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2450 fi |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2451 if test -n "$warn_makeinfo"; then |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2452 DOCDIR= |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2453 warn_docs_makeinfo="building documentation disabled because makeinfo was not found; make dist will fail" |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2454 OCTAVE_CONFIGURE_WARNING([warn_docs_makeinfo]) |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2455 fi |
14579
4dc85c4f151b
Disable building documentation if gnuplot not found
Mike Miller <mtmiller@ieee.org>
parents:
14561
diff
changeset
|
2456 fi |
4dc85c4f151b
Disable building documentation if gnuplot not found
Mike Miller <mtmiller@ieee.org>
parents:
14561
diff
changeset
|
2457 AM_CONDITIONAL([AMCOND_BUILD_DOCS], [test -n "$DOCDIR"]) |
2032 | 2458 |
4645 | 2459 ### Maybe add -Wall, -W, and -Wshadow to compiler flags now that we're |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
2460 ### done feature testing. |
869 | 2461 |
11514
a1386fab2a02
configure.ac: eliminate some code duplication when checking for extra compiler flags
John W. Eaton <jwe@octave.org>
parents:
11513
diff
changeset
|
2462 GCC_EXTRA_FLAGS="-Wall -W -Wshadow -Wformat -Wpointer-arith -Wmissing-prototypes -Wstrict-prototypes -Wwrite-strings -Wcast-align -Wcast-qual" |
a1386fab2a02
configure.ac: eliminate some code duplication when checking for extra compiler flags
John W. Eaton <jwe@octave.org>
parents:
11513
diff
changeset
|
2463 |
a1386fab2a02
configure.ac: eliminate some code duplication when checking for extra compiler flags
John W. Eaton <jwe@octave.org>
parents:
11513
diff
changeset
|
2464 GXX_EXTRA_FLAGS="-Wall -W -Wshadow -Wold-style-cast -Wformat -Wpointer-arith -Wwrite-strings -Wcast-align -Wcast-qual" |
a1386fab2a02
configure.ac: eliminate some code duplication when checking for extra compiler flags
John W. Eaton <jwe@octave.org>
parents:
11513
diff
changeset
|
2465 |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2466 try_extra_warning_flags=yes |
11514
a1386fab2a02
configure.ac: eliminate some code duplication when checking for extra compiler flags
John W. Eaton <jwe@octave.org>
parents:
11513
diff
changeset
|
2467 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2468 AC_ARG_ENABLE([extra-warning-flags], |
15238
c4779a180134
avoid confusing --disable-foo (default is yes) configure help messages
John W. Eaton <jwe@octave.org>
parents:
15237
diff
changeset
|
2469 [AS_HELP_STRING([--disable-extra-warning-flags], |
c4779a180134
avoid confusing --disable-foo (default is yes) configure help messages
John W. Eaton <jwe@octave.org>
parents:
15237
diff
changeset
|
2470 [don't add -Wall, -W, -Wshadow, and -Wold-style-cast options to CFLAGS and CXXFLAGS])], |
8938
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2471 [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
|
2472 try_extra_warning_flags=no |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2473 fi], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2474 []) |
8938
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2475 |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2476 if test $try_extra_warning_flags = yes; then |
11514
a1386fab2a02
configure.ac: eliminate some code duplication when checking for extra compiler flags
John W. Eaton <jwe@octave.org>
parents:
11513
diff
changeset
|
2477 for flag in $GCC_EXTRA_FLAGS; do |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2478 OCTAVE_CC_FLAG([$flag], [ |
11514
a1386fab2a02
configure.ac: eliminate some code duplication when checking for extra compiler flags
John W. Eaton <jwe@octave.org>
parents:
11513
diff
changeset
|
2479 WARN_CFLAGS="$WARN_CFLAGS $flag"; |
a1386fab2a02
configure.ac: eliminate some code duplication when checking for extra compiler flags
John W. Eaton <jwe@octave.org>
parents:
11513
diff
changeset
|
2480 AC_MSG_RESULT([adding $flag to WARN_CFLAGS])]) |
a1386fab2a02
configure.ac: eliminate some code duplication when checking for extra compiler flags
John W. Eaton <jwe@octave.org>
parents:
11513
diff
changeset
|
2481 done |
a1386fab2a02
configure.ac: eliminate some code duplication when checking for extra compiler flags
John W. Eaton <jwe@octave.org>
parents:
11513
diff
changeset
|
2482 for flag in $GXX_EXTRA_FLAGS; do |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2483 OCTAVE_CXX_FLAG([$flag], [ |
11514
a1386fab2a02
configure.ac: eliminate some code duplication when checking for extra compiler flags
John W. Eaton <jwe@octave.org>
parents:
11513
diff
changeset
|
2484 WARN_CXXFLAGS="$WARN_CXXFLAGS $flag"; |
a1386fab2a02
configure.ac: eliminate some code duplication when checking for extra compiler flags
John W. Eaton <jwe@octave.org>
parents:
11513
diff
changeset
|
2485 AC_MSG_RESULT([adding $flag to WARN_CXXFLAGS])]) |
a1386fab2a02
configure.ac: eliminate some code duplication when checking for extra compiler flags
John W. Eaton <jwe@octave.org>
parents:
11513
diff
changeset
|
2486 done |
405 | 2487 fi |
869 | 2488 |
11513
a2289858dcb2
more warning flags for GCC if configured with --enable-extra-warning-flags (on by default)
John W. Eaton <jwe@octave.org>
parents:
11511
diff
changeset
|
2489 GCC_STRICT_FLAGS="-Wconversion" |
2813 | 2490 |
11513
a2289858dcb2
more warning flags for GCC if configured with --enable-extra-warning-flags (on by default)
John W. Eaton <jwe@octave.org>
parents:
11511
diff
changeset
|
2491 GXX_STRICT_FLAGS="-Wconversion -Weffc++" |
8938
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2492 |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2493 try_strict_warning_flags=no |
8938
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2494 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2495 AC_ARG_ENABLE([strict-warning-flags], |
8938
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2496 [AS_HELP_STRING([--enable-strict-warning-flags], |
15238
c4779a180134
avoid confusing --disable-foo (default is yes) configure help messages
John W. Eaton <jwe@octave.org>
parents:
15237
diff
changeset
|
2497 [add extra strict warning options to CFLAGS and CXXFLAGS])], |
8938
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2498 [if test "$enableval" = yes; then |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2499 try_strict_warning_flags=yes |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2500 fi], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2501 []) |
2813 | 2502 |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2503 if test $try_strict_warning_flags = yes; then |
8938
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2504 for flag in $GCC_STRICT_FLAGS; do |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2505 OCTAVE_CC_FLAG([$flag], [ |
8938
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2506 WARN_CFLAGS="$WARN_CFLAGS $flag"; |
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2507 AC_MSG_RESULT([adding $flag to WARN_CFLAGS])]) |
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2508 done |
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2509 for flag in $GXX_STRICT_FLAGS; do |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2510 OCTAVE_CXX_FLAG([$flag], [ |
8938
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2511 WARN_CXXFLAGS="$WARN_CXXFLAGS $flag"; |
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2512 AC_MSG_RESULT([adding $flag to WARN_CXXFLAGS])]) |
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2513 done |
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2514 fi |
2813 | 2515 |
4626 | 2516 AC_SUBST(WARN_CFLAGS) |
2517 AC_SUBST(WARN_CXXFLAGS) | |
2518 | |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2519 ### Check for Java. |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2520 |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2521 build_java=yes |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2522 AC_ARG_ENABLE([java], |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2523 [AS_HELP_STRING([--disable-java], |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2524 [disable Java interface])], |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2525 [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
|
2526 build_java=no |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2527 fi], |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2528 []) |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2529 |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2530 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
|
2531 [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
|
2532 [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
|
2533 [JAVA_HOMEDIR="$withval"]) |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2534 |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2535 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
|
2536 [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
|
2537 [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
|
2538 [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
|
2539 |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2540 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
|
2541 [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
|
2542 [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
|
2543 [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
|
2544 |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2545 ## 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
|
2546 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
|
2547 ## 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
|
2548 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
|
2549 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
|
2550 fi |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2551 JAVA= |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2552 JAVAC= |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2553 JAR= |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2554 JAVA_LIBS= |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2555 |
15780
f25101b1e37f
configure.ac: Use build_java as internal script variable rather than HAVE_JAVA.
Rik <rik@octave.org>
parents:
15779
diff
changeset
|
2556 ## Fake loop so that "break" can be used to skip code blocks. |
17844
e88a8fa25125
configure.ac: add warnings on checking for JAVA to the final summary.
Carnë Draug <carandraug@octave.org>
parents:
17836
diff
changeset
|
2557 warn_java="" |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2558 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
|
2559 do |
15780
f25101b1e37f
configure.ac: Use build_java as internal script variable rather than HAVE_JAVA.
Rik <rik@octave.org>
parents:
15779
diff
changeset
|
2560 ## 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
|
2561 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
|
2562 |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2563 ## 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
|
2564 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
|
2565 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
|
2566 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
|
2567 fi |
9f3656ada658
configure.ac: Add warning message if JAVA_HOME variable is not set.
Rik <rik@octave.org>
parents:
15756
diff
changeset
|
2568 |
15780
f25101b1e37f
configure.ac: Use build_java as internal script variable rather than HAVE_JAVA.
Rik <rik@octave.org>
parents:
15779
diff
changeset
|
2569 ## 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
|
2570 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
|
2571 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
|
2572 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
|
2573 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
|
2574 fi |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2575 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
|
2576 |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2577 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
|
2578 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
|
2579 break |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2580 fi |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2581 |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2582 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
|
2583 ## 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
|
2584 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
|
2585 ## 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
|
2586 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
|
2587 fi |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2588 |
18030
f0427ca399cc
configure.ac: Remove unused JAVA_HOME_NATIVE variable.
Rik <rik@octave.org>
parents:
18025
diff
changeset
|
2589 case $build_os in |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2590 mingw* | msdosmsvc) |
15846
605488d19cb3
configure.ac: Avoid non-portable sh technique of double-quoted, backtick expressions.
Rik <rik@octave.org>
parents:
15839
diff
changeset
|
2591 ## Under Win32 platform, we want JAVA_HOME to be in MSYS format, that is |
605488d19cb3
configure.ac: Avoid non-portable sh technique of double-quoted, backtick expressions.
Rik <rik@octave.org>
parents:
15839
diff
changeset
|
2592 ## 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
|
2593 ## Use quoted paths as Java may be installed in a path with whitespaces |
605488d19cb3
configure.ac: Avoid non-portable sh technique of double-quoted, backtick expressions.
Rik <rik@octave.org>
parents:
15839
diff
changeset
|
2594 ## (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
|
2595 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
|
2596 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
|
2597 fi |
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2598 ;; |
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2599 esac |
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2600 |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2601 ## 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
|
2602 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
|
2603 JAVA_PATH="$PATH" |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2604 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
|
2605 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
|
2606 fi |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2607 |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2608 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
|
2609 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
|
2610 |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2611 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
|
2612 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
|
2613 break |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2614 fi |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2615 |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2616 ## Check Java version is recent enough. |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2617 AC_MSG_CHECKING([for Java version]) |
17661
1978a6c76aa9
Use user-specified SED during build process (bug #40273).
Rik <rik@octave.org>
parents:
17640
diff
changeset
|
2618 java_version=[`"$JAVA" -version 2>&1 | $SED -n -e 's/^[^ ]* version[^0-9"]*"\([^"]*\)"/\1/p'`] |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2619 AC_MSG_RESULT([$java_version]) |
17661
1978a6c76aa9
Use user-specified SED during build process (bug #40273).
Rik <rik@octave.org>
parents:
17640
diff
changeset
|
2620 java_major=[`echo $java_version | $SED -e 's/^\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*$/\1/'`] |
1978a6c76aa9
Use user-specified SED during build process (bug #40273).
Rik <rik@octave.org>
parents:
17640
diff
changeset
|
2621 java_minor=[`echo $java_version | $SED -e 's/^\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*$/\2/'`] |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2622 if test $java_major -ge 1 && test $java_minor -ge 5; then |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2623 : # Version is ok. Do nothing. |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2624 else |
17844
e88a8fa25125
configure.ac: add warnings on checking for JAVA to the final summary.
Carnë Draug <carandraug@octave.org>
parents:
17836
diff
changeset
|
2625 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
|
2626 break |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2627 fi |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2628 |
17819
af924e6572cb
build: Don't search path at compile time for jvm on Win32 platforms.
Rik <rik@octave.org>
parents:
17816
diff
changeset
|
2629 ## At this point Win32 systems have enough configuration data. |
af924e6572cb
build: Don't search path at compile time for jvm on Win32 platforms.
Rik <rik@octave.org>
parents:
17816
diff
changeset
|
2630 ## We assume that all appropriate variables (e.g. INCLUDE and LIB) already |
af924e6572cb
build: Don't search path at compile time for jvm on Win32 platforms.
Rik <rik@octave.org>
parents:
17816
diff
changeset
|
2631 ## 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
|
2632 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2633 msdosmsvc) |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2634 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
|
2635 JAVA_LIBS=-ladvapi32 |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2636 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
|
2637 [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
|
2638 break |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2639 ;; |
17819
af924e6572cb
build: Don't search path at compile time for jvm on Win32 platforms.
Rik <rik@octave.org>
parents:
17816
diff
changeset
|
2640 mingw* | cygwin*) |
af924e6572cb
build: Don't search path at compile time for jvm on Win32 platforms.
Rik <rik@octave.org>
parents:
17816
diff
changeset
|
2641 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
|
2642 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
|
2643 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
|
2644 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
|
2645 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
|
2646 else |
18276
508f67c72854
Fix native MinGW builds with spaces in JAVA_HOME (bug #41024).
Rik <rik@octave.org>
parents:
18273
diff
changeset
|
2647 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
|
2648 fi |
af924e6572cb
build: Don't search path at compile time for jvm on Win32 platforms.
Rik <rik@octave.org>
parents:
17816
diff
changeset
|
2649 LDFLAGS="$LDFLAGS -Wl,--export-all-symbols" |
15836
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2650 fi |
17819
af924e6572cb
build: Don't search path at compile time for jvm on Win32 platforms.
Rik <rik@octave.org>
parents:
17816
diff
changeset
|
2651 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
|
2652 [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
|
2653 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
|
2654 ;; |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2655 esac |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2656 |
15777
b8bcb2c7f3e8
configure.ac: Search for jvm.dll on MingW/Cygwin platforms for Java.
Rik <rik@octave.org>
parents:
15769
diff
changeset
|
2657 ## Determine which library file name to search for. |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2658 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2659 darwin*) |
15777
b8bcb2c7f3e8
configure.ac: Search for jvm.dll on MingW/Cygwin platforms for Java.
Rik <rik@octave.org>
parents:
15769
diff
changeset
|
2660 jvmlib=libjvm.dylib |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2661 ;; |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2662 *) |
15777
b8bcb2c7f3e8
configure.ac: Search for jvm.dll on MingW/Cygwin platforms for Java.
Rik <rik@octave.org>
parents:
15769
diff
changeset
|
2663 jvmlib=libjvm.so |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2664 ;; |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2665 esac |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2666 |
15777
b8bcb2c7f3e8
configure.ac: Search for jvm.dll on MingW/Cygwin platforms for Java.
Rik <rik@octave.org>
parents:
15769
diff
changeset
|
2667 AC_MSG_CHECKING([for $jvmlib]) |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2668 |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2669 if test -z "$JAVA_LDPATH"; then |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2670 ## Run Java to try and determine library path to libjvm.so. |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2671 JAVA_TMP_LDPATH=`$JAVA -classpath ${srcdir}/build-aux OctJavaQry JAVA_LDPATH` |
17661
1978a6c76aa9
Use user-specified SED during build process (bug #40273).
Rik <rik@octave.org>
parents:
17640
diff
changeset
|
2672 JAVA_TMP_LDPATH=`echo $JAVA_TMP_LDPATH | $SED -e "s/${PATH_SEPARATOR}/ /g"` |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2673 for dir in $JAVA_TMP_LDPATH; do |
15777
b8bcb2c7f3e8
configure.ac: Search for jvm.dll on MingW/Cygwin platforms for Java.
Rik <rik@octave.org>
parents:
15769
diff
changeset
|
2674 if test -f "$dir/$jvmlib"; then |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2675 JAVA_LDPATH=$dir |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2676 break |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2677 fi |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2678 done |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2679 fi |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2680 |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2681 if test -z "$JAVA_LDPATH"; then |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
2682 ## Nothing found. Try Java again using bootpath argument. |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2683 JAVA_TMP_LDPATH=`$JAVA -classpath ${srcdir}/build-aux OctJavaQry JAVA_BOOTPATH` |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2684 JAVA_TMP_LDPATH="${JAVA_TMP_LDPATH} ${JAVA_TMP_LDPATH}/client ${JAVA_TMP_LDPATH}/server" |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2685 for dir in $JAVA_TMP_LDPATH; do |
15777
b8bcb2c7f3e8
configure.ac: Search for jvm.dll on MingW/Cygwin platforms for Java.
Rik <rik@octave.org>
parents:
15769
diff
changeset
|
2686 if test -f "$dir/$jvmlib"; then |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2687 JAVA_LDPATH=$dir |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2688 break |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2689 fi |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2690 done |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2691 fi |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2692 |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2693 if test -z "$JAVA_LDPATH"; then |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2694 ## Java failed to find it's own library path. Guess wildly. |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2695 JAVA_TMP_LDPATH=`ls -d $JAVA_HOME/jre/lib/*/client` |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2696 JAVA_TMP_LDPATH="${JAVA_TMP_LDPATH} `ls -d $JAVA_HOME/jre/lib/*/server`" |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2697 ## Add some paths that might work on Macs. |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2698 JAVA_TMP_LDPATH="${JAVA_TMP_LDPATH} ${JAVA_HOME}/../Libraries ${JAVA_HOME}/Libraries" |
15777
b8bcb2c7f3e8
configure.ac: Search for jvm.dll on MingW/Cygwin platforms for Java.
Rik <rik@octave.org>
parents:
15769
diff
changeset
|
2699 ## Add some paths that might work on MinGW |
b8bcb2c7f3e8
configure.ac: Search for jvm.dll on MingW/Cygwin platforms for Java.
Rik <rik@octave.org>
parents:
15769
diff
changeset
|
2700 JAVA_TMP_LDPATH="${JAVA_TMP_LDPATH} ${JAVA_HOME}/bin/client ${JAVA_HOME}/bin/server" |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2701 for dir in $JAVA_TMP_LDPATH; do |
15777
b8bcb2c7f3e8
configure.ac: Search for jvm.dll on MingW/Cygwin platforms for Java.
Rik <rik@octave.org>
parents:
15769
diff
changeset
|
2702 if test -f "$dir/$jvmlib"; then |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2703 JAVA_LDPATH=$dir |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2704 break |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2705 fi |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2706 done |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2707 fi |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2708 |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2709 ## Verify value passed in option --with-java-libdir |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2710 if test -n "$JAVA_LDPATH"; then |
15777
b8bcb2c7f3e8
configure.ac: Search for jvm.dll on MingW/Cygwin platforms for Java.
Rik <rik@octave.org>
parents:
15769
diff
changeset
|
2711 if test -f "${JAVA_LDPATH}/$jvmlib"; then |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2712 : # libjvm found |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2713 else |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2714 JAVA_LDPATH="" |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
2715 fi |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2716 fi |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2717 |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2718 if test -z "$JAVA_LDPATH"; then |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2719 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
|
2720 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
|
2721 break |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2722 else |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2723 AC_MSG_RESULT([$JAVA_LDPATH]) |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2724 fi |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2725 |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2726 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
|
2727 |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2728 ## 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
|
2729 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2730 darwin*) |
15918
18d1bd2596bf
Sneak the MacOS X "-framework JavaVM" into mkoctfile via LDFLAGS
Ben Abbott <bpabbott@mac.com>
parents:
15905
diff
changeset
|
2731 ## Sneak the -framework flag into mkoctfile via LDFLAGS |
15919
80612fee1110
Fix typo from 18d1bd2596bf (LFLAGS -> LDFLAGS)
Ben Abbott <bpabbott@mac.com>
parents:
15918
diff
changeset
|
2732 LDFLAGS="$LDFLAGS -framework JavaVM" |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2733 ## According to: http://developer.apple.com/unix/crossplatform.html |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2734 ## one must explicitly set the include path. |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2735 ## Unfortunately, the include path keeps moving around. |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2736 if test -n "$JAVA_CPPFLAGS"; then |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2737 JAVA_CPPFLAGS="-I${JAVA_CPPFLAGS}" |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2738 else |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2739 JAVA_CPPFLAGS="-I${JAVA_HOME}/include -I/System/Library/Frameworks/JavaVM.framework/Home/include -I/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Headers -I/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers" |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2740 fi |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2741 JAVA_LIBS="-framework JavaVM" |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2742 ;; |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2743 *) |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2744 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
|
2745 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
|
2746 else |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2747 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
|
2748 fi |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2749 ;; |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2750 esac |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2751 |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2752 ## Verify jni.h include file exists. |
17661
1978a6c76aa9
Use user-specified SED during build process (bug #40273).
Rik <rik@octave.org>
parents:
17640
diff
changeset
|
2753 JNI_PATH=`echo $JAVA_CPPFLAGS | $SED -e 's/-I//g'` |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2754 have_jni=no |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
2755 for dir in $JNI_PATH; do |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2756 if test -f "${dir}/jni.h"; then have_jni=yes; break; fi |
15846
605488d19cb3
configure.ac: Avoid non-portable sh technique of double-quoted, backtick expressions.
Rik <rik@octave.org>
parents:
15839
diff
changeset
|
2757 done |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2758 if test $have_jni = yes; then |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2759 AC_MSG_RESULT([$dir]) |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2760 else |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2761 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
|
2762 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
|
2763 break |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2764 fi |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2765 |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2766 ## 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
|
2767 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
|
2768 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
|
2769 [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
|
2770 break |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2771 done |
17844
e88a8fa25125
configure.ac: add warnings on checking for JAVA to the final summary.
Carnë Draug <carandraug@octave.org>
parents:
17836
diff
changeset
|
2772 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
|
2773 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
|
2774 fi |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2775 |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
2776 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
|
2777 AC_SUBST(JAVA) |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2778 AC_SUBST(JAVAC) |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2779 AC_SUBST(JAR) |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2780 AC_SUBST(JAVA_CPPFLAGS) |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2781 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
|
2782 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
|
2783 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
|
2784 |
15110
4f6e058e4161
Integrate GUI building with regular octave build system.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15093
diff
changeset
|
2785 ### GUI/Qt related tests. |
4f6e058e4161
Integrate GUI building with regular octave build system.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15093
diff
changeset
|
2786 |
15596
5f031158c693
Use pkg-config to discover Qt (pkg-config is already a requirement anyway).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15538
diff
changeset
|
2787 QT_CPPFLAGS= |
5f031158c693
Use pkg-config to discover Qt (pkg-config is already a requirement anyway).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15538
diff
changeset
|
2788 QT_LDFLAGS= |
5f031158c693
Use pkg-config to discover Qt (pkg-config is already a requirement anyway).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15538
diff
changeset
|
2789 QT_LIBS= |
15297
2f0b74cf8b4d
configure.ac: Conditionally build GUI using same construct as conditionally building DOCs.
Rik <rik@octave.org>
parents:
15296
diff
changeset
|
2790 win32_terminal=no |
15873
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2791 build_gui=yes |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2792 AC_ARG_ENABLE([gui], |
15238
c4779a180134
avoid confusing --disable-foo (default is yes) configure help messages
John W. Eaton <jwe@octave.org>
parents:
15237
diff
changeset
|
2793 [AS_HELP_STRING([--disable-gui], [don't build the GUI])], |
15873
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2794 [if test "$enableval" = no; then build_gui=no; fi], []) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2795 |
19588
722ff3e45bea
build: Don't build GUI when OpenGL is disabled or not found (bug #44017)
Mike Miller <mtmiller@ieee.org>
parents:
19366
diff
changeset
|
2796 if test -z "$OPENGL_LIBS"; then |
722ff3e45bea
build: Don't build GUI when OpenGL is disabled or not found (bug #44017)
Mike Miller <mtmiller@ieee.org>
parents:
19366
diff
changeset
|
2797 build_gui=no |
722ff3e45bea
build: Don't build GUI when OpenGL is disabled or not found (bug #44017)
Mike Miller <mtmiller@ieee.org>
parents:
19366
diff
changeset
|
2798 if test $check_opengl = yes; then |
722ff3e45bea
build: Don't build GUI when OpenGL is disabled or not found (bug #44017)
Mike Miller <mtmiller@ieee.org>
parents:
19366
diff
changeset
|
2799 warn_gui="OpenGL libs (GL and GLU) not found -- disabling GUI" |
722ff3e45bea
build: Don't build GUI when OpenGL is disabled or not found (bug #44017)
Mike Miller <mtmiller@ieee.org>
parents:
19366
diff
changeset
|
2800 else |
722ff3e45bea
build: Don't build GUI when OpenGL is disabled or not found (bug #44017)
Mike Miller <mtmiller@ieee.org>
parents:
19366
diff
changeset
|
2801 warn_gui="--without-opengl was specified -- disabling GUI" |
722ff3e45bea
build: Don't build GUI when OpenGL is disabled or not found (bug #44017)
Mike Miller <mtmiller@ieee.org>
parents:
19366
diff
changeset
|
2802 fi |
722ff3e45bea
build: Don't build GUI when OpenGL is disabled or not found (bug #44017)
Mike Miller <mtmiller@ieee.org>
parents:
19366
diff
changeset
|
2803 OCTAVE_CONFIGURE_WARNING([warn_gui]) |
722ff3e45bea
build: Don't build GUI when OpenGL is disabled or not found (bug #44017)
Mike Miller <mtmiller@ieee.org>
parents:
19366
diff
changeset
|
2804 fi |
722ff3e45bea
build: Don't build GUI when OpenGL is disabled or not found (bug #44017)
Mike Miller <mtmiller@ieee.org>
parents:
19366
diff
changeset
|
2805 |
15873
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2806 if test $build_gui = yes; then |
17836
b1610bf6d9a8
configure.ac: add warnings about disabling GUI to the final summary.
Carnë Draug <carandraug@octave.org>
parents:
17821
diff
changeset
|
2807 |
b1610bf6d9a8
configure.ac: add warnings about disabling GUI to the final summary.
Carnë Draug <carandraug@octave.org>
parents:
17821
diff
changeset
|
2808 warn_gui="" |
15296
f19d0bce85da
build: Add check for Qt libraries to configure.ac.
Rik <rik@octave.org>
parents:
15295
diff
changeset
|
2809 ## Check for Qt libraries |
18509
1075f2543574
* configure.ac: Define list of Qt modules once.
John W. Eaton <jwe@octave.org>
parents:
18498
diff
changeset
|
2810 QT_MODULES="QtCore QtGui QtNetwork QtOpenGL" |
1075f2543574
* configure.ac: Define list of Qt modules once.
John W. Eaton <jwe@octave.org>
parents:
18498
diff
changeset
|
2811 PKG_CHECK_MODULES(QT, [$QT_MODULES], |
15296
f19d0bce85da
build: Add check for Qt libraries to configure.ac.
Rik <rik@octave.org>
parents:
15295
diff
changeset
|
2812 [], |
17836
b1610bf6d9a8
configure.ac: add warnings about disabling GUI to the final summary.
Carnë Draug <carandraug@octave.org>
parents:
17821
diff
changeset
|
2813 [warn_gui="Qt libraries not found -- disabling GUI" |
15873
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2814 build_gui=no]) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2815 |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2816 if test $build_gui = yes; then |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2817 ## Retrieve Qt compilation and linker flags |
18509
1075f2543574
* configure.ac: Define list of Qt modules once.
John W. Eaton <jwe@octave.org>
parents:
18498
diff
changeset
|
2818 QT_CPPFLAGS="`$PKG_CONFIG --cflags-only-I $QT_MODULES`" |
1075f2543574
* configure.ac: Define list of Qt modules once.
John W. Eaton <jwe@octave.org>
parents:
18498
diff
changeset
|
2819 QT_LDFLAGS="`$PKG_CONFIG --libs-only-L $QT_MODULES`" |
1075f2543574
* configure.ac: Define list of Qt modules once.
John W. Eaton <jwe@octave.org>
parents:
18498
diff
changeset
|
2820 QT_LIBS="`$PKG_CONFIG --libs-only-l $QT_MODULES`" |
15873
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2821 |
18352
c460566106f0
configure.ac: Find Qt libs in framework option for Macs (bug #41236)
Michael C. Grant <mcg@cvxr.com>
parents:
18342
diff
changeset
|
2822 case $host_os in |
c460566106f0
configure.ac: Find Qt libs in framework option for Macs (bug #41236)
Michael C. Grant <mcg@cvxr.com>
parents:
18342
diff
changeset
|
2823 *darwin*) |
c460566106f0
configure.ac: Find Qt libs in framework option for Macs (bug #41236)
Michael C. Grant <mcg@cvxr.com>
parents:
18342
diff
changeset
|
2824 ## Qt might be installed in framework |
18378
97984c1c41f0
Part 2: Find Qt libs in framework option for Macs (bug #41236)
Michael C. Grant <mcg@cvxr.com>
parents:
18352
diff
changeset
|
2825 if test -z "$QT_LIBS"; then |
18509
1075f2543574
* configure.ac: Define list of Qt modules once.
John W. Eaton <jwe@octave.org>
parents:
18498
diff
changeset
|
2826 QT_LDFLAGS="`$PKG_CONFIG --libs-only-other $QT_MODULES | tr ' ' '\n' | $GREP -e '-F' | uniq | tr '\n' ' '`" |
1075f2543574
* configure.ac: Define list of Qt modules once.
John W. Eaton <jwe@octave.org>
parents:
18498
diff
changeset
|
2827 QT_LIBS="`$PKG_CONFIG --libs-only-other $QT_MODULES | tr ' ' '\n' | $GREP -v -e '-F' | uniq | tr '\n' ' '`" |
18378
97984c1c41f0
Part 2: Find Qt libs in framework option for Macs (bug #41236)
Michael C. Grant <mcg@cvxr.com>
parents:
18352
diff
changeset
|
2828 ## Enabling link_all_deps works around libtool's imperfect handling |
97984c1c41f0
Part 2: Find Qt libs in framework option for Macs (bug #41236)
Michael C. Grant <mcg@cvxr.com>
parents:
18352
diff
changeset
|
2829 ## of the -F flag |
97984c1c41f0
Part 2: Find Qt libs in framework option for Macs (bug #41236)
Michael C. Grant <mcg@cvxr.com>
parents:
18352
diff
changeset
|
2830 AM_CONDITIONAL([AMCOND_LINK_ALL_DEPS], |
97984c1c41f0
Part 2: Find Qt libs in framework option for Macs (bug #41236)
Michael C. Grant <mcg@cvxr.com>
parents:
18352
diff
changeset
|
2831 [test $link_all_deps = yes || test -n "$QT_LDFLAGS"]) |
97984c1c41f0
Part 2: Find Qt libs in framework option for Macs (bug #41236)
Michael C. Grant <mcg@cvxr.com>
parents:
18352
diff
changeset
|
2832 fi |
18352
c460566106f0
configure.ac: Find Qt libs in framework option for Macs (bug #41236)
Michael C. Grant <mcg@cvxr.com>
parents:
18342
diff
changeset
|
2833 ;; |
c460566106f0
configure.ac: Find Qt libs in framework option for Macs (bug #41236)
Michael C. Grant <mcg@cvxr.com>
parents:
18342
diff
changeset
|
2834 esac |
c460566106f0
configure.ac: Find Qt libs in framework option for Macs (bug #41236)
Michael C. Grant <mcg@cvxr.com>
parents:
18342
diff
changeset
|
2835 |
15873
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2836 ## Check for Qt4 |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2837 if ! `$PKG_CONFIG --atleast-version=4.0.0 QtCore`; then |
17836
b1610bf6d9a8
configure.ac: add warnings about disabling GUI to the final summary.
Carnë Draug <carandraug@octave.org>
parents:
17821
diff
changeset
|
2838 warn_gui="Qt >= 4.0.0 not found -- disabling GUI" |
15873
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2839 build_gui=no |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2840 fi |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2841 fi |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2842 |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2843 if test $build_gui = yes; then |
16669
c7d4146c570d
check for Qt build tools with $host prefix
John W. Eaton <jwe@octave.org>
parents:
16662
diff
changeset
|
2844 AC_CHECK_TOOLS(MOC, [moc-qt5 moc-qt4 moc]) |
c7d4146c570d
check for Qt build tools with $host prefix
John W. Eaton <jwe@octave.org>
parents:
16662
diff
changeset
|
2845 AC_CHECK_TOOLS(UIC, [uic-qt5 uic-qt4 uic]) |
17565
ddecb2e231d4
configure.ac: Search for rcc variants on Cygwin to build GUI.
marco atzeri <marco.atzeri@gmail.com>
parents:
17562
diff
changeset
|
2846 AC_CHECK_TOOLS(RCC, [rcc-qt5 rcc-qt4 rcc]) |
16669
c7d4146c570d
check for Qt build tools with $host prefix
John W. Eaton <jwe@octave.org>
parents:
16662
diff
changeset
|
2847 AC_CHECK_TOOLS(LRELEASE, [lrelease-qt5 lrelease-qt4 lrelease]) |
16244
b74c4e967f76
gui: remove binary language files from repo and generate them during build
Torsten <ttl@justmail.de>
parents:
16171
diff
changeset
|
2848 if test -n "$MOC" && test -n "$UIC" && test -n "$RCC" && test -n "$LRELEASE"; then |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
2849 AC_DEFINE(HAVE_QT, 1, |
16244
b74c4e967f76
gui: remove binary language files from repo and generate them during build
Torsten <ttl@justmail.de>
parents:
16171
diff
changeset
|
2850 [Define to 1 if Qt is available (libraries, developer header files, utility programs (moc, uic, rcc, and lrelease))]) |
15873
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2851 else |
17836
b1610bf6d9a8
configure.ac: add warnings about disabling GUI to the final summary.
Carnë Draug <carandraug@octave.org>
parents:
17821
diff
changeset
|
2852 warn_gui="Qt utility programs moc, uic, rcc, and lrelease not found -- disabling GUI" |
15873
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2853 build_gui=no |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2854 fi |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2855 fi |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2856 |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2857 if test $build_gui = yes; then |
17111
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17106
diff
changeset
|
2858 OCTAVE_CHECK_FUNC_QABSTRACTITEMMODEL_BEGINRESETMODEL |
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17106
diff
changeset
|
2859 if test $octave_cv_func_qabstractitemmodel_beginresetmodel = no; then |
17836
b1610bf6d9a8
configure.ac: add warnings about disabling GUI to the final summary.
Carnë Draug <carandraug@octave.org>
parents:
17821
diff
changeset
|
2860 warn_gui="QAbstractItemModel::beginResetModel() not found -- disabling GUI" |
17111
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17106
diff
changeset
|
2861 build_gui=no |
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17106
diff
changeset
|
2862 fi |
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17106
diff
changeset
|
2863 fi |
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17106
diff
changeset
|
2864 |
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17106
diff
changeset
|
2865 if test $build_gui = yes; then |
18036
c97ee13f1027
fix build for systems without QFont::Monospace
John W. Eaton <jwe@octave.org>
parents:
18030
diff
changeset
|
2866 OCTAVE_CHECK_QFONT_MONOSPACE |
18973
625e3bb65885
don't require Qt 4.7 (bug #42657)
John W. Eaton <jwe@octave.org>
parents:
18914
diff
changeset
|
2867 OCTAVE_CHECK_QFONT_FORCE_INTEGER_METRICS |
15873
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2868 OCTAVE_CHECK_FUNC_SETPLACEHOLDERTEXT |
18216
e54cfaae830b
Make editor tabs draggable if feature is available
Richard Crozier richard dot crozier(at)yahoo.co.uk
parents:
18177
diff
changeset
|
2869 OCTAVE_CHECK_FUNC_QTABWIDGET_SETMOVABLE |
18854
0a66861d8069
implementation of search in selection in gui editor (bbug #41196)
Torsten <ttl@justmail.de>
parents:
18810
diff
changeset
|
2870 OCTAVE_CHECK_FUNC_QSCI_FINDSELECTION |
15298
704ab1b4c369
build: Properly choose qmake if Qt3 and Qt4 are installed (Bug #37101)
Rik <rik@octave.org>
parents:
15297
diff
changeset
|
2871 fi |
15292
637e3b7d6a56
configure.ac: Add check for Qscintilla library before building GUI.
Rik <rik@octave.org>
parents:
15291
diff
changeset
|
2872 |
15873
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2873 if test $build_gui = yes; then |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
2874 ## Check for Qscintilla library which is used in the GUI editor. |
15873
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2875 AC_CACHE_CHECK([whether Qscintilla library is installed], |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2876 [octave_cv_lib_qscintilla], |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2877 [save_CPPFLAGS="$CPPFLAGS" |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2878 save_LDFLAGS="$LDFLAGS" |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2879 save_LIBS="$LIBS" |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2880 CPPFLAGS="$QT_CPPFLAGS $CPPFLAGS" |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2881 LDFLAGS="$QT_LDFLAGS $LDFLAGS" |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2882 LIBS="$QT_LIBS -lqscintilla2" |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2883 AC_LANG_PUSH(C++) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2884 AC_LINK_IFELSE([AC_LANG_PROGRAM([[ |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2885 #include <Qsci/qscilexersql.h> |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2886 ]], [[ |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2887 QsciLexerSQL sqlLexer(0); |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2888 ]])], |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2889 octave_cv_lib_qscintilla=yes, |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2890 octave_cv_lib_qscintilla=no) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2891 CPPFLAGS="$save_CPPFLAGS" |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2892 LDFLAGS="$save_LDFLAGS" |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2893 LIBS="$save_LIBS" |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2894 AC_LANG_POP([C++]) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2895 ]) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2896 if test $octave_cv_lib_qscintilla = no; then |
17836
b1610bf6d9a8
configure.ac: add warnings about disabling GUI to the final summary.
Carnë Draug <carandraug@octave.org>
parents:
17821
diff
changeset
|
2897 warn_gui_editor="Qscintilla library not found -- disabling built-in GUI editor" |
b1610bf6d9a8
configure.ac: add warnings about disabling GUI to the final summary.
Carnë Draug <carandraug@octave.org>
parents:
17821
diff
changeset
|
2898 OCTAVE_CONFIGURE_WARNING([warn_gui_editor]) |
15873
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2899 else |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2900 ## Let's assume Qscintilla library is at the same location as |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2901 ## other regular Qt libraries. |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2902 QT_LIBS="$QT_LIBS -lqscintilla2" |
16733
2723d1144f11
added test for qscintilla version 2.6.0
Torsten <ttl@justmail.de>
parents:
16669
diff
changeset
|
2903 OCTAVE_CHECK_VERSION_2_6_0 |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
2904 AC_DEFINE(HAVE_QSCINTILLA, 1, |
15873
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2905 [Define to 1 if the QScintilla library and header files are available]) |
16662
72665c4ae25b
allow build to continue without QScintilla lexer for Octave
John W. Eaton <jwe@octave.org>
parents:
16659
diff
changeset
|
2906 |
72665c4ae25b
allow build to continue without QScintilla lexer for Octave
John W. Eaton <jwe@octave.org>
parents:
16659
diff
changeset
|
2907 save_CPPFLAGS="$CPPFLAGS" |
72665c4ae25b
allow build to continue without QScintilla lexer for Octave
John W. Eaton <jwe@octave.org>
parents:
16659
diff
changeset
|
2908 CPPFLAGS="$QT_CPPFLAGS $CPPFLAGS" |
72665c4ae25b
allow build to continue without QScintilla lexer for Octave
John W. Eaton <jwe@octave.org>
parents:
16659
diff
changeset
|
2909 AC_LANG_PUSH(C++) |
72665c4ae25b
allow build to continue without QScintilla lexer for Octave
John W. Eaton <jwe@octave.org>
parents:
16659
diff
changeset
|
2910 AC_CHECK_HEADERS([Qsci/qscilexeroctave.h Qsci/qscilexermatlab.h]) |
72665c4ae25b
allow build to continue without QScintilla lexer for Octave
John W. Eaton <jwe@octave.org>
parents:
16659
diff
changeset
|
2911 AC_LANG_POP(C++) |
72665c4ae25b
allow build to continue without QScintilla lexer for Octave
John W. Eaton <jwe@octave.org>
parents:
16659
diff
changeset
|
2912 CPPFLAGS="$save_CPPFLAGS" |
15873
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2913 fi |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2914 |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2915 AC_CHECK_FUNCS([setlocale], [], |
17836
b1610bf6d9a8
configure.ac: add warnings about disabling GUI to the final summary.
Carnë Draug <carandraug@octave.org>
parents:
17821
diff
changeset
|
2916 [warn_gui="setlocale not found -- disabling GUI" |
15873
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2917 build_gui=no]) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2918 |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2919 if test $build_gui = yes; then |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2920 case $host_os in |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2921 mingw* | msdosmsvc*) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2922 AC_CHECK_FUNCS([setvbuf], [win32_terminal=yes], |
17836
b1610bf6d9a8
configure.ac: add warnings about disabling GUI to the final summary.
Carnë Draug <carandraug@octave.org>
parents:
17821
diff
changeset
|
2923 [warn_gui="setvbuf not found -- disabling GUI" |
15873
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2924 build_gui=no]) |
18352
c460566106f0
configure.ac: Find Qt libs in framework option for Macs (bug #41236)
Michael C. Grant <mcg@cvxr.com>
parents:
18342
diff
changeset
|
2925 ;; |
15873
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2926 *) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2927 AC_CHECK_HEADERS([pty.h libutil.h util.h]) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2928 AC_SEARCH_LIBS([openpty], [util], |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2929 [AC_DEFINE(HAVE_OPENPTY, [], [Define whether openpty exists])]) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2930 AC_CHECK_FUNCS([chmod chown ftruncate mmap munmap], [], |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2931 [AC_MSG_ERROR([At least one of chmod, chown, ftruncate, mmap, and munmap not found -- disabling GUI]) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2932 build_gui=no]) |
18352
c460566106f0
configure.ac: Find Qt libs in framework option for Macs (bug #41236)
Michael C. Grant <mcg@cvxr.com>
parents:
18342
diff
changeset
|
2933 ;; |
15873
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2934 esac |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2935 fi |
15117
3735a0e783cb
more tweaks for the gui build
John W. Eaton <jwe@octave.org>
parents:
15116
diff
changeset
|
2936 fi |
17836
b1610bf6d9a8
configure.ac: add warnings about disabling GUI to the final summary.
Carnë Draug <carandraug@octave.org>
parents:
17821
diff
changeset
|
2937 |
b1610bf6d9a8
configure.ac: add warnings about disabling GUI to the final summary.
Carnë Draug <carandraug@octave.org>
parents:
17821
diff
changeset
|
2938 if test -n "$warn_gui"; then |
b1610bf6d9a8
configure.ac: add warnings about disabling GUI to the final summary.
Carnë Draug <carandraug@octave.org>
parents:
17821
diff
changeset
|
2939 OCTAVE_CONFIGURE_WARNING([warn_gui]) |
b1610bf6d9a8
configure.ac: add warnings about disabling GUI to the final summary.
Carnë Draug <carandraug@octave.org>
parents:
17821
diff
changeset
|
2940 fi |
15873
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2941 fi |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2942 |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2943 AM_CONDITIONAL([AMCOND_BUILD_GUI], [test $build_gui = yes]) |
18338
7a1a71e3f328
configure.ac: Fix broken build with AMCOND_HAVE_LLVM.
Rik <rik@octave.org>
parents:
18328
diff
changeset
|
2944 AM_CONDITIONAL([AMCOND_HAVE_QSCINTILLA], |
7a1a71e3f328
configure.ac: Fix broken build with AMCOND_HAVE_LLVM.
Rik <rik@octave.org>
parents:
18328
diff
changeset
|
2945 [test "$octave_cv_lib_qscintilla" = yes]) |
15156
141b0b108292
allow building without gui to work
John W. Eaton <jwe@octave.org>
parents:
15150
diff
changeset
|
2946 AM_CONDITIONAL([WIN32_TERMINAL], [test $win32_terminal = yes]) |
15596
5f031158c693
Use pkg-config to discover Qt (pkg-config is already a requirement anyway).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15538
diff
changeset
|
2947 AC_SUBST(QT_CPPFLAGS) |
5f031158c693
Use pkg-config to discover Qt (pkg-config is already a requirement anyway).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15538
diff
changeset
|
2948 AC_SUBST(QT_LDFLAGS) |
5f031158c693
Use pkg-config to discover Qt (pkg-config is already a requirement anyway).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15538
diff
changeset
|
2949 AC_SUBST(QT_LIBS) |
15116
3d7a7ae53bbf
Further integration of GUI in the build system.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15115
diff
changeset
|
2950 |
1146 | 2951 ### Run configure in subdirectories. |
2952 | |
1304 | 2953 export CC |
2954 export CXX | |
2955 export F77 | |
2956 | |
16330
306e0ac231d0
move AH_BOTTOM output to separate header file
John W. Eaton <jwe@octave.org>
parents:
16329
diff
changeset
|
2957 AH_BOTTOM([#include "oct-conf-post.h"]) |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2958 |
15779
4456ad3d8a56
configure.ac: Ensure that all AC_DEFINEs are captured by UGLY_DEFS variable.
Rik <rik@octave.org>
parents:
15777
diff
changeset
|
2959 ### Make all AC_DEFINES available to testif feature of test.m function. |
4456ad3d8a56
configure.ac: Ensure that all AC_DEFINEs are captured by UGLY_DEFS variable.
Rik <rik@octave.org>
parents:
15777
diff
changeset
|
2960 ### This must reside at the bottom of configure.ac after all AC_DEFINES |
4456ad3d8a56
configure.ac: Ensure that all AC_DEFINEs are captured by UGLY_DEFS variable.
Rik <rik@octave.org>
parents:
15777
diff
changeset
|
2961 ### have been made. |
4456ad3d8a56
configure.ac: Ensure that all AC_DEFINEs are captured by UGLY_DEFS variable.
Rik <rik@octave.org>
parents:
15777
diff
changeset
|
2962 |
4456ad3d8a56
configure.ac: Ensure that all AC_DEFINEs are captured by UGLY_DEFS variable.
Rik <rik@octave.org>
parents:
15777
diff
changeset
|
2963 AC_OUTPUT_MAKE_DEFS |
3923 | 2964 |
869 | 2965 ### Do the substitutions in all the Makefiles. |
2966 | |
8850
538184c540a9
Add make target "configfiles" to automatically regenerate configuration files
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
8849
diff
changeset
|
2967 AC_SUBST(ac_config_files) |
9645 | 2968 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
|
2969 |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2970 AC_CONFIG_FILES([ |
16330
306e0ac231d0
move AH_BOTTOM output to separate header file
John W. Eaton <jwe@octave.org>
parents:
16329
diff
changeset
|
2971 oct-conf-post.h:oct-conf-post.in.h |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19349
diff
changeset
|
2972 Makefile |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2973 doc/Makefile |
17102
c48625614ea6
Properly incorporate Doxygen into the build system
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
16088
diff
changeset
|
2974 doc/doxyhtml/Makefile |
c48625614ea6
Properly incorporate Doxygen into the build system
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
16088
diff
changeset
|
2975 doc/doxyhtml/Doxyfile |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2976 doc/interpreter/Makefile |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2977 doc/liboctave/Makefile |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2978 doc/refcard/Makefile |
18914
bebe22d2cb58
build: Create octave.desktop even when --disable-docs configured (bug #42720).
Rik <rik@octave.org>
parents:
18883
diff
changeset
|
2979 etc/icons/Makefile |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2980 examples/Makefile |
19033 | 2981 examples/code/Makefile |
2982 examples/data/Makefile | |
9946 | 2983 libgnu/Makefile |
15196
017f0b2e6933
rename gui directory to libgu
John W. Eaton <jwe@octave.org>
parents:
15195
diff
changeset
|
2984 libgui/Makefile |
15195 | 2985 libinterp/Makefile |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2986 liboctave/Makefile |
15271
648dabbb4c6b
build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
15257
diff
changeset
|
2987 liboctave/cruft/mkf77def |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2988 scripts/Makefile |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2989 src/Makefile |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2990 test/Makefile]) |
8850
538184c540a9
Add make target "configfiles" to automatically regenerate configuration files
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
8849
diff
changeset
|
2991 |
3887 | 2992 AC_OUTPUT |
1225 | 2993 |
2994 ### Print a summary so that important information isn't missed. | |
2995 | |
5844 | 2996 AC_MSG_NOTICE([ |
1225 | 2997 |
2998 Octave is now configured for $canonical_host_type | |
2999 | |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3000 Source directory: $srcdir |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3001 Installation prefix: $prefix |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3002 C compiler: $CC $XTRA_CFLAGS $WARN_CFLAGS $CFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3003 C++ compiler: $CXX $XTRA_CXXFLAGS $WARN_CXXFLAGS $CXXFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3004 Fortran compiler: $F77 $FFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3005 Fortran libraries: $FLIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3006 Lex libraries: $LEXLIB |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3007 LIBS: $LIBS |
9519
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
3008 |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3009 AMD CPPFLAGS: $AMD_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3010 AMD LDFLAGS: $AMD_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3011 AMD libraries: $AMD_LIBS |
14144
834df9f10963
remove ARPACK files from sources and restore configure checks for external ARPACK library
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
3012 ARPACK CPPFLAGS: $ARPACK_CPPFLAGS |
834df9f10963
remove ARPACK files from sources and restore configure checks for external ARPACK library
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
3013 ARPACK LDFLAGS: $ARPACK_LDFLAGS |
834df9f10963
remove ARPACK files from sources and restore configure checks for external ARPACK library
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
3014 ARPACK libraries: $ARPACK_LIBS |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3015 BLAS libraries: $BLAS_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3016 CAMD CPPFLAGS: $CAMD_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3017 CAMD LDFLAGS: $CAMD_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3018 CAMD libraries: $CAMD_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3019 CARBON libraries: $CARBON_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3020 CCOLAMD CPPFLAGS: $CCOLAMD_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3021 CCOLAMD LDFLAGS: $CCOLAMD_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3022 CCOLAMD libraries: $CCOLAMD_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3023 CHOLMOD CPPFLAGS: $CHOLMOD_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3024 CHOLMOD LDFLAGS: $CHOLMOD_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3025 CHOLMOD libraries: $CHOLMOD_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3026 COLAMD CPPFLAGS: $COLAMD_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3027 COLAMD LDFLAGS: $COLAMD_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3028 COLAMD libraries: $COLAMD_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3029 CURL CPPFLAGS: $CURL_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3030 CURL LDFLAGS: $CURL_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3031 CURL libraries: $CURL_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3032 CXSPARSE CPPFLAGS: $CXSPARSE_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3033 CXSPARSE LDFLAGS: $CXSPARSE_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3034 CXSPARSE libraries: $CXSPARSE_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3035 DL libraries: $DL_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3036 FFTW3 CPPFLAGS: $FFTW3_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3037 FFTW3 LDFLAGS: $FFTW3_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3038 FFTW3 libraries: $FFTW3_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3039 FFTW3F CPPFLAGS: $FFTW3F_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3040 FFTW3F LDFLAGS: $FFTW3F_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3041 FFTW3F libraries: $FFTW3F_LIBS |
19733
08033d583435
more consistently use _CPPFLAGS and _LDFLAGS variables
John W. Eaton <jwe@octave.org>
parents:
19732
diff
changeset
|
3042 FLTK CPPFLAGS: $FLTK_CPPFLAGS |
08033d583435
more consistently use _CPPFLAGS and _LDFLAGS variables
John W. Eaton <jwe@octave.org>
parents:
19732
diff
changeset
|
3043 FLTK LDFLAGS: $FLTK_LDFLAGS |
19732
bf25e9f7c22a
use FLTK_CFLAGS and FLTK_LIBS instead of GRAPHICS_CFLAGS and GRAPHICS_LIBS
John W. Eaton <jwe@octave.org>
parents:
19703
diff
changeset
|
3044 FLTK libraries: $FLTK_LIBS |
19733
08033d583435
more consistently use _CPPFLAGS and _LDFLAGS variables
John W. Eaton <jwe@octave.org>
parents:
19732
diff
changeset
|
3045 fontconfig CPPFLAGS: $FONTCONFIG_CPPFLAGS |
15012
a25937adede9
configure.ac: consistency on output (using the same word for the same thing)
Carnë Draug <carandraug+dev@gmail.com>
parents:
15001
diff
changeset
|
3046 fontconfig libraries: $FONTCONFIG_LIBS |
19733
08033d583435
more consistently use _CPPFLAGS and _LDFLAGS variables
John W. Eaton <jwe@octave.org>
parents:
19732
diff
changeset
|
3047 FreeType2 CPPFLAGS: $FT2_CPPFLAGS |
15012
a25937adede9
configure.ac: consistency on output (using the same word for the same thing)
Carnë Draug <carandraug+dev@gmail.com>
parents:
15001
diff
changeset
|
3048 FreeType2 libraries: $FT2_LIBS |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3049 GLPK CPPFLAGS: $GLPK_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3050 GLPK LDFLAGS: $GLPK_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3051 GLPK libraries: $GLPK_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3052 HDF5 CPPFLAGS: $HDF5_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3053 HDF5 LDFLAGS: $HDF5_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3054 HDF5 libraries: $HDF5_LIBS |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
3055 Java home: $JAVA_HOME |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
3056 Java JVM path: $JAVA_LDPATH |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
15600
diff
changeset
|
3057 Java CPPFLAGS: $JAVA_CPPFLAGS |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
15600
diff
changeset
|
3058 Java libraries: $JAVA_LIBS |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3059 LAPACK libraries: $LAPACK_LIBS |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
3060 LLVM CPPFLAGS: $LLVM_CPPFLAGS |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
3061 LLVM LDFLAGS: $LLVM_LDFLAGS |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
3062 LLVM libraries: $LLVM_LIBS |
11040
9ac165a67747
Modified configure.ac to allow specification of ImageMagick or GraphicsMagick. GraphicsMagick is still the default option.
John Swensen <jpswensen@gmail.com>
parents:
10986
diff
changeset
|
3063 Magick++ CPPFLAGS: $MAGICK_CPPFLAGS |
9ac165a67747
Modified configure.ac to allow specification of ImageMagick or GraphicsMagick. GraphicsMagick is still the default option.
John Swensen <jpswensen@gmail.com>
parents:
10986
diff
changeset
|
3064 Magick++ LDFLAGS: $MAGICK_LDFLAGS |
9ac165a67747
Modified configure.ac to allow specification of ImageMagick or GraphicsMagick. GraphicsMagick is still the default option.
John Swensen <jpswensen@gmail.com>
parents:
10986
diff
changeset
|
3065 Magick++ libraries: $MAGICK_LIBS |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3066 OPENGL libraries: $OPENGL_LIBS |
19703
a81177f4bfe6
Add __osmesa_print__.cc for offscreen rendering with OpenGL
Andreas Weber <andy.weber.aw@gmail.com>
parents:
19697
diff
changeset
|
3067 OSMesa CPPFLAGS: $OSMESA_CPPFLAGS |
a81177f4bfe6
Add __osmesa_print__.cc for offscreen rendering with OpenGL
Andreas Weber <andy.weber.aw@gmail.com>
parents:
19697
diff
changeset
|
3068 OSMesa LDFLAGS: $OSMESA_LDFLAGS |
a81177f4bfe6
Add __osmesa_print__.cc for offscreen rendering with OpenGL
Andreas Weber <andy.weber.aw@gmail.com>
parents:
19697
diff
changeset
|
3069 OSMesa libraries: $OSMESA_LIBS |
17821
82c94987abc6
build: Remove REGEX_CPPFLAGS from XTRA_CXXFLAGS.
Rik <rik@octave.org>
parents:
17820
diff
changeset
|
3070 PCRE CPPFLAGS: $PCRE_CPPFLAGS |
82c94987abc6
build: Remove REGEX_CPPFLAGS from XTRA_CXXFLAGS.
Rik <rik@octave.org>
parents:
17820
diff
changeset
|
3071 PCRE libraries: $PCRE_LIBS |
19470
23833e1bfa2e
check for PortAudio
Vytautas Jančauskas <unaudio@gmail.com>
parents:
19467
diff
changeset
|
3072 PortAudio CPPFLAGS: $PORTAUDIO_CPPFLAGS |
23833e1bfa2e
check for PortAudio
Vytautas Jančauskas <unaudio@gmail.com>
parents:
19467
diff
changeset
|
3073 PortAudio LDFLAGS: $PORTAUDIO_LDFLAGS |
23833e1bfa2e
check for PortAudio
Vytautas Jančauskas <unaudio@gmail.com>
parents:
19467
diff
changeset
|
3074 PortAudio libraries: $PORTAUDIO_LIBS |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3075 PTHREAD flags: $PTHREAD_CFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3076 PTHREAD libraries: $PTHREAD_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3077 QHULL CPPFLAGS: $QHULL_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3078 QHULL LDFLAGS: $QHULL_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3079 QHULL libraries: $QHULL_LIBS |
15424
cabe2fa4566c
build: Add and organize octave_config_info variables.
Rik <rik@octave.org>
parents:
15412
diff
changeset
|
3080 QRUPDATE CPPFLAGS: $QRUPDATE_CPPFLAGS |
cabe2fa4566c
build: Add and organize octave_config_info variables.
Rik <rik@octave.org>
parents:
15412
diff
changeset
|
3081 QRUPDATE LDFLAGS: $QRUPDATE_LDFLAGS |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3082 QRUPDATE libraries: $QRUPDATE_LIBS |
15596
5f031158c693
Use pkg-config to discover Qt (pkg-config is already a requirement anyway).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15538
diff
changeset
|
3083 Qt CPPFLAGS: $QT_CPPFLAGS |
5f031158c693
Use pkg-config to discover Qt (pkg-config is already a requirement anyway).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15538
diff
changeset
|
3084 Qt LDFLAGS: $QT_LDFLAGS |
5f031158c693
Use pkg-config to discover Qt (pkg-config is already a requirement anyway).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15538
diff
changeset
|
3085 Qt libraries: $QT_LIBS |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3086 READLINE libraries: $READLINE_LIBS |
19464
8fe2780c1491
update configure.ac to build and configure sndfile audio file utilities
Vytautas Jančauskas <unaudio@gmail.com>
parents:
17465
diff
changeset
|
3087 Sndfile CPPFLAGS: $SNDFILE_CPPFLAGS |
8fe2780c1491
update configure.ac to build and configure sndfile audio file utilities
Vytautas Jančauskas <unaudio@gmail.com>
parents:
17465
diff
changeset
|
3088 Sndfile LDFLAGS: $SNDFILE_LDFLAGS |
8fe2780c1491
update configure.ac to build and configure sndfile audio file utilities
Vytautas Jančauskas <unaudio@gmail.com>
parents:
17465
diff
changeset
|
3089 Sndfile libraries: $SNDFILE_LIBS |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3090 TERM libraries: $TERM_LIBS |
15424
cabe2fa4566c
build: Add and organize octave_config_info variables.
Rik <rik@octave.org>
parents:
15412
diff
changeset
|
3091 UMFPACK CPPFLAGS: $UMFPACK_CPPFLAGS |
cabe2fa4566c
build: Add and organize octave_config_info variables.
Rik <rik@octave.org>
parents:
15412
diff
changeset
|
3092 UMFPACK LDFLAGS: $UMFPACK_LDFLAGS |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3093 UMFPACK libraries: $UMFPACK_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3094 X11 include flags: $X11_INCFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3095 X11 libraries: $X11_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3096 Z CPPFLAGS: $Z_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3097 Z LDFLAGS: $Z_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3098 Z libraries: $Z_LIBS |
9519
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
3099 |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3100 Default pager: $DEFAULT_PAGER |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
3101 gnuplot: $GNUPLOT |
1664 | 3102 |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
3103 Build Octave GUI: $build_gui |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
3104 JIT compiler for loops: $build_jit |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
3105 Build Java interface: $build_java |
4110 | 3106 Do internal array bounds checking: $BOUNDS_CHECKING |
3107 Build static libraries: $STATIC_LIBS | |
3108 Build shared libraries: $SHARED_LIBS | |
4128 | 3109 Dynamic Linking: $ENABLE_DYNAMIC_LINKING $DL_API_MSG |
4110 | 3110 Include support for GNU readline: $USE_READLINE |
5275 | 3111 64-bit array dims and indexing: $USE_64_BIT_IDX_T |
19816
81078b0e39e8
build: Enable OpenMP by default, remove experimental warning (bug #42176)
Mike Miller <mtmiller@ieee.org>
parents:
19801
diff
changeset
|
3112 OpenMP SMP multithreading: $USE_OPENMP |
1225 | 3113 ]) |
3105 | 3114 |
3115 warn_msg_printed=false | |
3116 | |
14605
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
3117 OCTAVE_CONFIGURE_WARNING_SUMMARY |
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
3118 |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
3119 if test $ENABLE_DYNAMIC_LINKING = yes; then |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
3120 if test $SHARED_LIBS = no; then |
4469 | 3121 AC_MSG_WARN([You used --enable-dl but not --enable-shared.]) |
3122 AC_MSG_WARN([Are you sure that is what you want to do?]) | |
3123 warn_msg_printed=true | |
3124 fi | |
3125 fi | |
3126 | |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
3127 if test $USE_64_BIT_IDX_T = yes; then |
6161 | 3128 AC_MSG_WARN([]) |
5857 | 3129 AC_MSG_WARN([You used the EXPERIMENTAL --enable-64 option.]) |
3130 AC_MSG_WARN([Are you sure that is what you want to do?]) | |
3131 AC_MSG_WARN([]) | |
10331
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
3132 AC_MSG_WARN([Your Fortran compiler must have an option to generate]) |
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
3133 AC_MSG_WARN([code with 8 byte signed INTEGER values. This option]) |
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
3134 AC_MSG_WARN([should be specified in the F77_INTEGER_8_FLAG variable]) |
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
3135 AC_MSG_WARN([Make. This should work automatically for gfortran. If]) |
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
3136 AC_MSG_WARN([you use another compiler, you will need to set this]) |
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
3137 AC_MSG_WARN([variable on the configure command line. You must also]) |
14144
834df9f10963
remove ARPACK files from sources and restore configure checks for external ARPACK library
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
3138 AC_MSG_WARN([compile the ARPACK, BLAS, LAPACK, QRUPDATE, and SuiteSparse]) |
10331
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
3139 AC_MSG_WARN([libraries to use 8 byte signed integers for array indexing.]) |
6161 | 3140 AC_MSG_WARN([]) |
5857 | 3141 warn_msg_printed=true |
3105 | 3142 fi |
3143 | |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
3144 if test $native_graphics != yes; then |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
3145 AC_MSG_WARN([]) |
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
3146 AC_MSG_WARN([I didn't find the necessary libraries to compile native]) |
10011
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3147 AC_MSG_WARN([graphics. It isn't necessary to have native graphics,]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3148 AC_MSG_WARN([but you will need to have gnuplot installed or you won't]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3149 AC_MSG_WARN([be able to use any of Octave's plotting commands]) |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
3150 AC_MSG_WARN([]) |
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
3151 warn_msg_printed=true |
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
3152 fi |
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
3153 |
10011
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3154 if test -n "$warn_gnuplot"; then |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16064
diff
changeset
|
3155 if test $native_graphics = yes; then |
10011
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3156 AC_MSG_WARN([]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3157 AC_MSG_WARN([I didn't find gnuplot. Plotting commands will use the]) |
11576
8ac9687dbe9f
rename backend to graphics_toolkit
John W. Eaton <jwe@octave.org>
parents:
11542
diff
changeset
|
3158 AC_MSG_WARN([native graphics toolkit.]) |
10011
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3159 else |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3160 AC_MSG_WARN([I didn't find gnuplot. It isn't necessary to have gnuplot]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3161 AC_MSG_WARN([installed, but you won't be able to use any of Octave's]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3162 AC_MSG_WARN([plotting commands without it.]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3163 fi |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3164 AC_MSG_WARN([]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3165 AC_MSG_WARN([If gnuplot is installed, but isn't in your path, you can]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3166 AC_MSG_WARN([tell Octave where to find it by using the gnuplot_binary]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3167 AC_MSG_WARN([function. For example,]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3168 AC_MSG_WARN([]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3169 AC_MSG_WARN([gnuplot_binary ("/full/path/and/name/of/gnuplot/binary")]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3170 AC_MSG_WARN([]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3171 AC_MSG_WARN([at the Octave prompt.]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3172 AC_MSG_WARN([]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3173 AC_MSG_WARN([Setting default value to $GNUPLOT]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3174 AC_MSG_WARN([]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3175 |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3176 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
|
3177 fi |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3178 |
18584
89b7bd7d0b83
configure.ac: Use atomic reference counting by default for Qt toolkit.
Rik <rik@octave.org>
parents:
18551
diff
changeset
|
3179 if test $USE_ATOMIC_REFCOUNT = no; then |
13985
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
3180 AC_MSG_WARN([]) |
18584
89b7bd7d0b83
configure.ac: Use atomic reference counting by default for Qt toolkit.
Rik <rik@octave.org>
parents:
18551
diff
changeset
|
3181 AC_MSG_WARN([atomic reference counting disabled.]) |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
3182 AC_MSG_WARN([This feature allows access to Octave data safely from]) |
18584
89b7bd7d0b83
configure.ac: Use atomic reference counting by default for Qt toolkit.
Rik <rik@octave.org>
parents:
18551
diff
changeset
|
3183 AC_MSG_WARN([another thread, and is required when using the GUI's Qt toolkit]) |
89b7bd7d0b83
configure.ac: Use atomic reference counting by default for Qt toolkit.
Rik <rik@octave.org>
parents:
18551
diff
changeset
|
3184 AC_MSG_WARN([for plotting.]) |
13985
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
3185 AC_MSG_WARN([]) |
18584
89b7bd7d0b83
configure.ac: Use atomic reference counting by default for Qt toolkit.
Rik <rik@octave.org>
parents:
18551
diff
changeset
|
3186 fi |
13985
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
3187 |
6191 | 3188 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
|
3189 AC_MSG_NOTICE([]) |
14657
8a84849ad986
build: Restore printing some summary ./configure warnings at the end
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14630
diff
changeset
|
3190 AC_MSG_NOTICE([NOTE: Libraries or auxiliary programs may be skipped if they are]) |
8a84849ad986
build: Restore printing some summary ./configure warnings at the end
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14630
diff
changeset
|
3191 AC_MSG_NOTICE([NOTE: not found OR if they are missing required features on your]) |
8a84849ad986
build: Restore printing some summary ./configure warnings at the end
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14630
diff
changeset
|
3192 AC_MSG_NOTICE([NOTE: system. ]) |
6161 | 3193 fi |
3194 | |
3105 | 3195 ### End of configure. |