Mercurial > octave
annotate m4/acinclude.m4 @ 29949:f254c302bb9c
remove JIT compiler from Octave sources
As stated in the NEWS file entry added with this changeset, no one
has ever seriously taken on further development of the JIT compiler in
Octave since it was first added as part of a Google Summer of Code
project in 2012 and it still does nothing significant. It is out of
date with the default interpreter that walks the parse tree. Even
though we have fixed the configure script to disable it by default,
people still ask questions about how to build it, but it doesn’t seem
that they are doing that to work on it but because they think it will
make Octave code run faster (it never did, except for some extremely
simple bits of code as examples for demonstration purposes only).
* NEWS: Note change.
* configure.ac, acinclude.m4: Eliminate checks and macros related to
the JIT compiler and LLVM.
* basics.txi, install.txi, octave.texi, vectorize.txi: Remove mention
of JIT compiler and LLVM.
* jit-ir.cc, jit-ir.h, jit-typeinfo.cc, jit-typeinfo.h, jit-util.cc,
jit-util.h, pt-jit.cc, pt-jit.h: Delete.
* libinterp/parse-tree/module.mk: Update.
* Array-jit.cc: Delete.
* libinterp/template-inst/module.mk: Update.
* test/jit.tst: Delete.
* test/module.mk: Update.
* interpreter.cc (interpreter::interpreter): Don't check options for
debug_jit or jit_compiler.
* toplev.cc (F__octave_config_info__): Remove JIT compiler and LLVM
info from struct.
* ov-base.h (octave_base_value::grab, octave_base_value::release):
Delete.
* ov-builtin.h, ov-builtin.cc (octave_builtin::to_jit,
octave_builtin::stash_jit): Delete.
(octave_builtin::m_jtype): Delete data member and all uses.
* ov-usr-fcn.h, ov-usr-fcn.cc (octave_user_function::m_jit_info):
Delete data member and all uses.
(octave_user_function::get_info, octave_user_function::stash_info): Delete.
* options.h (DEBUG_JIT_OPTION, JIT_COMPILER_OPTION): Delete macro
definitions and all uses.
* octave.h, octave.cc (cmdline_options::cmdline_options): Don't handle
DEBUG_JIT_OPTION, JIT_COMPILER_OPTION): Delete.
(cmdline_options::debug_jit, cmdline_options::jit_compiler): Delete
functions and all uses.
(cmdline_options::m_debug_jit, cmdline_options::m_jit_compiler): Delete
data members and all uses.
(octave_getopt_options long_opts): Remove "debug-jit" and
"jit-compiler" from the list.
* pt-eval.cc (tree_evaluator::visit_simple_for_command,
tree_evaluator::visit_complex_for_command,
tree_evaluator::visit_while_command,
tree_evaluator::execute_user_function): Eliminate JIT compiler code.
* pt-loop.h, pt-loop.cc (tree_while_command::get_info,
tree_while_command::stash_info, tree_simple_for_command::get_info,
tree_simple_for_command::stash_info): Delete functions and all uses.
(tree_while_command::m_compiled, tree_simple_for_command::m_compiled):
Delete member variable and all uses.
* usage.h (usage_string, octave_print_verbose_usage_and_exit): Remove
[--debug-jit] and [--jit-compiler] from the message.
* Array.h (Array<T>::Array): Remove constructor that was only intended
to be used by the JIT compiler.
(Array<T>::jit_ref_count, Array<T>::jit_slice_data,
Array<T>::jit_dimensions, Array<T>::jit_array_rep): Delete.
* Marray.h (MArray<T>::MArray): Remove constructor that was only
intended to be used by the JIT compiler.
* NDArray.h (NDArray::NDarray): Remove constructor that was only
intended to be used by the JIT compiler.
* dim-vector.h (dim_vector::to_jit): Delete.
(dim_vector::dim_vector): Remove constructor that was only intended to
be used by the JIT compiler.
* codeql-analysis.yaml, make.yaml: Don't require llvm-dev.
* subst-config-vals.in.sh, subst-cross-config-vals.in.sh: Don't
substitute OCTAVE_CONF_LLVM_CPPFLAGS, OCTAVE_CONF_LLVM_LDFLAGS, or
OCTAVE_CONF_LLVM_LIBS.
* Doxyfile.in: Don't define HAVE_LLVM.
* aspell-octave.en.pws: Eliminate jit, JIT, and LLVM from the list of
spelling exceptions.
* build-env.h, build-env.in.cc (LLVM_CPPFLAGS, LLVM_LDFLAGS,
LLVM_LIBS): Delete variables and all uses.
* libinterp/corefcn/module.mk (%canon_reldir%_libcorefcn_la_CPPFLAGS):
Remove $(LLVM_CPPFLAGS) from the list.
* libinterp/parse-tree/module.mk (%canon_reldir%_libparse_tree_la_CPPFLAGS):
Remove $(LLVM_CPPFLAGS) from the list.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 10 Aug 2021 16:42:29 -0400 |
parents | e0fded8bd7bb |
children | 7677b6184c0b |
rev | line source |
---|---|
1232 | 1 dnl aclocal.m4 -- extra macros for configuring Octave |
2 dnl | |
27923
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
3 dnl -------------------------------------------------------------------- |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
4 dnl |
29358
0a5b15007766
update Octave Project Developers copyright for the new year
John W. Eaton <jwe@octave.org>
parents:
29271
diff
changeset
|
5 dnl Copyright (C) 1995-2021 The Octave Project Developers |
27918
b442ec6dda5c
use centralized file for copyright info for individual contributors
John W. Eaton <jwe@octave.org>
parents:
27842
diff
changeset
|
6 dnl |
27923
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
7 dnl See the file COPYRIGHT.md in the top-level directory of this |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
8 dnl or <https://octave.org/copyright/>. |
27918
b442ec6dda5c
use centralized file for copyright info for individual contributors
John W. Eaton <jwe@octave.org>
parents:
27842
diff
changeset
|
9 dnl |
17034
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
10 dnl |
1232 | 11 dnl This file is part of Octave. |
17034
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
12 dnl |
24534
194eb4bd202b
maint: Update punctuation for GPL v3 license text.
Rik <rik@octave.org>
parents:
24446
diff
changeset
|
13 dnl Octave is free software: you can redistribute it and/or modify it |
22755
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22509
diff
changeset
|
14 dnl under the terms of the GNU General Public License as published by |
24534
194eb4bd202b
maint: Update punctuation for GPL v3 license text.
Rik <rik@octave.org>
parents:
24446
diff
changeset
|
15 dnl the Free Software Foundation, either version 3 of the License, or |
22755
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22509
diff
changeset
|
16 dnl (at your option) any later version. |
17034
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
17 dnl |
22755
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22509
diff
changeset
|
18 dnl Octave is distributed in the hope that it will be useful, but |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22509
diff
changeset
|
19 dnl WITHOUT ANY WARRANTY; without even the implied warranty of |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22509
diff
changeset
|
20 dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22509
diff
changeset
|
21 dnl GNU General Public License for more details. |
17034
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
22 dnl |
1232 | 23 dnl You should have received a copy of the GNU General Public License |
7016 | 24 dnl along with Octave; see the file COPYING. If not, see |
24534
194eb4bd202b
maint: Update punctuation for GPL v3 license text.
Rik <rik@octave.org>
parents:
24446
diff
changeset
|
25 dnl <https://www.gnu.org/licenses/>. |
27923
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
26 dnl |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
27 dnl -------------------------------------------------------------------- |
2813 | 28 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
29 dnl Alphabetical list of macros in the OCTAVE_ namespace |
4360 | 30 dnl |
4366 | 31 dnl |
23510
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
32 dnl Figure out the hardware-vendor-os info. |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
33 dnl |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
34 AC_DEFUN([OCTAVE_CANONICAL_HOST], [ |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
35 AC_CANONICAL_HOST |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
36 if test -z "$host"; then |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
37 host=unknown-unknown-unknown |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
38 AC_MSG_WARN([configuring Octave for unknown system type]) |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
39 fi |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
40 canonical_host_type=$host |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
41 AC_SUBST(canonical_host_type) |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
42 if test -z "$host_cpu"; then |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
43 host_cpu=unknown |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
44 fi |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
45 if test -z "$host_vendor"; then |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
46 host_vendor=unknown |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
47 fi |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
48 if test -z "$host_os"; then |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
49 host_os=unknown |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
50 fi |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
51 ]) |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
52 dnl |
15133
f91eac1bc66d
m4/acinclude.m4: Correct typos, use consistent style for describing macros.
Rik <rik@octave.org>
parents:
15126
diff
changeset
|
53 dnl Check if the Carbon Framework defines CGDisplayBitsPerPixel. |
10380
60acc47c203f
configure checks for complex element setter/reference accessor methods
John W. Eaton <jwe@octave.org>
parents:
10331
diff
changeset
|
54 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
55 AC_DEFUN([OCTAVE_CARBON_CGDISPLAYBITSPERPIXEL], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
56 AC_CACHE_CHECK([whether CGDisplayBitsPerPixel is defined in the Carbon Framework], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
57 [octave_cv_func_carbon_cgdisplaybitsperpixel], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
58 [AC_LANG_PUSH(C++) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
59 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
60 #include <Carbon/Carbon.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
61 ]], [[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
62 CGDirectDisplayID display = CGMainDisplayID (); |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
63 size_t depth = CGDisplayBitsPerPixel (display); |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
64 ]])], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
65 octave_cv_func_carbon_cgdisplaybitsperpixel=yes, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
66 octave_cv_func_carbon_cgdisplaybitsperpixel=no) |
3888 | 67 AC_LANG_POP(C++) |
3107 | 68 ]) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
69 if test $octave_cv_func_carbon_cgdisplaybitsperpixel = yes; then |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
70 AC_DEFINE(HAVE_CARBON_CGDISPLAYBITSPERPIXEL, 1, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
71 [Define to 1 if Carbon Framework has CGDisplayBitsPerPixel.]) |
3107 | 72 fi |
73 ]) | |
3126 | 74 dnl |
15133
f91eac1bc66d
m4/acinclude.m4: Correct typos, use consistent style for describing macros.
Rik <rik@octave.org>
parents:
15126
diff
changeset
|
75 dnl Check if C compiler handles FLAG command line option. If two |
f91eac1bc66d
m4/acinclude.m4: Correct typos, use consistent style for describing macros.
Rik <rik@octave.org>
parents:
15126
diff
changeset
|
76 dnl arguments are specified, execute the second arg as shell commands. |
f91eac1bc66d
m4/acinclude.m4: Correct typos, use consistent style for describing macros.
Rik <rik@octave.org>
parents:
15126
diff
changeset
|
77 dnl Otherwise, add FLAG to CFLAGS if the compiler accepts the flag. |
3126 | 78 dnl |
9654
a307a6f77fb3
aclocal.m4: consistently quote first arg to AC_DEFUN
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
79 AC_DEFUN([OCTAVE_CC_FLAG], [ |
17661
1978a6c76aa9
Use user-specified SED during build process (bug #40273).
Rik <rik@octave.org>
parents:
17615
diff
changeset
|
80 ac_safe=`echo "$1" | $SED 'y% ./+-:=%___p___%'` |
10012
2441327485a3
use m4 quating in aclocal.m4 autoconf macros with variable expansion
Rik <rdrider0-list@yahoo.com>
parents:
10011
diff
changeset
|
81 AC_MSG_CHECKING([whether ${CC-cc} accepts $1]) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
82 AC_CACHE_VAL([octave_cv_cc_flag_$ac_safe], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
83 [AC_LANG_PUSH(C) |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
84 ac_octave_save_CFLAGS="$CFLAGS" |
3126 | 85 CFLAGS="$CFLAGS $1" |
5177 | 86 AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
87 [eval "octave_cv_cc_flag_$ac_safe=yes"], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
88 [eval "octave_cv_cc_flag_$ac_safe=no"]) |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
89 CFLAGS="$ac_octave_save_CFLAGS" |
3888 | 90 AC_LANG_POP(C) |
3126 | 91 ]) |
92 if eval "test \"`echo '$octave_cv_cc_flag_'$ac_safe`\" = yes"; then | |
15319
daf74ce2afdc
m4/acinclude.m4: Use more consistent m4 quoting of arguments to macros.
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
93 AC_MSG_RESULT([yes]) |
17034
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
94 ifelse([$2], , |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
95 [CFLAGS="$CFLAGS $1" |
3131 | 96 AC_MSG_RESULT([adding $1 to CFLAGS])], [$2]) |
3126 | 97 else |
15319
daf74ce2afdc
m4/acinclude.m4: Use more consistent m4 quoting of arguments to macros.
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
98 AC_MSG_RESULT([no]) |
3126 | 99 ifelse([$3], , , [$3]) |
100 fi | |
101 ]) | |
102 dnl | |
29367
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
103 dnl Check if pthread stack size accounts for thread-local storage. |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
104 dnl |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
105 dnl This program should succeed if the pthread library allocates memory |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
106 dnl for thread-local (__thread) variables independently of the |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
107 dnl requested thread stack size. |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
108 dnl |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
109 dnl It will fail if (as in the current version of glibc) the storage |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
110 dnl for thread-local variables is subtracted from the memory allocated |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
111 dnl for the thread stack. (This can cause problems for Java and for |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
112 dnl other libraries.) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
113 dnl |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
114 dnl This bug is tracked in glibc at: |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
115 dnl https://sourceware.org/bugzilla/show_bug.cgi?id=11787 |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
116 dnl |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
117 AC_DEFUN([OCTAVE_CHECK_BROKEN_PTHREAD_STACKSIZE], [ |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
118 AC_CACHE_CHECK([whether pthread stack size does not account for thread-local storage], |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
119 [octave_cv_broken_pthread_stacksize], |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
120 [AC_LANG_PUSH(C) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
121 AC_RUN_IFELSE([AC_LANG_PROGRAM([[ |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
122 #include <stdio.h> |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
123 #include <string.h> |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
124 #include <pthread.h> |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
125 |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
126 static char __thread data[100 * 1024]; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
127 |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
128 static void * threadfunc(void *arg) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
129 { |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
130 return data; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
131 } |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
132 ]], [[ |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
133 pthread_attr_t attr; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
134 pthread_t thread; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
135 int errnum; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
136 |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
137 pthread_attr_init (&attr); |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
138 errnum = pthread_attr_setstacksize (&attr, 64 * 1024); |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
139 if (errnum != 0) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
140 { |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
141 fprintf (stderr, "pthread_attr_setstacksize: %s\n", strerror(errnum)); |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
142 return 1; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
143 } |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
144 errnum = pthread_create (&thread, &attr, &threadfunc, NULL); |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
145 if (errnum != 0) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
146 { |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
147 fprintf (stderr, "pthread_create: %s\n", strerror(errnum)); |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
148 return 1; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
149 } |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
150 errnum = pthread_join (thread, NULL); |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
151 if (errnum != 0) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
152 { |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
153 fprintf (stderr, "pthread_join: %s\n", strerror(errnum)); |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
154 return 1; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
155 } |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
156 |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
157 pthread_attr_destroy (&attr); |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
158 return 0; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
159 ]])], |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
160 octave_cv_broken_pthread_stacksize=no, |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
161 octave_cv_broken_pthread_stacksize=yes, |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
162 octave_cv_broken_pthread_stacksize=no) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
163 AC_LANG_POP(C) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
164 ]) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
165 if test $octave_cv_broken_pthread_stacksize = yes; then |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
166 AC_DEFINE(HAVE_BROKEN_PTHREAD_STACKSIZE, 1, |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
167 [Define to 1 if pthread stack size does not account for thread-local storage.]) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
168 fi |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
169 ]) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
170 dnl |
17965
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
171 dnl Check for broken stl_algo.h header file in gcc versions 4.8.0, 4.8.1, 4.8.2 |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
172 dnl which leads to failures in nth_element. |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
173 dnl |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
174 AC_DEFUN([OCTAVE_CHECK_BROKEN_STL_ALGO_H], [ |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
175 AC_CACHE_CHECK([whether stl_algo.h is broken], |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
176 [octave_cv_broken_stl_algo_h], |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
177 [AC_LANG_PUSH(C++) |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
178 AC_RUN_IFELSE([AC_LANG_PROGRAM([[ |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
179 // Based on code from a GCC test program. |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
180 |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
181 // Copyright (C) 2013 Free Software Foundation, Inc. |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
182 // |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
183 // This file is part of the GNU ISO C++ Library. This library is free |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
184 // software; you can redistribute it and/or modify it under the |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
185 // terms of the GNU General Public License as published by the |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
186 // Free Software Foundation; either version 3, or (at your option) |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
187 // any later version. |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
188 |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
189 // This library is distributed in the hope that it will be useful, |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
190 // but WITHOUT ANY WARRANTY; without even the implied warranty of |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
191 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
192 // GNU General Public License for more details. |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
193 |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
194 // You should have received a copy of the GNU General Public License along |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
195 // with this library; see the file COPYING3. If not see |
24534
194eb4bd202b
maint: Update punctuation for GPL v3 license text.
Rik <rik@octave.org>
parents:
24446
diff
changeset
|
196 // <https://www.gnu.org/licenses/>. |
17965
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
197 |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
198 // 25.3.2 [lib.alg.nth.element] |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
199 |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
200 // { dg-options "-std=gnu++11" } |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
201 |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
202 #include <algorithm> |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
203 #include <vector> |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
204 ]], [[ |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
205 std::vector<int> v (7); |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
206 |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
207 v[0] = 207089; |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
208 v[1] = 202585; |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
209 v[2] = 180067; |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
210 v[3] = 157549; |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
211 v[4] = 211592; |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
212 v[5] = 216096; |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
213 v[6] = 207089; |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
214 |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
215 std::nth_element (v.begin (), v.begin () + 3, v.end ()); |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
216 |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
217 return v[3] == 207089 ? 0 : 1; |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
218 ]])], |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
219 octave_cv_broken_stl_algo_h=no, |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
220 octave_cv_broken_stl_algo_h=yes, |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
221 [case "$GXX_VERSION" in |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
222 *4.8.2*) |
17967
303157af491f
acinclude.m4: Fix undefined value in macro CHECK_BROKEN_STL_ALGO_H when cross-compiling.
Rik <rik@octave.org>
parents:
17965
diff
changeset
|
223 octave_cv_broken_stl_algo_h=yes |
303157af491f
acinclude.m4: Fix undefined value in macro CHECK_BROKEN_STL_ALGO_H when cross-compiling.
Rik <rik@octave.org>
parents:
17965
diff
changeset
|
224 ;; |
303157af491f
acinclude.m4: Fix undefined value in macro CHECK_BROKEN_STL_ALGO_H when cross-compiling.
Rik <rik@octave.org>
parents:
17965
diff
changeset
|
225 *) |
303157af491f
acinclude.m4: Fix undefined value in macro CHECK_BROKEN_STL_ALGO_H when cross-compiling.
Rik <rik@octave.org>
parents:
17965
diff
changeset
|
226 octave_cv_broken_stl_algo_h=no |
17965
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
227 ;; |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
228 esac |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
229 ]) |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
230 AC_LANG_POP(C++) |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
231 ]) |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
232 if test "$GXX" = yes; then |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
233 if test $octave_cv_broken_stl_algo_h = yes; then |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
234 case "$GXX_VERSION" in |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
235 4.8.[[012]]) |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
236 ;; |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
237 *) |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
238 octave_cv_broken_stl_algo_h=no |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
239 warn_stl_algo_h="UNEXPECTED: found nth_element broken in g++ $GXX_VERSION. Refusing to fix except for g++ 4.8.0, 4.8.1, or 4.8.2. You appear to have g++ $GXX_VERSION." |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
240 OCTAVE_CONFIGURE_WARNING([warn_stl_algo_h]) |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
241 ;; |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
242 esac |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
243 else |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
244 case "$GXX_VERSION" in |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
245 4.8.2) |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
246 warn_stl_algo_h="UNEXPECTED: found nth_element working in g++ 4.8.2. Has it been patched on your system?" |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
247 OCTAVE_CONFIGURE_WARNING([warn_stl_algo_h]) |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
248 ;; |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
249 esac |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
250 fi |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
251 else |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
252 octave_cv_broken_stl_algo_h=no |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
253 warn_stl_algo_h="UNEXPECTED: nth_element test failed. Refusing to fix except for g++ 4.8.2." |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
254 OCTAVE_CONFIGURE_WARNING([warn_stl_algo_h]) |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
255 fi |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
256 ]) |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
257 dnl |
21160
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
258 dnl Check whether CXSparse is version 2.2 or later |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
259 dnl FIXME: This test uses a version number. It potentially could |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
260 dnl be re-written to actually call a function, but is it worth it? |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
261 dnl |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
262 AC_DEFUN([OCTAVE_CHECK_CXSPARSE_VERSION_OK], [ |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
263 AC_CACHE_CHECK([whether CXSparse is version 2.2 or later], |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
264 [octave_cv_cxsparse_version_ok], |
23172
6e7f8a92a852
configure: use the correct flags when testing for the CXSparse library version
Mike Miller <mtmiller@octave.org>
parents:
23083
diff
changeset
|
265 [ac_octave_save_CPPFLAGS="$CPPFLAGS" |
6e7f8a92a852
configure: use the correct flags when testing for the CXSparse library version
Mike Miller <mtmiller@octave.org>
parents:
23083
diff
changeset
|
266 CPPFLAGS="$CXSPARSE_CPPFLAGS $CPPFLAGS" |
21160
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
267 AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[ |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
268 #if defined (HAVE_SUITESPARSE_CS_H) |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
269 #include <suitesparse/cs.h> |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
270 #elif defined (HAVE_UFSPARSE_CS_H) |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
271 #include <ufsparse/cs.h> |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
272 #elif defined (HAVE_CXSPARSE_CS_H) |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
273 #include <cxsparse/cs.h> |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
274 #elif defined (HAVE_CS_H) |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
275 #include <cs.h> |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
276 #endif |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
277 ]], [[ |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
278 #if (defined (HAVE_CXSPARSE) \ |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
279 && (! defined (CS_VER) \ |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
280 || CS_VER < 2 \ |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
281 || (CS_VER == 2 && CS_SUBVER < 2))) |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
282 #error "Octave requires CXSparse version 2.2 or later" |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
283 #endif |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
284 ]])], |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
285 octave_cv_cxsparse_version_ok=yes, |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
286 octave_cv_cxsparse_version_ok=no) |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
287 CPPFLAGS="$ac_octave_save_CPPFLAGS" |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
288 ]) |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
289 if test $octave_cv_cxsparse_version_ok = yes; then |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
290 AC_DEFINE(HAVE_CXSPARSE_VERSION_OK, 1, |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
291 [Define to 1 if CXSparse is version 2.2 or later.]) |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
292 fi |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
293 ]) |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
294 dnl |
15969
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
295 dnl Check whether the FFTW library supports multi-threading. This macro |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
296 dnl should be called once per FFTW precision passing in the library |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
297 dnl variant (e.g. "fftw3") and a function in the thread support API |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
298 dnl (e.g. "fftw_plan_with_nthreads"). Depending on how FFTW was built, |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
299 dnl the thread functions could be compiled into the main FFTW library or |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
300 dnl could be a separate add-on library that is passed to the linker |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
301 dnl ahead of the main FFTW library. |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
302 dnl |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
303 AC_DEFUN([OCTAVE_CHECK_FFTW_THREADS], [ |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
304 ac_octave_save_CPPFLAGS="$CPPFLAGS" |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
305 ac_octave_save_LDFLAGS="$LDFLAGS" |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
306 ac_octave_save_LIBS="$LIBS" |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
307 CPPFLAGS="$m4_toupper([$1])_CPPFLAGS $CPPFLAGS" |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
308 LDFLAGS="$m4_toupper([$1])_LDFLAGS $LDFLAGS" |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
309 LIBS="$m4_toupper([$1])_LIBS $LIBS" |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
310 AC_CACHE_CHECK([for $1 multi-threading support], |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
311 [octave_cv_[$1]_threads_lib], |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
312 [AC_LINK_IFELSE([AC_LANG_PROGRAM([[ |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
313 #include <fftw3.h> |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
314 ]], [[ |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
315 $2 (2); |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
316 ]])], |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
317 [octave_cv_[$1]_threads_lib=yes], |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
318 [LIBS="-l[$1]_threads $LIBS" |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
319 AC_LINK_IFELSE([AC_LANG_PROGRAM([[ |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
320 #include <fftw3.h> |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
321 ]], [[ |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
322 $2 (2); |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
323 ]])], |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
324 [octave_cv_[$1]_threads_lib="-l[$1]_threads"], |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
325 [octave_cv_[$1]_threads_lib=no]) |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
326 ]) |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
327 ]) |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
328 case $octave_cv_[$1]_threads_lib in |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
329 -l*) |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
330 m4_toupper([$1])_LIBS="$octave_cv_[$1]_threads_lib $m4_toupper([$1])_LIBS" |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
331 ;; |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
332 no) |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
333 AC_MSG_WARN([No $1 multi-threading support found.]) |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
334 AC_MSG_WARN([The single-threaded library will be used instead.]) |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
335 ;; |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
336 esac |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
337 if test $octave_cv_[$1]_threads_lib != no; then |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
338 AC_DEFINE([HAVE_]m4_toupper([$1])[_THREADS], 1, |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
339 [Define to 1 if ]m4_toupper([$1])[ has multi-threading support.]) |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
340 fi |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
341 CPPFLAGS="$ac_octave_save_CPPFLAGS" |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
342 LDFLAGS="$ac_octave_save_LDFLAGS" |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
343 LIBS="$ac_octave_save_LIBS" |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
344 ]) |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
345 dnl |
29367
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
346 dnl OCTAVE_CHECK_FORTRAN_SYMBOL_AND_CALLING_CONVENTIONS |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
347 dnl |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
348 dnl Set variables related to Fortran symbol names (append underscore, |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
349 dnl use uppercase names, etc.) and calling convention (mostly used for |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
350 dnl determining how character strings are passed). |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
351 dnl |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
352 AC_DEFUN([OCTAVE_CHECK_FORTRAN_SYMBOL_AND_CALLING_CONVENTIONS], [ |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
353 F77_TOLOWER=yes |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
354 F77_APPEND_UNDERSCORE=yes |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
355 F77_APPEND_EXTRA_UNDERSCORE=yes |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
356 |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
357 case $ac_cv_f77_mangling in |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
358 "upper case") F77_TOLOWER=no ;; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
359 esac |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
360 case $ac_cv_f77_mangling in |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
361 "no underscore") F77_APPEND_UNDERSCORE=no ;; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
362 esac |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
363 case $ac_cv_f77_mangling in |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
364 "no extra underscore") F77_APPEND_EXTRA_UNDERSCORE=no ;; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
365 esac |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
366 |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
367 case $canonical_host_type in |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
368 i[[3456789]]86-*-*) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
369 if test $ac_cv_f77_compiler_gnu = yes; then |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
370 OCTAVE_F77_FLAG([-mieee-fp]) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
371 fi |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
372 ;; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
373 alpha*-*-*) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
374 if test $ac_cv_f77_compiler_gnu = yes; then |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
375 OCTAVE_F77_FLAG([-mieee]) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
376 else |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
377 OCTAVE_F77_FLAG([-ieee]) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
378 OCTAVE_F77_FLAG([-fpe1]) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
379 fi |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
380 ;; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
381 powerpc-apple-machten*) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
382 FFLAGS= |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
383 ;; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
384 esac |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
385 |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
386 if test $ac_cv_f77_compiler_gnu = yes; then |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
387 FORTRAN_CALLING_CONVENTION=gfortran |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
388 else |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
389 FORTRAN_CALLING_CONVENTION=unknown |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
390 fi |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
391 AC_ARG_ENABLE([fortran-calling-convention], |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
392 [AS_HELP_STRING([--enable-fortran-calling-convention=OPTION], |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
393 [Select C++ to Fortran calling convention. "gfortran" should be detected automatically. Other options are "cray", "visual-fortran", or "f2c".])], |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
394 [FORTRAN_CALLING_CONVENTION="$enableval"], []) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
395 |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
396 case $FORTRAN_CALLING_CONVENTION in |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
397 gfortran) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
398 AC_DEFINE(F77_USES_GFORTRAN_CALLING_CONVENTION, 1, [Define to 1 if calling Fortran from C++ should use the gfortran calling convention.]) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
399 ;; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
400 cray) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
401 AC_DEFINE(F77_USES_CRAY_CALLING_CONVENTION, 1, [Define to 1 if calling Fortran from C++ should use the Cray Fortran calling convention.]) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
402 ;; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
403 visual-fortran) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
404 AC_DEFINE(F77_USES_VISUAL_FORTRAN_CALLING_CONVENTION, 1, [Define to 1 if calling Fortran from C++ should use the Visual Fortran calling convention.]) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
405 ;; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
406 f2c) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
407 AC_DEFINE(F77_USES_F2C_CALLING_CONVENTION, 1, [Define to 1 if calling Fortran from C++ should use the f2c calling convention.]) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
408 ;; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
409 *) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
410 AC_MSG_ERROR([to build Octave, the C++ to Fortran calling convention must be known.]) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
411 ;; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
412 esac |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
413 |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
414 if test -n "$FFLAGS"; then |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
415 AC_MSG_NOTICE([defining FFLAGS to be $FFLAGS]) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
416 fi |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
417 |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
418 AC_SUBST(F77_TOLOWER) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
419 AC_SUBST(F77_APPEND_UNDERSCORE) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
420 AC_SUBST(F77_APPEND_EXTRA_UNDERSCORE) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
421 ]) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
422 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
423 dnl Check if function gluTessCallback is called with "(...)". |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9577
diff
changeset
|
424 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
425 AC_DEFUN([OCTAVE_CHECK_FUNC_GLUTESSCALLBACK_THREEDOTS], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
426 AC_CACHE_CHECK([whether gluTessCallback is called with "(...)"], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
427 [octave_cv_func_glutesscallback_threedots], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
428 [AC_LANG_PUSH(C++) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
429 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
21724
aba2e6293dd8
use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents:
21604
diff
changeset
|
430 #if defined (HAVE_GL_GLU_H) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
431 # include <GL/glu.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
432 #elif defined HAVE_OPENGL_GLU_H || defined HAVE_FRAMEWORK_OPENGL |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
433 # include <OpenGL/glu.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
434 #endif |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
435 ]], [[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
436 GLvoid (*func)(...); |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
437 gluTessCallback(0, 0, func); |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
438 ]])], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
439 octave_cv_func_glutesscallback_threedots=yes, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
440 octave_cv_func_glutesscallback_threedots=no) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
441 AC_LANG_POP(C++) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
442 ]) |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
443 if test $octave_cv_func_glutesscallback_threedots = yes; then |
17034
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
444 AC_DEFINE(HAVE_GLUTESSCALLBACK_THREEDOTS, 1, |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
445 [Define to 1 if gluTessCallback is called with (...).]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
446 fi |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9577
diff
changeset
|
447 ]) |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9577
diff
changeset
|
448 dnl |
29367
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
449 dnl Check whether the Qt class QList has a constructor that accepts |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
450 dnl a pair of iterators. This constructor was introduced in Qt 5.14. |
18973
625e3bb65885
don't require Qt 4.7 (bug #42657)
John W. Eaton <jwe@octave.org>
parents:
18141
diff
changeset
|
451 dnl |
29367
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
452 AC_DEFUN([OCTAVE_CHECK_FUNC_QFONTMETRICS_HORIZONTAL_ADVANCE], [ |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
453 AC_CACHE_CHECK([for QFontMetrics::horizontalAdvance function], |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
454 [octave_cv_func_qfontmetrics_horizontal_advance], |
17111
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
455 [AC_LANG_PUSH(C++) |
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
456 ac_octave_save_CPPFLAGS="$CPPFLAGS" |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
457 ac_octave_save_CXXFLAGS="$CXXFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
458 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
459 CXXFLAGS="$CXXPICFLAG $CXXFLAGS" |
17111
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
460 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
29367
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
461 #include <QFont> |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
462 #include <QFontMetrics> |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
463 #include <QString> |
17111
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
464 ]], [[ |
29367
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
465 QFont font; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
466 QFontMetrics fm (font); |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
467 fm.horizontalAdvance ('x'); |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
468 fm.horizontalAdvance (QString ("string")); |
17111
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
469 ]])], |
29367
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
470 octave_cv_func_qfontmetrics_horizontal_advance=yes, |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
471 octave_cv_func_qfontmetrics_horizontal_advance=no) |
17111
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
472 CPPFLAGS="$ac_octave_save_CPPFLAGS" |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
473 CXXFLAGS="$ac_octave_save_CXXFLAGS" |
17111
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
474 AC_LANG_POP(C++) |
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
475 ]) |
29367
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
476 if test $octave_cv_func_qfontmetrics_horizontal_advance = yes; then |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
477 AC_DEFINE(HAVE_QFONTMETRICS_HORIZONTAL_ADVANCE, 1, |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
478 [Define to 1 if you have the `QFontMetrics::horizontalAdvance' function.]) |
27842
e79999c5d782
fix Qt4 build errors (bug #57420)
John W. Eaton <jwe@octave.org>
parents:
27839
diff
changeset
|
479 fi |
e79999c5d782
fix Qt4 build errors (bug #57420)
John W. Eaton <jwe@octave.org>
parents:
27839
diff
changeset
|
480 ]) |
e79999c5d782
fix Qt4 build errors (bug #57420)
John W. Eaton <jwe@octave.org>
parents:
27839
diff
changeset
|
481 dnl |
25046
a4c687fec320
gui: set Qt Application and Desktop metadata for desktop integration (bug #53102)
Mike Miller <mtmiller@octave.org>
parents:
25042
diff
changeset
|
482 dnl Check whether the Qt QGuiApplication class has the setDesktopFileName |
a4c687fec320
gui: set Qt Application and Desktop metadata for desktop integration (bug #53102)
Mike Miller <mtmiller@octave.org>
parents:
25042
diff
changeset
|
483 dnl static member function. This function was introduced in Qt 5.7. |
a4c687fec320
gui: set Qt Application and Desktop metadata for desktop integration (bug #53102)
Mike Miller <mtmiller@octave.org>
parents:
25042
diff
changeset
|
484 dnl |
a4c687fec320
gui: set Qt Application and Desktop metadata for desktop integration (bug #53102)
Mike Miller <mtmiller@octave.org>
parents:
25042
diff
changeset
|
485 dnl FIXME: Delete this entirely when we drop support for Qt 5.6 or older. |
a4c687fec320
gui: set Qt Application and Desktop metadata for desktop integration (bug #53102)
Mike Miller <mtmiller@octave.org>
parents:
25042
diff
changeset
|
486 dnl |
a4c687fec320
gui: set Qt Application and Desktop metadata for desktop integration (bug #53102)
Mike Miller <mtmiller@octave.org>
parents:
25042
diff
changeset
|
487 AC_DEFUN([OCTAVE_CHECK_FUNC_QGUIAPPLICATION_SETDESKTOPFILENAME], [ |
a4c687fec320
gui: set Qt Application and Desktop metadata for desktop integration (bug #53102)
Mike Miller <mtmiller@octave.org>
parents:
25042
diff
changeset
|
488 AC_CACHE_CHECK([for QGuiApplication::setDesktopFileName], |
a4c687fec320
gui: set Qt Application and Desktop metadata for desktop integration (bug #53102)
Mike Miller <mtmiller@octave.org>
parents:
25042
diff
changeset
|
489 [octave_cv_func_qguiapplication_setdesktopfilename], |
a4c687fec320
gui: set Qt Application and Desktop metadata for desktop integration (bug #53102)
Mike Miller <mtmiller@octave.org>
parents:
25042
diff
changeset
|
490 [AC_LANG_PUSH(C++) |
a4c687fec320
gui: set Qt Application and Desktop metadata for desktop integration (bug #53102)
Mike Miller <mtmiller@octave.org>
parents:
25042
diff
changeset
|
491 ac_octave_save_CPPFLAGS="$CPPFLAGS" |
a4c687fec320
gui: set Qt Application and Desktop metadata for desktop integration (bug #53102)
Mike Miller <mtmiller@octave.org>
parents:
25042
diff
changeset
|
492 ac_octave_save_CXXFLAGS="$CXXFLAGS" |
a4c687fec320
gui: set Qt Application and Desktop metadata for desktop integration (bug #53102)
Mike Miller <mtmiller@octave.org>
parents:
25042
diff
changeset
|
493 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" |
a4c687fec320
gui: set Qt Application and Desktop metadata for desktop integration (bug #53102)
Mike Miller <mtmiller@octave.org>
parents:
25042
diff
changeset
|
494 CXXFLAGS="$CXXPICFLAG $CPPFLAGS" |
a4c687fec320
gui: set Qt Application and Desktop metadata for desktop integration (bug #53102)
Mike Miller <mtmiller@octave.org>
parents:
25042
diff
changeset
|
495 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
a4c687fec320
gui: set Qt Application and Desktop metadata for desktop integration (bug #53102)
Mike Miller <mtmiller@octave.org>
parents:
25042
diff
changeset
|
496 #include <QGuiApplication> |
a4c687fec320
gui: set Qt Application and Desktop metadata for desktop integration (bug #53102)
Mike Miller <mtmiller@octave.org>
parents:
25042
diff
changeset
|
497 ]], [[ |
a4c687fec320
gui: set Qt Application and Desktop metadata for desktop integration (bug #53102)
Mike Miller <mtmiller@octave.org>
parents:
25042
diff
changeset
|
498 QGuiApplication::setDesktopFileName ("com.example.Example.desktop"); |
a4c687fec320
gui: set Qt Application and Desktop metadata for desktop integration (bug #53102)
Mike Miller <mtmiller@octave.org>
parents:
25042
diff
changeset
|
499 ]])], |
a4c687fec320
gui: set Qt Application and Desktop metadata for desktop integration (bug #53102)
Mike Miller <mtmiller@octave.org>
parents:
25042
diff
changeset
|
500 octave_cv_func_qguiapplication_setdesktopfilename=yes, |
a4c687fec320
gui: set Qt Application and Desktop metadata for desktop integration (bug #53102)
Mike Miller <mtmiller@octave.org>
parents:
25042
diff
changeset
|
501 octave_cv_func_qguiapplication_setdesktopfilename=no) |
a4c687fec320
gui: set Qt Application and Desktop metadata for desktop integration (bug #53102)
Mike Miller <mtmiller@octave.org>
parents:
25042
diff
changeset
|
502 CPPFLAGS="$ac_octave_save_CPPFLAGS" |
a4c687fec320
gui: set Qt Application and Desktop metadata for desktop integration (bug #53102)
Mike Miller <mtmiller@octave.org>
parents:
25042
diff
changeset
|
503 CXXFLAGS="$ac_octave_save_CXXFLAGS" |
a4c687fec320
gui: set Qt Application and Desktop metadata for desktop integration (bug #53102)
Mike Miller <mtmiller@octave.org>
parents:
25042
diff
changeset
|
504 AC_LANG_POP(C++) |
a4c687fec320
gui: set Qt Application and Desktop metadata for desktop integration (bug #53102)
Mike Miller <mtmiller@octave.org>
parents:
25042
diff
changeset
|
505 ]) |
a4c687fec320
gui: set Qt Application and Desktop metadata for desktop integration (bug #53102)
Mike Miller <mtmiller@octave.org>
parents:
25042
diff
changeset
|
506 if test $octave_cv_func_qguiapplication_setdesktopfilename = yes; then |
a4c687fec320
gui: set Qt Application and Desktop metadata for desktop integration (bug #53102)
Mike Miller <mtmiller@octave.org>
parents:
25042
diff
changeset
|
507 AC_DEFINE(HAVE_QGUIAPPLICATION_SETDESKTOPFILENAME, 1, |
a4c687fec320
gui: set Qt Application and Desktop metadata for desktop integration (bug #53102)
Mike Miller <mtmiller@octave.org>
parents:
25042
diff
changeset
|
508 [Define to 1 if you have the `QGuiApplication::setDesktopFileName' member function.]) |
a4c687fec320
gui: set Qt Application and Desktop metadata for desktop integration (bug #53102)
Mike Miller <mtmiller@octave.org>
parents:
25042
diff
changeset
|
509 fi |
a4c687fec320
gui: set Qt Application and Desktop metadata for desktop integration (bug #53102)
Mike Miller <mtmiller@octave.org>
parents:
25042
diff
changeset
|
510 ]) |
a4c687fec320
gui: set Qt Application and Desktop metadata for desktop integration (bug #53102)
Mike Miller <mtmiller@octave.org>
parents:
25042
diff
changeset
|
511 dnl |
29367
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
512 dnl Check whether the Qt class QHelpEngine has the documentsForIdentifier |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
513 dnl function. dnl This member function was introduced in Qt 5.15. |
24827
1e0718c1867c
eliminate most Qt version checks
John W. Eaton <jwe@octave.org>
parents:
24825
diff
changeset
|
514 dnl |
29367
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
515 AC_DEFUN([OCTAVE_CHECK_FUNC_QHELPENGINE_DOCUMENTSFORIDENTIFIER], [ |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
516 AC_CACHE_CHECK([for QHelpEngine::documentsForIdentifier in <QHelpEngine>], |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
517 [octave_cv_func_qhelpengine_documentsforidentifier], |
24827
1e0718c1867c
eliminate most Qt version checks
John W. Eaton <jwe@octave.org>
parents:
24825
diff
changeset
|
518 [AC_LANG_PUSH(C++) |
1e0718c1867c
eliminate most Qt version checks
John W. Eaton <jwe@octave.org>
parents:
24825
diff
changeset
|
519 ac_octave_save_CPPFLAGS="$CPPFLAGS" |
1e0718c1867c
eliminate most Qt version checks
John W. Eaton <jwe@octave.org>
parents:
24825
diff
changeset
|
520 ac_octave_save_CXXFLAGS="$CXXFLAGS" |
1e0718c1867c
eliminate most Qt version checks
John W. Eaton <jwe@octave.org>
parents:
24825
diff
changeset
|
521 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" |
29367
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
522 CXXFLAGS="$CXXPICFLAG $CXXFLAGS" |
24827
1e0718c1867c
eliminate most Qt version checks
John W. Eaton <jwe@octave.org>
parents:
24825
diff
changeset
|
523 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
29367
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
524 #include <QHelpEngine> |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
525 #include <QHelpLink> |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
526 #include <QList> |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
527 #include <QString> |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
528 #include <QUrl> |
24827
1e0718c1867c
eliminate most Qt version checks
John W. Eaton <jwe@octave.org>
parents:
24825
diff
changeset
|
529 ]], [[ |
29367
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
530 QString collection_file; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
531 QHelpEngine eng (collection_file); |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
532 QString id; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
533 eng.documentsForIdentifier (id); |
24827
1e0718c1867c
eliminate most Qt version checks
John W. Eaton <jwe@octave.org>
parents:
24825
diff
changeset
|
534 ]])], |
29367
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
535 octave_cv_func_qhelpengine_documentsforidentifier=yes, |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
536 octave_cv_func_qhelpengine_documentsforidentifier=no) |
24827
1e0718c1867c
eliminate most Qt version checks
John W. Eaton <jwe@octave.org>
parents:
24825
diff
changeset
|
537 CPPFLAGS="$ac_octave_save_CPPFLAGS" |
1e0718c1867c
eliminate most Qt version checks
John W. Eaton <jwe@octave.org>
parents:
24825
diff
changeset
|
538 CXXFLAGS="$ac_octave_save_CXXFLAGS" |
1e0718c1867c
eliminate most Qt version checks
John W. Eaton <jwe@octave.org>
parents:
24825
diff
changeset
|
539 AC_LANG_POP(C++) |
1e0718c1867c
eliminate most Qt version checks
John W. Eaton <jwe@octave.org>
parents:
24825
diff
changeset
|
540 ]) |
29367
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
541 if test $octave_cv_func_qhelpengine_documentsforidentifier = yes; then |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
542 AC_DEFINE(HAVE_QHELPENGINE_DOCUMENTSFORIDENTIFIER, 1, |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
543 [Define to 1 if you have the `QHelpEngine::documentsForIdentifier' member function.]) |
24827
1e0718c1867c
eliminate most Qt version checks
John W. Eaton <jwe@octave.org>
parents:
24825
diff
changeset
|
544 fi |
1e0718c1867c
eliminate most Qt version checks
John W. Eaton <jwe@octave.org>
parents:
24825
diff
changeset
|
545 ]) |
1e0718c1867c
eliminate most Qt version checks
John W. Eaton <jwe@octave.org>
parents:
24825
diff
changeset
|
546 dnl |
25061
5fef743c34d7
build: Check for new help query member in qt 5.9 (bug #53006).
Torsten <mttl@mailbox.org>
parents:
25054
diff
changeset
|
547 dnl Check whether the Qt QHelpSearchQueryWidget class has the searchInput |
5fef743c34d7
build: Check for new help query member in qt 5.9 (bug #53006).
Torsten <mttl@mailbox.org>
parents:
25054
diff
changeset
|
548 dnl member function. This function was introduced in Qt 5.9. |
5fef743c34d7
build: Check for new help query member in qt 5.9 (bug #53006).
Torsten <mttl@mailbox.org>
parents:
25054
diff
changeset
|
549 dnl |
5fef743c34d7
build: Check for new help query member in qt 5.9 (bug #53006).
Torsten <mttl@mailbox.org>
parents:
25054
diff
changeset
|
550 dnl FIXME: Delete this entirely when we drop support for Qt 5.8 or older. |
5fef743c34d7
build: Check for new help query member in qt 5.9 (bug #53006).
Torsten <mttl@mailbox.org>
parents:
25054
diff
changeset
|
551 dnl |
5fef743c34d7
build: Check for new help query member in qt 5.9 (bug #53006).
Torsten <mttl@mailbox.org>
parents:
25054
diff
changeset
|
552 AC_DEFUN([OCTAVE_CHECK_FUNC_QHELPSEARCHQUERYWIDGET_SEARCHINPUT], [ |
5fef743c34d7
build: Check for new help query member in qt 5.9 (bug #53006).
Torsten <mttl@mailbox.org>
parents:
25054
diff
changeset
|
553 AC_CACHE_CHECK([for QHelpSearchQueryWidget::searchInput], |
5fef743c34d7
build: Check for new help query member in qt 5.9 (bug #53006).
Torsten <mttl@mailbox.org>
parents:
25054
diff
changeset
|
554 [octave_cv_func_qhelpsearchquerywidget_searchinput], |
5fef743c34d7
build: Check for new help query member in qt 5.9 (bug #53006).
Torsten <mttl@mailbox.org>
parents:
25054
diff
changeset
|
555 [AC_LANG_PUSH(C++) |
5fef743c34d7
build: Check for new help query member in qt 5.9 (bug #53006).
Torsten <mttl@mailbox.org>
parents:
25054
diff
changeset
|
556 ac_octave_save_CPPFLAGS="$CPPFLAGS" |
5fef743c34d7
build: Check for new help query member in qt 5.9 (bug #53006).
Torsten <mttl@mailbox.org>
parents:
25054
diff
changeset
|
557 ac_octave_save_CXXFLAGS="$CXXFLAGS" |
5fef743c34d7
build: Check for new help query member in qt 5.9 (bug #53006).
Torsten <mttl@mailbox.org>
parents:
25054
diff
changeset
|
558 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" |
5fef743c34d7
build: Check for new help query member in qt 5.9 (bug #53006).
Torsten <mttl@mailbox.org>
parents:
25054
diff
changeset
|
559 CXXFLAGS="$CXXPICFLAG $CPPFLAGS" |
5fef743c34d7
build: Check for new help query member in qt 5.9 (bug #53006).
Torsten <mttl@mailbox.org>
parents:
25054
diff
changeset
|
560 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
5fef743c34d7
build: Check for new help query member in qt 5.9 (bug #53006).
Torsten <mttl@mailbox.org>
parents:
25054
diff
changeset
|
561 #include <QHelpSearchQueryWidget> |
5fef743c34d7
build: Check for new help query member in qt 5.9 (bug #53006).
Torsten <mttl@mailbox.org>
parents:
25054
diff
changeset
|
562 #include <QString> |
5fef743c34d7
build: Check for new help query member in qt 5.9 (bug #53006).
Torsten <mttl@mailbox.org>
parents:
25054
diff
changeset
|
563 ]], [[ |
5fef743c34d7
build: Check for new help query member in qt 5.9 (bug #53006).
Torsten <mttl@mailbox.org>
parents:
25054
diff
changeset
|
564 QHelpSearchQueryWidget *query_widget = new QHelpSearchQueryWidget (); |
5fef743c34d7
build: Check for new help query member in qt 5.9 (bug #53006).
Torsten <mttl@mailbox.org>
parents:
25054
diff
changeset
|
565 QString search_input = query_widget->searchInput (); |
5fef743c34d7
build: Check for new help query member in qt 5.9 (bug #53006).
Torsten <mttl@mailbox.org>
parents:
25054
diff
changeset
|
566 ]])], |
5fef743c34d7
build: Check for new help query member in qt 5.9 (bug #53006).
Torsten <mttl@mailbox.org>
parents:
25054
diff
changeset
|
567 octave_cv_func_qhelpsearchquerywidget_searchinput=yes, |
5fef743c34d7
build: Check for new help query member in qt 5.9 (bug #53006).
Torsten <mttl@mailbox.org>
parents:
25054
diff
changeset
|
568 octave_cv_func_qhelpsearchquerywidget_searchinput=no) |
5fef743c34d7
build: Check for new help query member in qt 5.9 (bug #53006).
Torsten <mttl@mailbox.org>
parents:
25054
diff
changeset
|
569 CPPFLAGS="$ac_octave_save_CPPFLAGS" |
5fef743c34d7
build: Check for new help query member in qt 5.9 (bug #53006).
Torsten <mttl@mailbox.org>
parents:
25054
diff
changeset
|
570 CXXFLAGS="$ac_octave_save_CXXFLAGS" |
5fef743c34d7
build: Check for new help query member in qt 5.9 (bug #53006).
Torsten <mttl@mailbox.org>
parents:
25054
diff
changeset
|
571 AC_LANG_POP(C++) |
5fef743c34d7
build: Check for new help query member in qt 5.9 (bug #53006).
Torsten <mttl@mailbox.org>
parents:
25054
diff
changeset
|
572 ]) |
5fef743c34d7
build: Check for new help query member in qt 5.9 (bug #53006).
Torsten <mttl@mailbox.org>
parents:
25054
diff
changeset
|
573 if test $octave_cv_func_qhelpsearchquerywidget_searchinput = yes; then |
5fef743c34d7
build: Check for new help query member in qt 5.9 (bug #53006).
Torsten <mttl@mailbox.org>
parents:
25054
diff
changeset
|
574 AC_DEFINE(HAVE_QHELPSEARCHQUERYWIDGET_SEARCHINPUT, 1, |
5fef743c34d7
build: Check for new help query member in qt 5.9 (bug #53006).
Torsten <mttl@mailbox.org>
parents:
25054
diff
changeset
|
575 [Define to 1 if you have the `QHelpSearchQueryWidget::searchInput' member function.]) |
5fef743c34d7
build: Check for new help query member in qt 5.9 (bug #53006).
Torsten <mttl@mailbox.org>
parents:
25054
diff
changeset
|
576 fi |
5fef743c34d7
build: Check for new help query member in qt 5.9 (bug #53006).
Torsten <mttl@mailbox.org>
parents:
25054
diff
changeset
|
577 ]) |
5fef743c34d7
build: Check for new help query member in qt 5.9 (bug #53006).
Torsten <mttl@mailbox.org>
parents:
25054
diff
changeset
|
578 dnl |
29367
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
579 dnl Check whether the Qt class QList has a constructor that accepts |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
580 dnl a pair of iterators. This constructor was introduced in Qt 5.14. |
18216
e54cfaae830b
Make editor tabs draggable if feature is available
Richard Crozier richard dot crozier(at)yahoo.co.uk
parents:
18141
diff
changeset
|
581 dnl |
29367
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
582 AC_DEFUN([OCTAVE_CHECK_FUNC_QLIST_ITERATOR_CONSTRUCTOR], [ |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
583 AC_CACHE_CHECK([for QList<T>::QList (iterator, iterator) constructor], |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
584 [octave_cv_func_qlist_iterator_constructor], |
24823
53f68d0fb122
acinclude.m4: Keep macros in alphabetical order.
Rik <rik@octave.org>
parents:
24821
diff
changeset
|
585 [AC_LANG_PUSH(C++) |
53f68d0fb122
acinclude.m4: Keep macros in alphabetical order.
Rik <rik@octave.org>
parents:
24821
diff
changeset
|
586 ac_octave_save_CPPFLAGS="$CPPFLAGS" |
53f68d0fb122
acinclude.m4: Keep macros in alphabetical order.
Rik <rik@octave.org>
parents:
24821
diff
changeset
|
587 ac_octave_save_CXXFLAGS="$CXXFLAGS" |
53f68d0fb122
acinclude.m4: Keep macros in alphabetical order.
Rik <rik@octave.org>
parents:
24821
diff
changeset
|
588 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" |
53f68d0fb122
acinclude.m4: Keep macros in alphabetical order.
Rik <rik@octave.org>
parents:
24821
diff
changeset
|
589 CXXFLAGS="$CXXPICFLAG $CXXFLAGS" |
53f68d0fb122
acinclude.m4: Keep macros in alphabetical order.
Rik <rik@octave.org>
parents:
24821
diff
changeset
|
590 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
53f68d0fb122
acinclude.m4: Keep macros in alphabetical order.
Rik <rik@octave.org>
parents:
24821
diff
changeset
|
591 #include <QList> |
53f68d0fb122
acinclude.m4: Keep macros in alphabetical order.
Rik <rik@octave.org>
parents:
24821
diff
changeset
|
592 ]], [[ |
29367
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
593 QList<int> lst_one; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
594 QList<int> lst_two (lst_one.begin (), lst_one.end ()); |
24823
53f68d0fb122
acinclude.m4: Keep macros in alphabetical order.
Rik <rik@octave.org>
parents:
24821
diff
changeset
|
595 ]])], |
29367
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
596 octave_cv_func_qlist_iterator_constructor=yes, |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
597 octave_cv_func_qlist_iterator_constructor=no) |
24823
53f68d0fb122
acinclude.m4: Keep macros in alphabetical order.
Rik <rik@octave.org>
parents:
24821
diff
changeset
|
598 CPPFLAGS="$ac_octave_save_CPPFLAGS" |
53f68d0fb122
acinclude.m4: Keep macros in alphabetical order.
Rik <rik@octave.org>
parents:
24821
diff
changeset
|
599 CXXFLAGS="$ac_octave_save_CXXFLAGS" |
53f68d0fb122
acinclude.m4: Keep macros in alphabetical order.
Rik <rik@octave.org>
parents:
24821
diff
changeset
|
600 AC_LANG_POP(C++) |
53f68d0fb122
acinclude.m4: Keep macros in alphabetical order.
Rik <rik@octave.org>
parents:
24821
diff
changeset
|
601 ]) |
29367
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
602 if test $octave_cv_func_qlist_iterator_constructor = yes; then |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
603 AC_DEFINE(HAVE_QLIST_ITERATOR_CONSTRUCTOR, 1, |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
604 [Define to 1 if you have the `QList<T>::QList (iterator, iterator)' constructor.]) |
24823
53f68d0fb122
acinclude.m4: Keep macros in alphabetical order.
Rik <rik@octave.org>
parents:
24821
diff
changeset
|
605 fi |
53f68d0fb122
acinclude.m4: Keep macros in alphabetical order.
Rik <rik@octave.org>
parents:
24821
diff
changeset
|
606 ]) |
53f68d0fb122
acinclude.m4: Keep macros in alphabetical order.
Rik <rik@octave.org>
parents:
24821
diff
changeset
|
607 dnl |
29147
5d7a651bf0bb
fix error when restoring previous main window layout (bug #59426)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29069
diff
changeset
|
608 dnl Check whether the Qt class QMainWindow has the resizeDocks member function. |
5d7a651bf0bb
fix error when restoring previous main window layout (bug #59426)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29069
diff
changeset
|
609 dnl This member function was introduced in Qt 5.6. |
5d7a651bf0bb
fix error when restoring previous main window layout (bug #59426)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29069
diff
changeset
|
610 dnl |
5d7a651bf0bb
fix error when restoring previous main window layout (bug #59426)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29069
diff
changeset
|
611 dnl FIXME: remove this test when we drop support for Qt older than 5.6 |
5d7a651bf0bb
fix error when restoring previous main window layout (bug #59426)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29069
diff
changeset
|
612 dnl |
5d7a651bf0bb
fix error when restoring previous main window layout (bug #59426)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29069
diff
changeset
|
613 AC_DEFUN([OCTAVE_CHECK_FUNC_QMAINWINDOW_RESIZEDOCKS], [ |
5d7a651bf0bb
fix error when restoring previous main window layout (bug #59426)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29069
diff
changeset
|
614 AC_CACHE_CHECK([for QMainWindow::resizeDocks in <QMainWindow>], |
5d7a651bf0bb
fix error when restoring previous main window layout (bug #59426)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29069
diff
changeset
|
615 [octave_cv_func_mainwindow_resizedocks], |
5d7a651bf0bb
fix error when restoring previous main window layout (bug #59426)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29069
diff
changeset
|
616 [AC_LANG_PUSH(C++) |
5d7a651bf0bb
fix error when restoring previous main window layout (bug #59426)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29069
diff
changeset
|
617 ac_octave_save_CPPFLAGS="$CPPFLAGS" |
5d7a651bf0bb
fix error when restoring previous main window layout (bug #59426)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29069
diff
changeset
|
618 ac_octave_save_CXXFLAGS="$CXXFLAGS" |
5d7a651bf0bb
fix error when restoring previous main window layout (bug #59426)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29069
diff
changeset
|
619 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" |
5d7a651bf0bb
fix error when restoring previous main window layout (bug #59426)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29069
diff
changeset
|
620 CXXFLAGS="$CXXPICFLAG $CXXFLAGS" |
5d7a651bf0bb
fix error when restoring previous main window layout (bug #59426)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29069
diff
changeset
|
621 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
5d7a651bf0bb
fix error when restoring previous main window layout (bug #59426)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29069
diff
changeset
|
622 #include <QMainWindow> |
5d7a651bf0bb
fix error when restoring previous main window layout (bug #59426)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29069
diff
changeset
|
623 #include <QDockWidget> |
5d7a651bf0bb
fix error when restoring previous main window layout (bug #59426)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29069
diff
changeset
|
624 ]], [[ |
5d7a651bf0bb
fix error when restoring previous main window layout (bug #59426)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29069
diff
changeset
|
625 QMainWindow *mw = new QMainWindow (); |
5d7a651bf0bb
fix error when restoring previous main window layout (bug #59426)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29069
diff
changeset
|
626 QDockWidget *dw = new QDockWidget (mw); |
5d7a651bf0bb
fix error when restoring previous main window layout (bug #59426)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29069
diff
changeset
|
627 mw->addDockWidget (Qt::LeftDockWidgetArea, dw); |
5d7a651bf0bb
fix error when restoring previous main window layout (bug #59426)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29069
diff
changeset
|
628 mw->resizeDocks ({dw},{20},Qt::Horizontal); |
5d7a651bf0bb
fix error when restoring previous main window layout (bug #59426)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29069
diff
changeset
|
629 ]])], |
5d7a651bf0bb
fix error when restoring previous main window layout (bug #59426)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29069
diff
changeset
|
630 octave_cv_func_mainwindow_resizedocks=yes, |
5d7a651bf0bb
fix error when restoring previous main window layout (bug #59426)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29069
diff
changeset
|
631 octave_cv_func_mainwindow_resizedocks=no) |
5d7a651bf0bb
fix error when restoring previous main window layout (bug #59426)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29069
diff
changeset
|
632 CPPFLAGS="$ac_octave_save_CPPFLAGS" |
5d7a651bf0bb
fix error when restoring previous main window layout (bug #59426)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29069
diff
changeset
|
633 CXXFLAGS="$ac_octave_save_CXXFLAGS" |
5d7a651bf0bb
fix error when restoring previous main window layout (bug #59426)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29069
diff
changeset
|
634 AC_LANG_POP(C++) |
5d7a651bf0bb
fix error when restoring previous main window layout (bug #59426)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29069
diff
changeset
|
635 ]) |
5d7a651bf0bb
fix error when restoring previous main window layout (bug #59426)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29069
diff
changeset
|
636 if test $octave_cv_func_mainwindow_resizedocks = yes; then |
5d7a651bf0bb
fix error when restoring previous main window layout (bug #59426)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29069
diff
changeset
|
637 AC_DEFINE(HAVE_QMAINWINDOW_RESIZEDOCKS, 1, |
5d7a651bf0bb
fix error when restoring previous main window layout (bug #59426)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29069
diff
changeset
|
638 [Define to 1 if you have the 'QMainWindow::resizeDocks' member function.]) |
5d7a651bf0bb
fix error when restoring previous main window layout (bug #59426)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29069
diff
changeset
|
639 fi |
5d7a651bf0bb
fix error when restoring previous main window layout (bug #59426)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29069
diff
changeset
|
640 ]) |
5d7a651bf0bb
fix error when restoring previous main window layout (bug #59426)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29069
diff
changeset
|
641 dnl |
29482
67f1d5fc69bb
avoid warning about deprecated Qprinter::setPaperSize function
John W. Eaton <jwe@octave.org>
parents:
29470
diff
changeset
|
642 dnl Check whether the Qt class QPrinter has the setPageSize member function. |
67f1d5fc69bb
avoid warning about deprecated Qprinter::setPaperSize function
John W. Eaton <jwe@octave.org>
parents:
29470
diff
changeset
|
643 dnl This member function was introduced in Qt 5.3. |
67f1d5fc69bb
avoid warning about deprecated Qprinter::setPaperSize function
John W. Eaton <jwe@octave.org>
parents:
29470
diff
changeset
|
644 dnl |
67f1d5fc69bb
avoid warning about deprecated Qprinter::setPaperSize function
John W. Eaton <jwe@octave.org>
parents:
29470
diff
changeset
|
645 dnl FIXME: remove this test when we drop support for Qt older than 5.3. |
67f1d5fc69bb
avoid warning about deprecated Qprinter::setPaperSize function
John W. Eaton <jwe@octave.org>
parents:
29470
diff
changeset
|
646 dnl |
67f1d5fc69bb
avoid warning about deprecated Qprinter::setPaperSize function
John W. Eaton <jwe@octave.org>
parents:
29470
diff
changeset
|
647 AC_DEFUN([OCTAVE_CHECK_FUNC_QPRINTER_SETPAGESIZE], [ |
67f1d5fc69bb
avoid warning about deprecated Qprinter::setPaperSize function
John W. Eaton <jwe@octave.org>
parents:
29470
diff
changeset
|
648 AC_CACHE_CHECK([for QPrinter::setPageSize in <QPrinter>], |
67f1d5fc69bb
avoid warning about deprecated Qprinter::setPaperSize function
John W. Eaton <jwe@octave.org>
parents:
29470
diff
changeset
|
649 [octave_cv_func_qprinter_setpagesizes], |
67f1d5fc69bb
avoid warning about deprecated Qprinter::setPaperSize function
John W. Eaton <jwe@octave.org>
parents:
29470
diff
changeset
|
650 [AC_LANG_PUSH(C++) |
67f1d5fc69bb
avoid warning about deprecated Qprinter::setPaperSize function
John W. Eaton <jwe@octave.org>
parents:
29470
diff
changeset
|
651 ac_octave_save_CPPFLAGS="$CPPFLAGS" |
67f1d5fc69bb
avoid warning about deprecated Qprinter::setPaperSize function
John W. Eaton <jwe@octave.org>
parents:
29470
diff
changeset
|
652 ac_octave_save_CXXFLAGS="$CXXFLAGS" |
67f1d5fc69bb
avoid warning about deprecated Qprinter::setPaperSize function
John W. Eaton <jwe@octave.org>
parents:
29470
diff
changeset
|
653 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" |
67f1d5fc69bb
avoid warning about deprecated Qprinter::setPaperSize function
John W. Eaton <jwe@octave.org>
parents:
29470
diff
changeset
|
654 CXXFLAGS="$CXXPICFLAG $CXXFLAGS" |
67f1d5fc69bb
avoid warning about deprecated Qprinter::setPaperSize function
John W. Eaton <jwe@octave.org>
parents:
29470
diff
changeset
|
655 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
67f1d5fc69bb
avoid warning about deprecated Qprinter::setPaperSize function
John W. Eaton <jwe@octave.org>
parents:
29470
diff
changeset
|
656 #include <QPrinter> |
67f1d5fc69bb
avoid warning about deprecated Qprinter::setPaperSize function
John W. Eaton <jwe@octave.org>
parents:
29470
diff
changeset
|
657 ]], [[ |
67f1d5fc69bb
avoid warning about deprecated Qprinter::setPaperSize function
John W. Eaton <jwe@octave.org>
parents:
29470
diff
changeset
|
658 QPrinter printer; |
67f1d5fc69bb
avoid warning about deprecated Qprinter::setPaperSize function
John W. Eaton <jwe@octave.org>
parents:
29470
diff
changeset
|
659 printer.setPageSize (QPageSize (QSizeF (8.5, 11.0), QPageSize::Inch)); |
67f1d5fc69bb
avoid warning about deprecated Qprinter::setPaperSize function
John W. Eaton <jwe@octave.org>
parents:
29470
diff
changeset
|
660 ]])], |
67f1d5fc69bb
avoid warning about deprecated Qprinter::setPaperSize function
John W. Eaton <jwe@octave.org>
parents:
29470
diff
changeset
|
661 octave_cv_func_qprinter_setpagesize=yes, |
67f1d5fc69bb
avoid warning about deprecated Qprinter::setPaperSize function
John W. Eaton <jwe@octave.org>
parents:
29470
diff
changeset
|
662 octave_cv_func_qprinter_setpagesize=no) |
67f1d5fc69bb
avoid warning about deprecated Qprinter::setPaperSize function
John W. Eaton <jwe@octave.org>
parents:
29470
diff
changeset
|
663 CPPFLAGS="$ac_octave_save_CPPFLAGS" |
67f1d5fc69bb
avoid warning about deprecated Qprinter::setPaperSize function
John W. Eaton <jwe@octave.org>
parents:
29470
diff
changeset
|
664 CXXFLAGS="$ac_octave_save_CXXFLAGS" |
67f1d5fc69bb
avoid warning about deprecated Qprinter::setPaperSize function
John W. Eaton <jwe@octave.org>
parents:
29470
diff
changeset
|
665 AC_LANG_POP(C++) |
67f1d5fc69bb
avoid warning about deprecated Qprinter::setPaperSize function
John W. Eaton <jwe@octave.org>
parents:
29470
diff
changeset
|
666 ]) |
67f1d5fc69bb
avoid warning about deprecated Qprinter::setPaperSize function
John W. Eaton <jwe@octave.org>
parents:
29470
diff
changeset
|
667 if test $octave_cv_func_qprinter_setpagesize = yes; then |
67f1d5fc69bb
avoid warning about deprecated Qprinter::setPaperSize function
John W. Eaton <jwe@octave.org>
parents:
29470
diff
changeset
|
668 AC_DEFINE(HAVE_QPRINTER_SETPAGESIZE, 1, |
67f1d5fc69bb
avoid warning about deprecated Qprinter::setPaperSize function
John W. Eaton <jwe@octave.org>
parents:
29470
diff
changeset
|
669 [Define to 1 if you have the 'QPrinter::setPageSize' member function.]) |
67f1d5fc69bb
avoid warning about deprecated Qprinter::setPaperSize function
John W. Eaton <jwe@octave.org>
parents:
29470
diff
changeset
|
670 fi |
67f1d5fc69bb
avoid warning about deprecated Qprinter::setPaperSize function
John W. Eaton <jwe@octave.org>
parents:
29470
diff
changeset
|
671 ]) |
67f1d5fc69bb
avoid warning about deprecated Qprinter::setPaperSize function
John W. Eaton <jwe@octave.org>
parents:
29470
diff
changeset
|
672 dnl |
25884
4e108574385c
Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053)
John Swensen <jpswensen@gmail.com>
parents:
25862
diff
changeset
|
673 dnl Check whether the Qt class QScreen has the devicePixelRatio member function. |
4e108574385c
Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053)
John Swensen <jpswensen@gmail.com>
parents:
25862
diff
changeset
|
674 dnl This member function was introduced in Qt 5.5. |
4e108574385c
Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053)
John Swensen <jpswensen@gmail.com>
parents:
25862
diff
changeset
|
675 dnl |
4e108574385c
Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053)
John Swensen <jpswensen@gmail.com>
parents:
25862
diff
changeset
|
676 AC_DEFUN([OCTAVE_CHECK_FUNC_QSCREEN_DEVICEPIXELRATIO], [ |
4e108574385c
Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053)
John Swensen <jpswensen@gmail.com>
parents:
25862
diff
changeset
|
677 AC_CACHE_CHECK([for QScreen::devicePixelRatio in <QScreen>], |
4e108574385c
Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053)
John Swensen <jpswensen@gmail.com>
parents:
25862
diff
changeset
|
678 [octave_cv_func_qscreen_devicepixelratio], |
4e108574385c
Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053)
John Swensen <jpswensen@gmail.com>
parents:
25862
diff
changeset
|
679 [AC_LANG_PUSH(C++) |
4e108574385c
Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053)
John Swensen <jpswensen@gmail.com>
parents:
25862
diff
changeset
|
680 ac_octave_save_CPPFLAGS="$CPPFLAGS" |
4e108574385c
Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053)
John Swensen <jpswensen@gmail.com>
parents:
25862
diff
changeset
|
681 ac_octave_save_CXXFLAGS="$CXXFLAGS" |
4e108574385c
Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053)
John Swensen <jpswensen@gmail.com>
parents:
25862
diff
changeset
|
682 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" |
4e108574385c
Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053)
John Swensen <jpswensen@gmail.com>
parents:
25862
diff
changeset
|
683 CXXFLAGS="$CXXPICFLAG $CXXFLAGS" |
4e108574385c
Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053)
John Swensen <jpswensen@gmail.com>
parents:
25862
diff
changeset
|
684 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
4e108574385c
Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053)
John Swensen <jpswensen@gmail.com>
parents:
25862
diff
changeset
|
685 #include <QApplication> |
4e108574385c
Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053)
John Swensen <jpswensen@gmail.com>
parents:
25862
diff
changeset
|
686 #include <QScreen> |
4e108574385c
Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053)
John Swensen <jpswensen@gmail.com>
parents:
25862
diff
changeset
|
687 ]], [[ |
4e108574385c
Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053)
John Swensen <jpswensen@gmail.com>
parents:
25862
diff
changeset
|
688 QScreen *screen = QApplication::primaryScreen (); |
4e108574385c
Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053)
John Swensen <jpswensen@gmail.com>
parents:
25862
diff
changeset
|
689 qreal ratio = screen->devicePixelRatio (); |
4e108574385c
Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053)
John Swensen <jpswensen@gmail.com>
parents:
25862
diff
changeset
|
690 ]])], |
4e108574385c
Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053)
John Swensen <jpswensen@gmail.com>
parents:
25862
diff
changeset
|
691 octave_cv_func_qscreen_devicepixelratio=yes, |
4e108574385c
Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053)
John Swensen <jpswensen@gmail.com>
parents:
25862
diff
changeset
|
692 octave_cv_func_qscreen_devicepixelratio=no) |
4e108574385c
Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053)
John Swensen <jpswensen@gmail.com>
parents:
25862
diff
changeset
|
693 CPPFLAGS="$ac_octave_save_CPPFLAGS" |
4e108574385c
Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053)
John Swensen <jpswensen@gmail.com>
parents:
25862
diff
changeset
|
694 CXXFLAGS="$ac_octave_save_CXXFLAGS" |
4e108574385c
Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053)
John Swensen <jpswensen@gmail.com>
parents:
25862
diff
changeset
|
695 AC_LANG_POP(C++) |
4e108574385c
Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053)
John Swensen <jpswensen@gmail.com>
parents:
25862
diff
changeset
|
696 ]) |
4e108574385c
Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053)
John Swensen <jpswensen@gmail.com>
parents:
25862
diff
changeset
|
697 if test $octave_cv_func_qscreen_devicepixelratio = yes; then |
4e108574385c
Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053)
John Swensen <jpswensen@gmail.com>
parents:
25862
diff
changeset
|
698 AC_DEFINE(HAVE_QSCREEN_DEVICEPIXELRATIO, 1, |
4e108574385c
Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053)
John Swensen <jpswensen@gmail.com>
parents:
25862
diff
changeset
|
699 [Define to 1 if you have the `QScreen::devicePixelRatio' member function.]) |
4e108574385c
Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053)
John Swensen <jpswensen@gmail.com>
parents:
25862
diff
changeset
|
700 fi |
4e108574385c
Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053)
John Swensen <jpswensen@gmail.com>
parents:
25862
diff
changeset
|
701 ]) |
4e108574385c
Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053)
John Swensen <jpswensen@gmail.com>
parents:
25862
diff
changeset
|
702 dnl |
27215
274766cae722
allow building with Qt4 to work again
John W. Eaton <jwe@octave.org>
parents:
27134
diff
changeset
|
703 dnl Check whether the Qt class QWheelEvent has the angleDelta member function. |
274766cae722
allow building with Qt4 to work again
John W. Eaton <jwe@octave.org>
parents:
27134
diff
changeset
|
704 dnl This member function was introduced in Qt 5. |
274766cae722
allow building with Qt4 to work again
John W. Eaton <jwe@octave.org>
parents:
27134
diff
changeset
|
705 dnl |
274766cae722
allow building with Qt4 to work again
John W. Eaton <jwe@octave.org>
parents:
27134
diff
changeset
|
706 dnl FIXME: Delete this entirely when we drop support for Qt 4. |
274766cae722
allow building with Qt4 to work again
John W. Eaton <jwe@octave.org>
parents:
27134
diff
changeset
|
707 dnl |
274766cae722
allow building with Qt4 to work again
John W. Eaton <jwe@octave.org>
parents:
27134
diff
changeset
|
708 AC_DEFUN([OCTAVE_CHECK_FUNC_QWHEELEVENT_ANGLEDELTA], [ |
274766cae722
allow building with Qt4 to work again
John W. Eaton <jwe@octave.org>
parents:
27134
diff
changeset
|
709 AC_CACHE_CHECK([for QWheelEvent::angleDelta in <QWheelEvent>], |
274766cae722
allow building with Qt4 to work again
John W. Eaton <jwe@octave.org>
parents:
27134
diff
changeset
|
710 [octave_cv_func_qwheelevent_angledelta], |
274766cae722
allow building with Qt4 to work again
John W. Eaton <jwe@octave.org>
parents:
27134
diff
changeset
|
711 [AC_LANG_PUSH(C++) |
274766cae722
allow building with Qt4 to work again
John W. Eaton <jwe@octave.org>
parents:
27134
diff
changeset
|
712 ac_octave_save_CPPFLAGS="$CPPFLAGS" |
274766cae722
allow building with Qt4 to work again
John W. Eaton <jwe@octave.org>
parents:
27134
diff
changeset
|
713 ac_octave_save_CXXFLAGS="$CXXFLAGS" |
274766cae722
allow building with Qt4 to work again
John W. Eaton <jwe@octave.org>
parents:
27134
diff
changeset
|
714 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" |
274766cae722
allow building with Qt4 to work again
John W. Eaton <jwe@octave.org>
parents:
27134
diff
changeset
|
715 CXXFLAGS="$CXXPICFLAG $CXXFLAGS" |
274766cae722
allow building with Qt4 to work again
John W. Eaton <jwe@octave.org>
parents:
27134
diff
changeset
|
716 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
274766cae722
allow building with Qt4 to work again
John W. Eaton <jwe@octave.org>
parents:
27134
diff
changeset
|
717 #include <QWheelEvent> |
29047
94396ec1a89d
avoid warnings about deprecated QWheelEvent methods delta and orientation
John W. Eaton <jwe@octave.org>
parents:
29034
diff
changeset
|
718 void foo (const QWheelEvent& ev) |
27215
274766cae722
allow building with Qt4 to work again
John W. Eaton <jwe@octave.org>
parents:
27134
diff
changeset
|
719 { |
29047
94396ec1a89d
avoid warnings about deprecated QWheelEvent methods delta and orientation
John W. Eaton <jwe@octave.org>
parents:
29034
diff
changeset
|
720 ev.angleDelta (); |
27215
274766cae722
allow building with Qt4 to work again
John W. Eaton <jwe@octave.org>
parents:
27134
diff
changeset
|
721 }; |
274766cae722
allow building with Qt4 to work again
John W. Eaton <jwe@octave.org>
parents:
27134
diff
changeset
|
722 ]])], |
274766cae722
allow building with Qt4 to work again
John W. Eaton <jwe@octave.org>
parents:
27134
diff
changeset
|
723 octave_cv_func_qwheelevent_angledelta=yes, |
274766cae722
allow building with Qt4 to work again
John W. Eaton <jwe@octave.org>
parents:
27134
diff
changeset
|
724 octave_cv_func_qwheelevent_angledelta=no) |
274766cae722
allow building with Qt4 to work again
John W. Eaton <jwe@octave.org>
parents:
27134
diff
changeset
|
725 CPPFLAGS="$ac_octave_save_CPPFLAGS" |
274766cae722
allow building with Qt4 to work again
John W. Eaton <jwe@octave.org>
parents:
27134
diff
changeset
|
726 CXXFLAGS="$ac_octave_save_CXXFLAGS" |
274766cae722
allow building with Qt4 to work again
John W. Eaton <jwe@octave.org>
parents:
27134
diff
changeset
|
727 AC_LANG_POP(C++) |
274766cae722
allow building with Qt4 to work again
John W. Eaton <jwe@octave.org>
parents:
27134
diff
changeset
|
728 ]) |
274766cae722
allow building with Qt4 to work again
John W. Eaton <jwe@octave.org>
parents:
27134
diff
changeset
|
729 if test $octave_cv_func_qwheelevent_angledelta = yes; then |
274766cae722
allow building with Qt4 to work again
John W. Eaton <jwe@octave.org>
parents:
27134
diff
changeset
|
730 AC_DEFINE(HAVE_QWHEELEVENT_ANGLEDELTA, 1, |
274766cae722
allow building with Qt4 to work again
John W. Eaton <jwe@octave.org>
parents:
27134
diff
changeset
|
731 [Define to 1 if you have the `QWheelEvent::angleDelta' member function.]) |
274766cae722
allow building with Qt4 to work again
John W. Eaton <jwe@octave.org>
parents:
27134
diff
changeset
|
732 fi |
274766cae722
allow building with Qt4 to work again
John W. Eaton <jwe@octave.org>
parents:
27134
diff
changeset
|
733 ]) |
274766cae722
allow building with Qt4 to work again
John W. Eaton <jwe@octave.org>
parents:
27134
diff
changeset
|
734 dnl |
29048
440ace36950e
avoid warnings about deprecated QWheelEvent::pos method
John W. Eaton <jwe@octave.org>
parents:
29047
diff
changeset
|
735 dnl Check whether the Qt class QWheelEvent has the position member function. |
440ace36950e
avoid warnings about deprecated QWheelEvent::pos method
John W. Eaton <jwe@octave.org>
parents:
29047
diff
changeset
|
736 dnl This member function was introduced in Qt 5.14. |
440ace36950e
avoid warnings about deprecated QWheelEvent::pos method
John W. Eaton <jwe@octave.org>
parents:
29047
diff
changeset
|
737 dnl |
440ace36950e
avoid warnings about deprecated QWheelEvent::pos method
John W. Eaton <jwe@octave.org>
parents:
29047
diff
changeset
|
738 AC_DEFUN([OCTAVE_CHECK_FUNC_QWHEELEVENT_POSITION], [ |
440ace36950e
avoid warnings about deprecated QWheelEvent::pos method
John W. Eaton <jwe@octave.org>
parents:
29047
diff
changeset
|
739 AC_CACHE_CHECK([for QWheelEvent::position in <QWheelEvent>], |
440ace36950e
avoid warnings about deprecated QWheelEvent::pos method
John W. Eaton <jwe@octave.org>
parents:
29047
diff
changeset
|
740 [octave_cv_func_qwheelevent_position], |
440ace36950e
avoid warnings about deprecated QWheelEvent::pos method
John W. Eaton <jwe@octave.org>
parents:
29047
diff
changeset
|
741 [AC_LANG_PUSH(C++) |
440ace36950e
avoid warnings about deprecated QWheelEvent::pos method
John W. Eaton <jwe@octave.org>
parents:
29047
diff
changeset
|
742 ac_octave_save_CPPFLAGS="$CPPFLAGS" |
440ace36950e
avoid warnings about deprecated QWheelEvent::pos method
John W. Eaton <jwe@octave.org>
parents:
29047
diff
changeset
|
743 ac_octave_save_CXXFLAGS="$CXXFLAGS" |
440ace36950e
avoid warnings about deprecated QWheelEvent::pos method
John W. Eaton <jwe@octave.org>
parents:
29047
diff
changeset
|
744 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" |
440ace36950e
avoid warnings about deprecated QWheelEvent::pos method
John W. Eaton <jwe@octave.org>
parents:
29047
diff
changeset
|
745 CXXFLAGS="$CXXPICFLAG $CXXFLAGS" |
440ace36950e
avoid warnings about deprecated QWheelEvent::pos method
John W. Eaton <jwe@octave.org>
parents:
29047
diff
changeset
|
746 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
440ace36950e
avoid warnings about deprecated QWheelEvent::pos method
John W. Eaton <jwe@octave.org>
parents:
29047
diff
changeset
|
747 #include <QWheelEvent> |
440ace36950e
avoid warnings about deprecated QWheelEvent::pos method
John W. Eaton <jwe@octave.org>
parents:
29047
diff
changeset
|
748 void foo (const QWheelEvent& ev) |
440ace36950e
avoid warnings about deprecated QWheelEvent::pos method
John W. Eaton <jwe@octave.org>
parents:
29047
diff
changeset
|
749 { |
440ace36950e
avoid warnings about deprecated QWheelEvent::pos method
John W. Eaton <jwe@octave.org>
parents:
29047
diff
changeset
|
750 ev.position (); |
440ace36950e
avoid warnings about deprecated QWheelEvent::pos method
John W. Eaton <jwe@octave.org>
parents:
29047
diff
changeset
|
751 }; |
440ace36950e
avoid warnings about deprecated QWheelEvent::pos method
John W. Eaton <jwe@octave.org>
parents:
29047
diff
changeset
|
752 ]])], |
440ace36950e
avoid warnings about deprecated QWheelEvent::pos method
John W. Eaton <jwe@octave.org>
parents:
29047
diff
changeset
|
753 octave_cv_func_qwheelevent_position=yes, |
440ace36950e
avoid warnings about deprecated QWheelEvent::pos method
John W. Eaton <jwe@octave.org>
parents:
29047
diff
changeset
|
754 octave_cv_func_qwheelevent_position=no) |
440ace36950e
avoid warnings about deprecated QWheelEvent::pos method
John W. Eaton <jwe@octave.org>
parents:
29047
diff
changeset
|
755 CPPFLAGS="$ac_octave_save_CPPFLAGS" |
440ace36950e
avoid warnings about deprecated QWheelEvent::pos method
John W. Eaton <jwe@octave.org>
parents:
29047
diff
changeset
|
756 CXXFLAGS="$ac_octave_save_CXXFLAGS" |
440ace36950e
avoid warnings about deprecated QWheelEvent::pos method
John W. Eaton <jwe@octave.org>
parents:
29047
diff
changeset
|
757 AC_LANG_POP(C++) |
440ace36950e
avoid warnings about deprecated QWheelEvent::pos method
John W. Eaton <jwe@octave.org>
parents:
29047
diff
changeset
|
758 ]) |
440ace36950e
avoid warnings about deprecated QWheelEvent::pos method
John W. Eaton <jwe@octave.org>
parents:
29047
diff
changeset
|
759 if test $octave_cv_func_qwheelevent_position = yes; then |
440ace36950e
avoid warnings about deprecated QWheelEvent::pos method
John W. Eaton <jwe@octave.org>
parents:
29047
diff
changeset
|
760 AC_DEFINE(HAVE_QWHEELEVENT_POSITION, 1, |
440ace36950e
avoid warnings about deprecated QWheelEvent::pos method
John W. Eaton <jwe@octave.org>
parents:
29047
diff
changeset
|
761 [Define to 1 if you have the `QWheelEvent::position' member function.]) |
440ace36950e
avoid warnings about deprecated QWheelEvent::pos method
John W. Eaton <jwe@octave.org>
parents:
29047
diff
changeset
|
762 fi |
440ace36950e
avoid warnings about deprecated QWheelEvent::pos method
John W. Eaton <jwe@octave.org>
parents:
29047
diff
changeset
|
763 ]) |
440ace36950e
avoid warnings about deprecated QWheelEvent::pos method
John W. Eaton <jwe@octave.org>
parents:
29047
diff
changeset
|
764 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
765 dnl Check whether HDF5 library has version 1.6 API functions. |
14605
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14550
diff
changeset
|
766 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
767 AC_DEFUN([OCTAVE_CHECK_HDF5_HAS_VER_16_API], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
768 AC_CACHE_CHECK([whether HDF5 library has enforced version 1.6 API], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
769 [octave_cv_hdf5_has_ver_16_api], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
770 [AC_LINK_IFELSE([AC_LANG_PROGRAM([[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
771 #include <hdf5.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
772 ]], [[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
773 H5Eset_auto (0, 0); |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
774 ]])], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
775 octave_cv_hdf5_has_ver_16_api=yes, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
776 octave_cv_hdf5_has_ver_16_api=no) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
777 ]) |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
778 if test $octave_cv_hdf5_has_ver_16_api != yes; then |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
779 AC_DEFINE(HAVE_HDF5_18, 1, [Define to 1 if >=HDF5-1.8 is available.]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
780 fi |
14605
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14550
diff
changeset
|
781 ]) |
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14550
diff
changeset
|
782 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
783 dnl Usage: |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
784 dnl OCTAVE_CHECK_LIB(LIBRARY, DOC-NAME, WARN-MSG, HEADER, FUNC, |
23006
06c248729e6f
allow OCTAVE_CHECK_LIB to stop with an error if a library is required
John W. Eaton <jwe@octave.org>
parents:
22986
diff
changeset
|
785 dnl LANG, DOC-STRING, EXTRA-CHECK, PKG-CONFIG-NAME, |
06c248729e6f
allow OCTAVE_CHECK_LIB to stop with an error if a library is required
John W. Eaton <jwe@octave.org>
parents:
22986
diff
changeset
|
786 dnl REQUIRED) |
14605
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14550
diff
changeset
|
787 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
788 AC_DEFUN([OCTAVE_CHECK_LIB], [ |
23017
0f22914be30e
* acinclude.m4 (OCTAVE_CHECK_LIB): Downcase --with-XYZ options.
John W. Eaton <jwe@octave.org>
parents:
23008
diff
changeset
|
789 AC_ARG_WITH([m4_tolower($1)-includedir], |
0f22914be30e
* acinclude.m4 (OCTAVE_CHECK_LIB): Downcase --with-XYZ options.
John W. Eaton <jwe@octave.org>
parents:
23008
diff
changeset
|
790 [AS_HELP_STRING([--with-m4_tolower($1)-includedir=DIR], |
9519
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
791 [look for $2 include files in DIR])], |
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
792 [m4_toupper([$1])_CPPFLAGS="-I$withval"]) |
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
793 AC_SUBST(m4_toupper([$1])_CPPFLAGS) |
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
794 |
23017
0f22914be30e
* acinclude.m4 (OCTAVE_CHECK_LIB): Downcase --with-XYZ options.
John W. Eaton <jwe@octave.org>
parents:
23008
diff
changeset
|
795 AC_ARG_WITH([m4_tolower($1)-libdir], |
0f22914be30e
* acinclude.m4 (OCTAVE_CHECK_LIB): Downcase --with-XYZ options.
John W. Eaton <jwe@octave.org>
parents:
23008
diff
changeset
|
796 [AS_HELP_STRING([--with-m4_tolower($1)-libdir=DIR], |
9519
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
797 [look for $2 libraries in DIR])], |
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
798 [m4_toupper([$1])_LDFLAGS="-L$withval"]) |
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
799 AC_SUBST(m4_toupper([$1])_LDFLAGS) |
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
800 |
23017
0f22914be30e
* acinclude.m4 (OCTAVE_CHECK_LIB): Downcase --with-XYZ options.
John W. Eaton <jwe@octave.org>
parents:
23008
diff
changeset
|
801 AC_ARG_WITH([m4_tolower($1)], |
23006
06c248729e6f
allow OCTAVE_CHECK_LIB to stop with an error if a library is required
John W. Eaton <jwe@octave.org>
parents:
22986
diff
changeset
|
802 [ifelse([$#], 10, |
06c248729e6f
allow OCTAVE_CHECK_LIB to stop with an error if a library is required
John W. Eaton <jwe@octave.org>
parents:
22986
diff
changeset
|
803 [m4_ifblank([$7], |
23017
0f22914be30e
* acinclude.m4 (OCTAVE_CHECK_LIB): Downcase --with-XYZ options.
John W. Eaton <jwe@octave.org>
parents:
23008
diff
changeset
|
804 [AS_HELP_STRING([--with-m4_tolower($1)=<lib>], [use $2 library <lib>])], |
0f22914be30e
* acinclude.m4 (OCTAVE_CHECK_LIB): Downcase --with-XYZ options.
John W. Eaton <jwe@octave.org>
parents:
23008
diff
changeset
|
805 [AS_HELP_STRING([--with-m4_tolower($1)], [$7])])], |
23006
06c248729e6f
allow OCTAVE_CHECK_LIB to stop with an error if a library is required
John W. Eaton <jwe@octave.org>
parents:
22986
diff
changeset
|
806 [m4_ifblank([$7], |
23017
0f22914be30e
* acinclude.m4 (OCTAVE_CHECK_LIB): Downcase --with-XYZ options.
John W. Eaton <jwe@octave.org>
parents:
23008
diff
changeset
|
807 [AS_HELP_STRING([--without-m4_tolower($1)], [don't use $2 library])], |
0f22914be30e
* acinclude.m4 (OCTAVE_CHECK_LIB): Downcase --with-XYZ options.
John W. Eaton <jwe@octave.org>
parents:
23008
diff
changeset
|
808 [AS_HELP_STRING([--without-m4_tolower($1)], [$7])])])], |
9519
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
809 with_$1=$withval, with_$1=yes) |
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
810 |
22039
0a528a6dac95
build: use pkg-config in OCTAVE_CHECK_LIB without overriding user options
Mike Miller <mtmiller@octave.org>
parents:
22036
diff
changeset
|
811 ac_octave_$1_pkg_check=no |
9519
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
812 m4_toupper([$1])_LIBS= |
21381 | 813 warn_$1="$3" |
9519
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
814 case $with_$1 in |
9539
41a74dcd14df
Clear QHULL_LIBS etc on errors. Interpret --without-qhull etc correctly.
David Grundberg <individ@acc.umu.se>
parents:
9531
diff
changeset
|
815 no) |
23006
06c248729e6f
allow OCTAVE_CHECK_LIB to stop with an error if a library is required
John W. Eaton <jwe@octave.org>
parents:
22986
diff
changeset
|
816 ifelse([$#], 10, |
23017
0f22914be30e
* acinclude.m4 (OCTAVE_CHECK_LIB): Downcase --with-XYZ options.
John W. Eaton <jwe@octave.org>
parents:
23008
diff
changeset
|
817 [AC_MSG_ERROR([--without-m4_tolower($1) specified but $2 is required.])], |
28299
a8f6a7083428
Don't issue configure warnings when --without-XXX used (bug #58330)
Rik <rik@octave.org>
parents:
27957
diff
changeset
|
818 [warn_$1="" |
23006
06c248729e6f
allow OCTAVE_CHECK_LIB to stop with an error if a library is required
John W. Eaton <jwe@octave.org>
parents:
22986
diff
changeset
|
819 m4_toupper([$1])_LIBS=]) |
9539
41a74dcd14df
Clear QHULL_LIBS etc on errors. Interpret --without-qhull etc correctly.
David Grundberg <individ@acc.umu.se>
parents:
9531
diff
changeset
|
820 ;; |
9519
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
821 yes | "") |
22039
0a528a6dac95
build: use pkg-config in OCTAVE_CHECK_LIB without overriding user options
Mike Miller <mtmiller@octave.org>
parents:
22036
diff
changeset
|
822 ac_octave_$1_pkg_check=yes |
9519
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
823 m4_toupper([$1])_LIBS="-l$1" |
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
824 ;; |
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
825 -* | */* | *.a | *.so | *.so.* | *.o) |
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
826 m4_toupper([$1])_LIBS="$with_$1" |
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
827 ;; |
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
828 *) |
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
829 m4_toupper([$1])_LIBS="-l$with_$1" |
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
830 ;; |
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
831 esac |
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
832 |
22039
0a528a6dac95
build: use pkg-config in OCTAVE_CHECK_LIB without overriding user options
Mike Miller <mtmiller@octave.org>
parents:
22036
diff
changeset
|
833 if test $ac_octave_$1_pkg_check = yes; then |
22103
9811e7875d52
build: allow pkg-config name to differ from library name
Mike Miller <mtmiller@octave.org>
parents:
22039
diff
changeset
|
834 PKG_CHECK_EXISTS(m4_default([$9], [$1]), [ |
22039
0a528a6dac95
build: use pkg-config in OCTAVE_CHECK_LIB without overriding user options
Mike Miller <mtmiller@octave.org>
parents:
22036
diff
changeset
|
835 if test -z "$m4_toupper([$1])_CPPFLAGS"; then |
23835
6ae0292aaa5c
configure: ensure empty pkg-config results are actually empty (bug #51680)
Mike Miller <mtmiller@octave.org>
parents:
23414
diff
changeset
|
836 m4_toupper([$1])_CPPFLAGS="$($PKG_CONFIG --cflags-only-I m4_default([$9], [$1]) | $SED -e 's/^ *$//')" |
22039
0a528a6dac95
build: use pkg-config in OCTAVE_CHECK_LIB without overriding user options
Mike Miller <mtmiller@octave.org>
parents:
22036
diff
changeset
|
837 fi |
0a528a6dac95
build: use pkg-config in OCTAVE_CHECK_LIB without overriding user options
Mike Miller <mtmiller@octave.org>
parents:
22036
diff
changeset
|
838 if test -z "$m4_toupper([$1])_LDFLAGS"; then |
23835
6ae0292aaa5c
configure: ensure empty pkg-config results are actually empty (bug #51680)
Mike Miller <mtmiller@octave.org>
parents:
23414
diff
changeset
|
839 m4_toupper([$1])_LDFLAGS="$($PKG_CONFIG --libs-only-L m4_default([$9], [$1]) | $SED -e 's/^ *$//')" |
22039
0a528a6dac95
build: use pkg-config in OCTAVE_CHECK_LIB without overriding user options
Mike Miller <mtmiller@octave.org>
parents:
22036
diff
changeset
|
840 fi |
23835
6ae0292aaa5c
configure: ensure empty pkg-config results are actually empty (bug #51680)
Mike Miller <mtmiller@octave.org>
parents:
23414
diff
changeset
|
841 m4_toupper([$1])_LIBS="$($PKG_CONFIG --libs-only-l m4_default([$9], [$1]) | $SED -e 's/^ *$//')" |
22039
0a528a6dac95
build: use pkg-config in OCTAVE_CHECK_LIB without overriding user options
Mike Miller <mtmiller@octave.org>
parents:
22036
diff
changeset
|
842 ]) |
0a528a6dac95
build: use pkg-config in OCTAVE_CHECK_LIB without overriding user options
Mike Miller <mtmiller@octave.org>
parents:
22036
diff
changeset
|
843 fi |
22036
a2c29df93df7
acinclude.m4: Use pkg-config from OCTAVE_CHECK_LIB whenever possible
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
21945
diff
changeset
|
844 |
9519
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
845 if test -n "$m4_toupper([$1])_LIBS"; then |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
846 ac_octave_save_CPPFLAGS="$CPPFLAGS" |
15350
6a0c0d3d60b6
build: Implement some caching for OCTAVE_CHECK_LIB macro.
Rik <rik@octave.org>
parents:
15338
diff
changeset
|
847 ac_octave_save_LDFLAGS="$LDFLAGS" |
6a0c0d3d60b6
build: Implement some caching for OCTAVE_CHECK_LIB macro.
Rik <rik@octave.org>
parents:
15338
diff
changeset
|
848 ac_octave_save_LIBS="$LIBS" |
9519
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
849 CPPFLAGS="$m4_toupper([$1])_CPPFLAGS $CPPFLAGS" |
15350
6a0c0d3d60b6
build: Implement some caching for OCTAVE_CHECK_LIB macro.
Rik <rik@octave.org>
parents:
15338
diff
changeset
|
850 LDFLAGS="$m4_toupper([$1])_LDFLAGS $LDFLAGS" |
6a0c0d3d60b6
build: Implement some caching for OCTAVE_CHECK_LIB macro.
Rik <rik@octave.org>
parents:
15338
diff
changeset
|
851 LIBS="$m4_toupper([$1])_LIBS $LIBS" |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9520
diff
changeset
|
852 m4_ifnblank([$6], [AC_LANG_PUSH($6)]) |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16012
diff
changeset
|
853 ac_octave_$1_check_for_lib=no |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16012
diff
changeset
|
854 m4_ifblank([$4], [ac_octave_$1_check_for_lib=yes], |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16012
diff
changeset
|
855 [AC_CHECK_HEADERS([$4], [ac_octave_$1_check_for_lib=yes; break])]) |
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16012
diff
changeset
|
856 if test $ac_octave_$1_check_for_lib = yes; then |
15350
6a0c0d3d60b6
build: Implement some caching for OCTAVE_CHECK_LIB macro.
Rik <rik@octave.org>
parents:
15338
diff
changeset
|
857 AC_CACHE_CHECK([for $5 in $m4_toupper([$1])_LIBS], |
6a0c0d3d60b6
build: Implement some caching for OCTAVE_CHECK_LIB macro.
Rik <rik@octave.org>
parents:
15338
diff
changeset
|
858 [octave_cv_lib_$1], |
6a0c0d3d60b6
build: Implement some caching for OCTAVE_CHECK_LIB macro.
Rik <rik@octave.org>
parents:
15338
diff
changeset
|
859 [AC_LINK_IFELSE([AC_LANG_CALL([], [$5])], |
6a0c0d3d60b6
build: Implement some caching for OCTAVE_CHECK_LIB macro.
Rik <rik@octave.org>
parents:
15338
diff
changeset
|
860 [octave_cv_lib_$1=yes], [octave_cv_lib_$1=no]) |
6a0c0d3d60b6
build: Implement some caching for OCTAVE_CHECK_LIB macro.
Rik <rik@octave.org>
parents:
15338
diff
changeset
|
861 ]) |
6a0c0d3d60b6
build: Implement some caching for OCTAVE_CHECK_LIB macro.
Rik <rik@octave.org>
parents:
15338
diff
changeset
|
862 if test "$octave_cv_lib_$1" = yes; then |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
863 m4_ifblank([$8], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
864 warn_$1= |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
865 AC_DEFINE([HAVE_]m4_toupper([$1]), 1, |
19355
22289e6e316e
build: Remove unused TEXINFO_LIBNAME definitions from Makefiles.
Rik <rik@octave.org>
parents:
19108
diff
changeset
|
866 [Define to 1 if $2 is available.])], [$8]) |
25299
537b732926fb
fix logic error in OCTAVE_CONFIG_LIB (bug #53736)
John W. Eaton <jwe@octave.org>
parents:
25135
diff
changeset
|
867 else |
537b732926fb
fix logic error in OCTAVE_CONFIG_LIB (bug #53736)
John W. Eaton <jwe@octave.org>
parents:
25135
diff
changeset
|
868 m4_toupper([$1])_LIBS= |
9519
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
869 fi |
25299
537b732926fb
fix logic error in OCTAVE_CONFIG_LIB (bug #53736)
John W. Eaton <jwe@octave.org>
parents:
25135
diff
changeset
|
870 else |
25666
b08864ae8506
OCTAVE_CHECK_LIB: avoid shell syntax error if not checking for lib
John W. Eaton <jwe@octave.org>
parents:
25559
diff
changeset
|
871 octave_cv_lib_$1=no |
25299
537b732926fb
fix logic error in OCTAVE_CONFIG_LIB (bug #53736)
John W. Eaton <jwe@octave.org>
parents:
25135
diff
changeset
|
872 m4_toupper([$1])_LIBS= |
9568
d3fccc4c4b9e
use OCTAVE_CHECK_LIBRARY to check for ARPACK
John W. Eaton <jwe@octave.org>
parents:
9543
diff
changeset
|
873 fi |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9520
diff
changeset
|
874 m4_ifnblank([$6], [AC_LANG_POP($6)]) |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
875 CPPFLAGS="$ac_octave_save_CPPFLAGS" |
15350
6a0c0d3d60b6
build: Implement some caching for OCTAVE_CHECK_LIB macro.
Rik <rik@octave.org>
parents:
15338
diff
changeset
|
876 LDFLAGS="$ac_octave_save_LDFLAGS" |
6a0c0d3d60b6
build: Implement some caching for OCTAVE_CHECK_LIB macro.
Rik <rik@octave.org>
parents:
15338
diff
changeset
|
877 LIBS="$ac_octave_save_LIBS" |
21381 | 878 else |
879 octave_cv_lib_$1=no | |
9519
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
880 fi |
15350
6a0c0d3d60b6
build: Implement some caching for OCTAVE_CHECK_LIB macro.
Rik <rik@octave.org>
parents:
15338
diff
changeset
|
881 |
23006
06c248729e6f
allow OCTAVE_CHECK_LIB to stop with an error if a library is required
John W. Eaton <jwe@octave.org>
parents:
22986
diff
changeset
|
882 ifelse([$#], 10, [ |
06c248729e6f
allow OCTAVE_CHECK_LIB to stop with an error if a library is required
John W. Eaton <jwe@octave.org>
parents:
22986
diff
changeset
|
883 if test $octave_cv_lib_$1 = no; then |
06c248729e6f
allow OCTAVE_CHECK_LIB to stop with an error if a library is required
John W. Eaton <jwe@octave.org>
parents:
22986
diff
changeset
|
884 AC_MSG_ERROR([to build Octave, you must have the $2 library and header files installed]) |
06c248729e6f
allow OCTAVE_CHECK_LIB to stop with an error if a library is required
John W. Eaton <jwe@octave.org>
parents:
22986
diff
changeset
|
885 fi]) |
9519
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
886 AC_SUBST(m4_toupper([$1])_LIBS) |
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
887 if test -n "$warn_$1"; then |
21381 | 888 OCTAVE_CONFIGURE_WARNING([warn_$1]) |
9519
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
889 fi |
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
890 ]) |
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
891 dnl |
15133
f91eac1bc66d
m4/acinclude.m4: Correct typos, use consistent style for describing macros.
Rik <rik@octave.org>
parents:
15126
diff
changeset
|
892 dnl Check whether ARPACK works (does not crash). |
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
|
893 dnl |
14147
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
894 dnl Using a pure Fortran program doesn't seem to crash when linked |
24289
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
895 dnl with the buggy ARPACK library, but the C++ program does. Maybe it |
15133
f91eac1bc66d
m4/acinclude.m4: Correct typos, use consistent style for describing macros.
Rik <rik@octave.org>
parents:
15126
diff
changeset
|
896 dnl is the memory allocation that exposes the bug and using statically |
14147
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
897 dnl allocated arrays in Fortran does not? |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
898 dnl |
18058
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
899 dnl FIXME: it would be nice to avoid the duplication of F77 macros |
25047
1fe6002f68a7
update arpack checks for F77_INT vs octave_idx_type changes
John W. Eaton <jwe@octave.org>
parents:
25046
diff
changeset
|
900 dnl and typedefs here and in the f77-fcn.h header file. Also, the |
1fe6002f68a7
update arpack checks for F77_INT vs octave_idx_type changes
John W. Eaton <jwe@octave.org>
parents:
25046
diff
changeset
|
901 dnl definition of the character handling macros are not right for |
1fe6002f68a7
update arpack checks for F77_INT vs octave_idx_type changes
John W. Eaton <jwe@octave.org>
parents:
25046
diff
changeset
|
902 dnl all systems (but should work on most modern systems in use today). |
18058
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
903 dnl |
24289
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
904 AC_DEFUN([OCTAVE_CHECK_LIB_ARPACK_OK_1], [ |
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
|
905 AC_CACHE_CHECK([whether the arpack library works], |
24289
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
906 [octave_cv_lib_arpack_ok_1], |
15294
d1751eee9a42
acinclude.m4: Use AC_LANG_PUSH macro with AC_CACHE_CHECK for greater efficiency.
Rik <rik@octave.org>
parents:
15293
diff
changeset
|
907 [AC_LANG_PUSH(C++) |
d1751eee9a42
acinclude.m4: Use AC_LANG_PUSH macro with AC_CACHE_CHECK for greater efficiency.
Rik <rik@octave.org>
parents:
15293
diff
changeset
|
908 AC_RUN_IFELSE([AC_LANG_PROGRAM([[ |
14147
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
909 |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
910 #include <cfloat> |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
911 |
18058
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
912 #include <stdint.h> |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
913 |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
914 typedef int F77_RET_T; |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
915 |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
916 #define F77_CHAR_ARG2(x, l) x |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
917 #define F77_CONST_CHAR_ARG2(x, l) F77_CHAR_ARG2 (x, l) |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
918 |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
919 #define F77_CHAR_ARG_LEN(l) , l |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
920 |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
921 #define F77_CONST_CHAR_ARG_DECL const char * |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
922 #define F77_CHAR_ARG_LEN_DECL , long |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
923 |
25047
1fe6002f68a7
update arpack checks for F77_INT vs octave_idx_type changes
John W. Eaton <jwe@octave.org>
parents:
25046
diff
changeset
|
924 #define F77_INT $OCTAVE_F77_INT_TYPE |
1fe6002f68a7
update arpack checks for F77_INT vs octave_idx_type changes
John W. Eaton <jwe@octave.org>
parents:
25046
diff
changeset
|
925 #define F77_DBLE double |
1fe6002f68a7
update arpack checks for F77_INT vs octave_idx_type changes
John W. Eaton <jwe@octave.org>
parents:
25046
diff
changeset
|
926 |
18058
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
927 extern "C" |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
928 { |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
929 F77_RET_T |
25047
1fe6002f68a7
update arpack checks for F77_INT vs octave_idx_type changes
John W. Eaton <jwe@octave.org>
parents:
25046
diff
changeset
|
930 F77_FUNC (dnaupd, DNAUPD) (F77_INT&, |
18058
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
931 F77_CONST_CHAR_ARG_DECL, |
25047
1fe6002f68a7
update arpack checks for F77_INT vs octave_idx_type changes
John W. Eaton <jwe@octave.org>
parents:
25046
diff
changeset
|
932 const F77_INT&, |
18058
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
933 F77_CONST_CHAR_ARG_DECL, |
25047
1fe6002f68a7
update arpack checks for F77_INT vs octave_idx_type changes
John W. Eaton <jwe@octave.org>
parents:
25046
diff
changeset
|
934 F77_INT&, const F77_DBLE&, |
1fe6002f68a7
update arpack checks for F77_INT vs octave_idx_type changes
John W. Eaton <jwe@octave.org>
parents:
25046
diff
changeset
|
935 F77_DBLE*, const F77_INT&, F77_DBLE*, |
1fe6002f68a7
update arpack checks for F77_INT vs octave_idx_type changes
John W. Eaton <jwe@octave.org>
parents:
25046
diff
changeset
|
936 const F77_INT&, F77_INT*, |
1fe6002f68a7
update arpack checks for F77_INT vs octave_idx_type changes
John W. Eaton <jwe@octave.org>
parents:
25046
diff
changeset
|
937 F77_INT*, F77_DBLE*, F77_DBLE*, |
1fe6002f68a7
update arpack checks for F77_INT vs octave_idx_type changes
John W. Eaton <jwe@octave.org>
parents:
25046
diff
changeset
|
938 const F77_INT&, F77_INT& |
18058
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
939 F77_CHAR_ARG_LEN_DECL |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
940 F77_CHAR_ARG_LEN_DECL); |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
941 |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
942 F77_RET_T |
25047
1fe6002f68a7
update arpack checks for F77_INT vs octave_idx_type changes
John W. Eaton <jwe@octave.org>
parents:
25046
diff
changeset
|
943 F77_FUNC (dneupd, DNEUPD) (const F77_INT&, |
18058
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
944 F77_CONST_CHAR_ARG_DECL, |
25047
1fe6002f68a7
update arpack checks for F77_INT vs octave_idx_type changes
John W. Eaton <jwe@octave.org>
parents:
25046
diff
changeset
|
945 F77_INT*, F77_DBLE*, F77_DBLE*, |
1fe6002f68a7
update arpack checks for F77_INT vs octave_idx_type changes
John W. Eaton <jwe@octave.org>
parents:
25046
diff
changeset
|
946 F77_DBLE*, const F77_INT&, const F77_DBLE&, |
1fe6002f68a7
update arpack checks for F77_INT vs octave_idx_type changes
John W. Eaton <jwe@octave.org>
parents:
25046
diff
changeset
|
947 const F77_DBLE&, F77_DBLE*, |
18058
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
948 F77_CONST_CHAR_ARG_DECL, |
25047
1fe6002f68a7
update arpack checks for F77_INT vs octave_idx_type changes
John W. Eaton <jwe@octave.org>
parents:
25046
diff
changeset
|
949 const F77_INT&, |
18058
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
950 F77_CONST_CHAR_ARG_DECL, |
25047
1fe6002f68a7
update arpack checks for F77_INT vs octave_idx_type changes
John W. Eaton <jwe@octave.org>
parents:
25046
diff
changeset
|
951 F77_INT&, const F77_DBLE&, F77_DBLE*, |
1fe6002f68a7
update arpack checks for F77_INT vs octave_idx_type changes
John W. Eaton <jwe@octave.org>
parents:
25046
diff
changeset
|
952 const F77_INT&, F77_DBLE*, |
1fe6002f68a7
update arpack checks for F77_INT vs octave_idx_type changes
John W. Eaton <jwe@octave.org>
parents:
25046
diff
changeset
|
953 const F77_INT&, F77_INT*, |
1fe6002f68a7
update arpack checks for F77_INT vs octave_idx_type changes
John W. Eaton <jwe@octave.org>
parents:
25046
diff
changeset
|
954 F77_INT*, F77_DBLE*, F77_DBLE*, |
1fe6002f68a7
update arpack checks for F77_INT vs octave_idx_type changes
John W. Eaton <jwe@octave.org>
parents:
25046
diff
changeset
|
955 const F77_INT&, F77_INT& |
18058
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
956 F77_CHAR_ARG_LEN_DECL |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
957 F77_CHAR_ARG_LEN_DECL |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
958 F77_CHAR_ARG_LEN_DECL); |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
959 |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
960 F77_RET_T |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
961 F77_FUNC (dgemv, DGEMV) (F77_CONST_CHAR_ARG_DECL, |
25047
1fe6002f68a7
update arpack checks for F77_INT vs octave_idx_type changes
John W. Eaton <jwe@octave.org>
parents:
25046
diff
changeset
|
962 const F77_INT&, const F77_INT&, |
1fe6002f68a7
update arpack checks for F77_INT vs octave_idx_type changes
John W. Eaton <jwe@octave.org>
parents:
25046
diff
changeset
|
963 const F77_DBLE&, const F77_DBLE*, |
1fe6002f68a7
update arpack checks for F77_INT vs octave_idx_type changes
John W. Eaton <jwe@octave.org>
parents:
25046
diff
changeset
|
964 const F77_INT&, const F77_DBLE*, |
1fe6002f68a7
update arpack checks for F77_INT vs octave_idx_type changes
John W. Eaton <jwe@octave.org>
parents:
25046
diff
changeset
|
965 const F77_INT&, const F77_DBLE&, |
1fe6002f68a7
update arpack checks for F77_INT vs octave_idx_type changes
John W. Eaton <jwe@octave.org>
parents:
25046
diff
changeset
|
966 F77_DBLE*, const F77_INT& |
18058
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
967 F77_CHAR_ARG_LEN_DECL); |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
968 } |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
969 |
14147
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
970 void |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
971 doit (void) |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
972 { |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
973 // Based on function EigsRealNonSymmetricMatrix from liboctave/eigs-base.cc. |
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
|
974 |
24289
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
975 // Problem matrix. See bug #31479. |
25047
1fe6002f68a7
update arpack checks for F77_INT vs octave_idx_type changes
John W. Eaton <jwe@octave.org>
parents:
25046
diff
changeset
|
976 F77_INT n = 4; |
14147
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
977 double *m = new double [n * n]; |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
978 m[0] = 1, m[4] = 0, m[8] = 0, m[12] = -1; |
24289
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
979 m[1] = 0, m[5] = 1, m[9] = 0, m[13] = 0; |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
980 m[2] = 0, m[6] = 0, m[10] = 1, m[14] = 0; |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
981 m[3] = 0, m[7] = 0, m[11] = 2, m[15] = 1; |
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
|
982 |
14147
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
983 double *resid = new double [4]; |
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
|
984 |
14147
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
985 resid[0] = 0.960966; |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
986 resid[1] = 0.741195; |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
987 resid[2] = 0.150143; |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
988 resid[3] = 0.868067; |
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
|
989 |
25047
1fe6002f68a7
update arpack checks for F77_INT vs octave_idx_type changes
John W. Eaton <jwe@octave.org>
parents:
25046
diff
changeset
|
990 F77_INT *ip = new F77_INT [11]; |
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
|
991 |
14147
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
992 ip[0] = 1; // ishift |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
993 ip[1] = 0; // ip[1] not referenced |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
994 ip[2] = 300; // mxiter, maximum number of iterations |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
995 ip[3] = 1; // NB blocksize in recurrence |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
996 ip[4] = 0; // nconv, number of Ritz values that satisfy convergence |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
997 ip[5] = 0; // ip[5] not referenced |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
998 ip[6] = 1; // mode |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
999 ip[7] = 0; // ip[7] to ip[10] are return values |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
1000 ip[8] = 0; |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
1001 ip[9] = 0; |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
1002 ip[10] = 0; |
17034
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
1003 |
25047
1fe6002f68a7
update arpack checks for F77_INT vs octave_idx_type changes
John W. Eaton <jwe@octave.org>
parents:
25046
diff
changeset
|
1004 F77_INT *ipntr = new F77_INT [14]; |
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
|
1005 |
25047
1fe6002f68a7
update arpack checks for F77_INT vs octave_idx_type changes
John W. Eaton <jwe@octave.org>
parents:
25046
diff
changeset
|
1006 F77_INT k = 1; |
1fe6002f68a7
update arpack checks for F77_INT vs octave_idx_type changes
John W. Eaton <jwe@octave.org>
parents:
25046
diff
changeset
|
1007 F77_INT p = 3; |
1fe6002f68a7
update arpack checks for F77_INT vs octave_idx_type changes
John W. Eaton <jwe@octave.org>
parents:
25046
diff
changeset
|
1008 F77_INT lwork = 3 * p * (p + 2); |
14147
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
1009 |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
1010 double *v = new double [n * (p + 1)]; |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
1011 double *workl = new double [lwork + 1]; |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
1012 double *workd = new double [3 * n + 1]; |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
1013 |
25047
1fe6002f68a7
update arpack checks for F77_INT vs octave_idx_type changes
John W. Eaton <jwe@octave.org>
parents:
25046
diff
changeset
|
1014 F77_INT ido = 0; |
1fe6002f68a7
update arpack checks for F77_INT vs octave_idx_type changes
John W. Eaton <jwe@octave.org>
parents:
25046
diff
changeset
|
1015 F77_INT info = 0; |
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
|
1016 |
14147
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
1017 double tol = DBL_EPSILON; |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
1018 |
17034
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
1019 do |
14147
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
1020 { |
18058
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
1021 F77_FUNC (dnaupd, DNAUPD) (ido, F77_CONST_CHAR_ARG2 ("I", 1), |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
1022 n, F77_CONST_CHAR_ARG2 ("LM", 2), |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
1023 k, tol, resid, p, v, n, ip, ipntr, |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
1024 workd, workl, lwork, info |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
1025 F77_CHAR_ARG_LEN (1) |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
1026 F77_CHAR_ARG_LEN (2)); |
14147
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
1027 |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
1028 if (ido == -1 || ido == 1 || ido == 2) |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
1029 { |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
1030 double *x = workd + ipntr[0] - 1; |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
1031 double *y = workd + ipntr[1] - 1; |
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
|
1032 |
18058
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
1033 F77_FUNC (dgemv, DGEMV) (F77_CONST_CHAR_ARG2 ("N", 1), |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
1034 n, n, 1.0, m, n, x, 1, 0.0, y, 1 |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
1035 F77_CHAR_ARG_LEN (1)); |
14147
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
1036 } |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
1037 else |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
1038 { |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
1039 if (info < 0) |
24289
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1040 return; // Error |
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
|
1041 |
14147
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
1042 break; |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
1043 } |
17034
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
1044 } |
14147
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
1045 while (1); |
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
|
1046 |
25047
1fe6002f68a7
update arpack checks for F77_INT vs octave_idx_type changes
John W. Eaton <jwe@octave.org>
parents:
25046
diff
changeset
|
1047 F77_INT *sel = new F77_INT [p]; |
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
|
1048 |
14147
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
1049 // In Octave, the dimensions of dr and di are k+1, but k+2 avoids segfault |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
1050 double *dr = new double [k + 1]; |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
1051 double *di = new double [k + 1]; |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
1052 double *workev = new double [3 * p]; |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
1053 |
25047
1fe6002f68a7
update arpack checks for F77_INT vs octave_idx_type changes
John W. Eaton <jwe@octave.org>
parents:
25046
diff
changeset
|
1054 for (F77_INT i = 0; i < k + 1; i++) |
24289
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1055 dr[i] = di[i] = 0.0; |
14147
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
1056 |
25047
1fe6002f68a7
update arpack checks for F77_INT vs octave_idx_type changes
John W. Eaton <jwe@octave.org>
parents:
25046
diff
changeset
|
1057 F77_INT rvec = 1; |
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
|
1058 |
14147
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
1059 double sigmar = 0.0; |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
1060 double sigmai = 0.0; |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
1061 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1062 // In Octave, this is n*(k+1), but n*(k+2) avoids segfault |
14147
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
1063 double *z = new double [n * (k + 1)]; |
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
|
1064 |
18058
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
1065 F77_FUNC (dneupd, DNEUPD) (rvec, F77_CONST_CHAR_ARG2 ("A", 1), |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
1066 sel, dr, di, z, n, sigmar, sigmai, workev, |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
1067 F77_CONST_CHAR_ARG2 ("I", 1), n, |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
1068 F77_CONST_CHAR_ARG2 ("LM", 2), k, tol, |
14147
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
1069 resid, p, v, n, ip, ipntr, workd, |
18058
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
1070 workl, lwork, info |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
1071 F77_CHAR_ARG_LEN (1) |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
1072 F77_CHAR_ARG_LEN (1) |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
1073 F77_CHAR_ARG_LEN (2)); |
14147
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
1074 } |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1075 |
14147
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
1076 ]], [[ |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1077 |
14147
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
1078 for (int i = 0; i < 10; i++) |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
1079 doit (); |
24289
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1080 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1081 ]])], |
24289
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1082 octave_cv_lib_arpack_ok_1=yes, |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1083 octave_cv_lib_arpack_ok_1=no, |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1084 octave_cv_lib_arpack_ok_1=yes) |
15294
d1751eee9a42
acinclude.m4: Use AC_LANG_PUSH macro with AC_CACHE_CHECK for greater efficiency.
Rik <rik@octave.org>
parents:
15293
diff
changeset
|
1085 AC_LANG_POP(C++) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1086 ]) |
24289
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1087 if test $octave_cv_lib_arpack_ok_1 = yes; then |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1088 $1 |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1089 : |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1090 else |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1091 $2 |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1092 : |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1093 fi |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1094 ]) |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1095 dnl |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1096 dnl Check whether ARPACK is buggy (it doesn't crash, but gets wrong answers). |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1097 dnl |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1098 dnl ARPACK versions < 3.3.0 have a bug which results in different eigenvalues |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1099 dnl being calculated depending on whether eigenvectors are also requested. |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1100 dnl See bug #52425. |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1101 dnl |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1102 AC_DEFUN([OCTAVE_CHECK_LIB_ARPACK_OK_2], [ |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1103 AC_CACHE_CHECK([whether the arpack library is free of bugs], |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1104 [octave_cv_lib_arpack_ok_2], |
24336
0771ce2d30ef
build: Fix compiling OCTAVE_ARPACK_OK_2 Fortran code (bug #52425).
Rik <rik@octave.org>
parents:
24289
diff
changeset
|
1105 [save_FFLAGS="$FFLAGS" |
0771ce2d30ef
build: Fix compiling OCTAVE_ARPACK_OK_2 Fortran code (bug #52425).
Rik <rik@octave.org>
parents:
24289
diff
changeset
|
1106 FFLAGS="$FFLAGS $F77_INTEGER_8_FLAG" |
0771ce2d30ef
build: Fix compiling OCTAVE_ARPACK_OK_2 Fortran code (bug #52425).
Rik <rik@octave.org>
parents:
24289
diff
changeset
|
1107 AC_LANG_PUSH(Fortran 77) |
24289
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1108 AC_RUN_IFELSE([[ |
24446
4ca5c9f899d3
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
24337
diff
changeset
|
1109 program bug_52425 |
24289
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1110 c |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1111 integer maxn, maxnev, maxncv, ldv |
24446
4ca5c9f899d3
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
24337
diff
changeset
|
1112 parameter (maxn=256, maxnev=10, maxncv=25, |
24289
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1113 $ ldv=maxn ) |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1114 c |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1115 Double precision |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1116 & v(ldv,maxncv), workl(maxncv*(maxncv+8)), |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1117 & workd(3*maxn), d(maxncv,2), resid(maxn), |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1118 & ax(maxn) |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1119 logical select(maxncv) |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1120 integer iparam(11), ipntr(11) |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1121 c |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1122 character bmat*1, which*2 |
24446
4ca5c9f899d3
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
24337
diff
changeset
|
1123 integer ido, n, nev, ncv, lworkl, info, ierr, j, |
24289
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1124 & nx, nconv, maxitr, mode, ishfts |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1125 logical rvec |
24446
4ca5c9f899d3
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
24337
diff
changeset
|
1126 Double precision |
24289
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1127 & tol, sigma |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1128 c |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1129 Double precision |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1130 & zero |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1131 parameter (zero = 0.0D+0) |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1132 c |
24446
4ca5c9f899d3
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
24337
diff
changeset
|
1133 Double precision |
24289
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1134 & dnrm2 |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1135 external dnrm2, daxpy |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1136 c |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1137 intrinsic abs |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1138 c |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1139 n = 20 |
24446
4ca5c9f899d3
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
24337
diff
changeset
|
1140 nev = 4 |
4ca5c9f899d3
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
24337
diff
changeset
|
1141 ncv = 20 |
24289
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1142 bmat = 'I' |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1143 which = 'BE' |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1144 c |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1145 lworkl = ncv*(ncv+8) |
24446
4ca5c9f899d3
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
24337
diff
changeset
|
1146 tol = zero |
24289
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1147 info = 1 |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1148 do j = 1,n |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1149 resid (j) = 1.0d0 |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1150 end do |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1151 ido = 0 |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1152 c |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1153 ishfts = 1 |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1154 maxitr = 300 |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1155 mode = 1 |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1156 c |
24446
4ca5c9f899d3
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
24337
diff
changeset
|
1157 iparam(1) = ishfts |
4ca5c9f899d3
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
24337
diff
changeset
|
1158 iparam(3) = maxitr |
4ca5c9f899d3
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
24337
diff
changeset
|
1159 iparam(7) = mode |
24289
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1160 c |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1161 10 continue |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1162 c |
24446
4ca5c9f899d3
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
24337
diff
changeset
|
1163 call dsaupd ( ido, bmat, n, which, nev, tol, resid, |
24289
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1164 & ncv, v, ldv, iparam, ipntr, workd, workl, |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1165 & lworkl, info ) |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1166 c |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1167 if (ido .eq. -1 .or. ido .eq. 1) then |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1168 call av (n, workd(ipntr(1)), workd(ipntr(2))) |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1169 go to 10 |
24446
4ca5c9f899d3
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
24337
diff
changeset
|
1170 end if |
24289
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1171 c |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1172 if ( info .lt. 0 ) then |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1173 stop 1 |
24446
4ca5c9f899d3
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
24337
diff
changeset
|
1174 else |
24289
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1175 rvec = .false. |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1176 c |
24446
4ca5c9f899d3
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
24337
diff
changeset
|
1177 call dseupd ( rvec, 'All', select, d, v, ldv, sigma, |
4ca5c9f899d3
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
24337
diff
changeset
|
1178 & bmat, n, which, nev, tol, resid, ncv, v, ldv, |
24289
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1179 & iparam, ipntr, workd, workl, lworkl, ierr ) |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1180 c |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1181 if ( ierr .ne. 0) then |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1182 stop 1 |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1183 else |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1184 nconv = iparam(5) |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1185 do 20 j=1, nconv |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1186 call av(n, v(1,j), ax) |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1187 call daxpy(n, -d(j,1), v(1,j), 1, ax, 1) |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1188 d(j,2) = dnrm2(n, ax, 1) |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1189 d(j,2) = d(j,2) / abs(d(j,1)) |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1190 c |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1191 20 continue |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1192 c |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1193 c | Litmus test: return 1 or 0 based on returned eigenvalue |
24446
4ca5c9f899d3
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
24337
diff
changeset
|
1194 c |
24289
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1195 if (abs(d(1,1) - 2.0810) > 1.0d-4) then |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1196 stop 1 |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1197 else |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1198 stop 0 |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1199 end if |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1200 end if |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1201 end if |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1202 c |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1203 end |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1204 c |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1205 subroutine av (n, v, w) |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1206 integer n, j |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1207 Double precision v(n), w(n) |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1208 c |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1209 w(1) = 4*v(1) + v(3) |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1210 w(2) = 4*v(2) + v(4) |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1211 do 10 j = 3, n - 2 |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1212 w(j) = v(j-2) + 4*v(j) + v(j+2) |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1213 10 continue |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1214 w(n-1) = v(n-3) + 4 * v(n-1) |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1215 w(n) = v(n-2) + 4 * v(n) |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1216 return |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1217 end |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1218 ]], |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1219 octave_cv_lib_arpack_ok_2=yes, |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1220 octave_cv_lib_arpack_ok_2=no, |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1221 octave_cv_lib_arpack_ok_2=yes) |
24336
0771ce2d30ef
build: Fix compiling OCTAVE_ARPACK_OK_2 Fortran code (bug #52425).
Rik <rik@octave.org>
parents:
24289
diff
changeset
|
1222 ## Restore FFLAGS. |
0771ce2d30ef
build: Fix compiling OCTAVE_ARPACK_OK_2 Fortran code (bug #52425).
Rik <rik@octave.org>
parents:
24289
diff
changeset
|
1223 FFLAGS="$save_FFLAGS" |
24289
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1224 AC_LANG_POP(Fortran 77) |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1225 ]) |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1226 if test $octave_cv_lib_arpack_ok_2 = yes; then |
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
|
1227 $1 |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
1228 : |
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
|
1229 else |
834df9f10963
remove ARPACK files from sources and restore configure checks for external ARPACK library
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
1230 $2 |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
1231 : |
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
|
1232 fi |
834df9f10963
remove ARPACK files from sources and restore configure checks for external ARPACK library
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
1233 ]) |
834df9f10963
remove ARPACK files from sources and restore configure checks for external ARPACK library
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
1234 dnl |
17241
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1235 dnl Check whether GLPK provides the latest API functions required |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1236 dnl for the glpk function. The glp_iptcp structure was introduced |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1237 dnl in GLPK version 4.38. |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1238 dnl |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1239 AC_DEFUN([OCTAVE_CHECK_LIB_GLPK_OK], [ |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1240 AC_CACHE_CHECK([whether the glpk library has glp_interior(glp_prob*, glp_iptcp*)], |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1241 [octave_cv_lib_glpk_ok], |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1242 [AC_LANG_PUSH(C++) |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1243 AC_LINK_IFELSE([AC_LANG_PROGRAM([[ |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1244 extern "C" |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1245 { |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1246 #if defined (HAVE_GLPK_GLPK_H) |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1247 #include <glpk/glpk.h> |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1248 #else |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1249 #include <glpk.h> |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1250 #endif |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1251 } |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1252 ]], [[ |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1253 glp_prob *lp = glp_create_prob (); |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1254 glp_iptcp iptcp; |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1255 glp_init_iptcp (&iptcp); |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1256 int retval = glp_interior (lp, &iptcp); |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1257 ]])], |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1258 octave_cv_lib_glpk_ok=yes, |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1259 octave_cv_lib_glpk_ok=no) |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1260 AC_LANG_POP(C++) |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1261 ]) |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1262 if test $octave_cv_lib_glpk_ok = yes; then |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1263 $1 |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1264 : |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1265 else |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1266 $2 |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1267 : |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1268 fi |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1269 ]) |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1270 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1271 dnl Check whether using HDF5 DLL under Windows. This is done by |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1272 dnl testing for a data symbol in the HDF5 library, which would |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1273 dnl require the definition of _HDF5USEDL_ under MSVC compiler. |
12166
eceacb78aa7f
don't add -L/usr/X11R6/lib to LDFLAGS in check for OpenGL libraries
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
1274 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1275 AC_DEFUN([OCTAVE_CHECK_LIB_HDF5_DLL], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1276 AC_CACHE_CHECK([if _HDF5USEDLL_ needs to be defined], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1277 [octave_cv_lib_hdf5_dll], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1278 [AC_LINK_IFELSE([AC_LANG_PROGRAM([[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1279 #include <hdf5.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1280 ]], [[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1281 hid_t x = H5T_NATIVE_DOUBLE; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1282 return x |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1283 ]])], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1284 [octave_cv_lib_hdf5_dll=no], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1285 [save_CFLAGS="$CFLAGS" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1286 CFLAGS="$CFLAGS -DWIN32 -D_HDF5USEDLL_" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1287 save_LIBS="$LIBS" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1288 LIBS="$HDF5_LIBS $LIBS" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1289 AC_LINK_IFELSE([AC_LANG_PROGRAM([[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1290 #include <hdf5.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1291 ]], [[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1292 hid_t x = H5T_NATIVE_DOUBLE; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1293 return x |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1294 ]])], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1295 octave_cv_lib_hdf5_dll=yes, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1296 octave_cv_lib_hdf5_dll=no) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1297 CFLAGS="$save_CFLAGS" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1298 LIBS="$save_LIBS" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1299 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1300 ]) |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
1301 if test $octave_cv_lib_hdf5_dll = yes; then |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1302 AC_DEFINE(_HDF5USEDLL_, 1, [Define to 1 if using HDF5 dll (Win32).]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1303 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1304 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1305 dnl |
15133
f91eac1bc66d
m4/acinclude.m4: Correct typos, use consistent style for describing macros.
Rik <rik@octave.org>
parents:
15126
diff
changeset
|
1306 dnl Check for OpenGL. If found, define OPENGL_LIBS. |
12166
eceacb78aa7f
don't add -L/usr/X11R6/lib to LDFLAGS in check for OpenGL libraries
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
1307 dnl |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15013
diff
changeset
|
1308 dnl FIXME: The following tests should probably check for the |
12166
eceacb78aa7f
don't add -L/usr/X11R6/lib to LDFLAGS in check for OpenGL libraries
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
1309 dnl libraries separately. |
eceacb78aa7f
don't add -L/usr/X11R6/lib to LDFLAGS in check for OpenGL libraries
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
1310 dnl |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15013
diff
changeset
|
1311 dnl FIXME: Should we allow a way to specify a directory for OpenGL |
12166
eceacb78aa7f
don't add -L/usr/X11R6/lib to LDFLAGS in check for OpenGL libraries
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
1312 dnl libraries and header files? |
7825
13871b7de124
Import sources for OpenGL-based renderer.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7361
diff
changeset
|
1313 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1314 AC_DEFUN([OCTAVE_CHECK_LIB_OPENGL], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1315 OPENGL_LIBS= |
8724
a50228129dba
Introduce new macro OCTAVE_GLUTESSCALLBACK_THREEDOTS. Use definitions HAVE_FRAMEWORK_OPENGL and HAVE_GLUTESSCALLBACK_THREEDOTS for Mac's framework OpenGL implementation.
Ben Abbott <bpabbott@mac.com>
parents:
8676
diff
changeset
|
1316 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1317 ## On MacOSX systems the OpenGL framework can be used |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1318 OCTAVE_HAVE_FRAMEWORK(OpenGL, [[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1319 #include <OpenGL/gl.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1320 #include <OpenGL/glu.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1321 ]], [[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1322 GLint par; glGetIntegerv (GL_VIEWPORT, &par); |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1323 ]], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1324 have_framework_opengl=yes, have_framework_opengl=no) |
8724
a50228129dba
Introduce new macro OCTAVE_GLUTESSCALLBACK_THREEDOTS. Use definitions HAVE_FRAMEWORK_OPENGL and HAVE_GLUTESSCALLBACK_THREEDOTS for Mac's framework OpenGL implementation.
Ben Abbott <bpabbott@mac.com>
parents:
8676
diff
changeset
|
1325 |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
1326 if test $have_framework_opengl = yes; then |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1327 AC_DEFINE(HAVE_FRAMEWORK_OPENGL, 1, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1328 [Define to 1 if framework OPENGL is available.]) |
22208
83963bad5e7d
improvements to Qt & OpenGL linking on the Mac (bug #41574)
Michael C. Grant <mcg@cvxr.com>
parents:
22150
diff
changeset
|
1329 OPENGL_LIBS="-framework OpenGL" |
83963bad5e7d
improvements to Qt & OpenGL linking on the Mac (bug #41574)
Michael C. Grant <mcg@cvxr.com>
parents:
22150
diff
changeset
|
1330 AC_MSG_NOTICE([adding -framework OpenGL to OPENGL_LIBS]) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1331 OCTAVE_CHECK_FUNC_GLUTESSCALLBACK_THREEDOTS |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1332 else |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1333 case $canonical_host_type in |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1334 *-*-mingw32* | *-*-msdosmsvc) |
15319
daf74ce2afdc
m4/acinclude.m4: Use more consistent m4 quoting of arguments to macros.
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
1335 AC_CHECK_HEADERS([windows.h]) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1336 ;; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1337 esac |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1338 have_opengl_incs=no |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1339 AC_CHECK_HEADERS([GL/gl.h OpenGL/gl.h], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1340 [AC_CHECK_HEADERS([GL/glu.h OpenGL/glu.h], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1341 [have_opengl_incs=yes; break], [], [ |
21724
aba2e6293dd8
use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents:
21604
diff
changeset
|
1342 #if defined (HAVE_WINDOWS_H) |
7954 | 1343 #include <windows.h> |
1344 #endif | |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1345 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1346 break |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1347 ], [], [ |
21724
aba2e6293dd8
use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents:
21604
diff
changeset
|
1348 #if defined (HAVE_WINDOWS_H) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1349 # include <windows.h> |
7954 | 1350 #endif |
8724
a50228129dba
Introduce new macro OCTAVE_GLUTESSCALLBACK_THREEDOTS. Use definitions HAVE_FRAMEWORK_OPENGL and HAVE_GLUTESSCALLBACK_THREEDOTS for Mac's framework OpenGL implementation.
Ben Abbott <bpabbott@mac.com>
parents:
8676
diff
changeset
|
1351 ]) |
a50228129dba
Introduce new macro OCTAVE_GLUTESSCALLBACK_THREEDOTS. Use definitions HAVE_FRAMEWORK_OPENGL and HAVE_GLUTESSCALLBACK_THREEDOTS for Mac's framework OpenGL implementation.
Ben Abbott <bpabbott@mac.com>
parents:
8676
diff
changeset
|
1352 |
17197
fbee0d312af5
acinclude.m4: Remove some unnecessary double quotes around variables.
Rik <rik@octave.org>
parents:
17196
diff
changeset
|
1353 if test $have_opengl_incs = yes; then |
18866 | 1354 AC_CHECK_HEADERS([GL/glext.h OpenGL/glext.h], [], [], [ |
21724
aba2e6293dd8
use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents:
21604
diff
changeset
|
1355 #if defined (HAVE_WINDOWS_H) |
18866 | 1356 # include <windows.h> |
1357 #endif | |
1358 #if defined (HAVE_GL_GL_H) | |
1359 # include <GL/gl.h> | |
1360 #elif defined (HAVE_OPENGL_GL_H) | |
1361 # include <OpenGL/gl.h> | |
1362 #endif | |
1363 ]) | |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1364 case $canonical_host_type in |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1365 *-*-mingw32* | *-*-msdosmsvc) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1366 save_LIBS="$LIBS" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1367 LIBS="$LIBS -lopengl32" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1368 AC_MSG_CHECKING([for glEnable in -lopengl32]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1369 AC_LINK_IFELSE([AC_LANG_PROGRAM([[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1370 #if HAVE_WINDOWS_H |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1371 # include <windows.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1372 #endif |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1373 #if defined (HAVE_GL_GL_H) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1374 # include <GL/gl.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1375 #elif defined (HAVE_OPENGL_GL_H) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1376 # include <OpenGL/gl.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1377 #endif |
17034
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
1378 ]], [[ |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1379 glEnable(GL_SMOOTH); |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1380 ]])], [OPENGL_LIBS="-lopengl32 -lglu32"]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1381 |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1382 LIBS="$save_LIBS" |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1383 if test -n "$OPENGL_LIBS"; then |
15319
daf74ce2afdc
m4/acinclude.m4: Use more consistent m4 quoting of arguments to macros.
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
1384 AC_MSG_RESULT([yes]) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1385 else |
15319
daf74ce2afdc
m4/acinclude.m4: Use more consistent m4 quoting of arguments to macros.
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
1386 AC_MSG_RESULT([no]) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1387 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1388 ;; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1389 *) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1390 ## Non-Mac, Non-Windows systems use this check |
15319
daf74ce2afdc
m4/acinclude.m4: Use more consistent m4 quoting of arguments to macros.
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
1391 AC_CHECK_LIB([GL], [glEnable], [OPENGL_LIBS="-lGL -lGLU"]) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1392 ;; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1393 esac |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1394 fi |
8724
a50228129dba
Introduce new macro OCTAVE_GLUTESSCALLBACK_THREEDOTS. Use definitions HAVE_FRAMEWORK_OPENGL and HAVE_GLUTESSCALLBACK_THREEDOTS for Mac's framework OpenGL implementation.
Ben Abbott <bpabbott@mac.com>
parents:
8676
diff
changeset
|
1395 fi |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1396 AC_SUBST(OPENGL_LIBS) |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1397 if test -n "$OPENGL_LIBS"; then |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1398 AC_DEFINE(HAVE_OPENGL, 1, [Define to 1 if OpenGL is available.]) |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1399 fi |
7825
13871b7de124
Import sources for OpenGL-based renderer.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7361
diff
changeset
|
1400 ]) |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1401 dnl |
27543
d7b18d44ae4e
Check if PCRE was compiled with --enable-utf (bug #35910).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27450
diff
changeset
|
1402 dnl Check whether PCRE is compiled with --enable-utf. |
d7b18d44ae4e
Check if PCRE was compiled with --enable-utf (bug #35910).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27450
diff
changeset
|
1403 dnl |
d7b18d44ae4e
Check if PCRE was compiled with --enable-utf (bug #35910).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27450
diff
changeset
|
1404 AC_DEFUN([OCTAVE_CHECK_LIB_PCRE_OK], [ |
d7b18d44ae4e
Check if PCRE was compiled with --enable-utf (bug #35910).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27450
diff
changeset
|
1405 AC_CACHE_CHECK([whether PCRE library was compiled with UTF support], |
d7b18d44ae4e
Check if PCRE was compiled with --enable-utf (bug #35910).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27450
diff
changeset
|
1406 [octave_cv_lib_pcre_ok], |
d7b18d44ae4e
Check if PCRE was compiled with --enable-utf (bug #35910).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27450
diff
changeset
|
1407 [AC_LANG_PUSH(C++) |
d7b18d44ae4e
Check if PCRE was compiled with --enable-utf (bug #35910).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27450
diff
changeset
|
1408 AC_RUN_IFELSE([AC_LANG_PROGRAM([[ |
d7b18d44ae4e
Check if PCRE was compiled with --enable-utf (bug #35910).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27450
diff
changeset
|
1409 #include <stdio.h> |
d7b18d44ae4e
Check if PCRE was compiled with --enable-utf (bug #35910).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27450
diff
changeset
|
1410 #if defined (HAVE_PCRE_H) |
d7b18d44ae4e
Check if PCRE was compiled with --enable-utf (bug #35910).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27450
diff
changeset
|
1411 # include <pcre.h> |
d7b18d44ae4e
Check if PCRE was compiled with --enable-utf (bug #35910).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27450
diff
changeset
|
1412 #elif defined (HAVE_PCRE_PCRE_H) |
d7b18d44ae4e
Check if PCRE was compiled with --enable-utf (bug #35910).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27450
diff
changeset
|
1413 # include <pcre/pcre.h> |
d7b18d44ae4e
Check if PCRE was compiled with --enable-utf (bug #35910).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27450
diff
changeset
|
1414 #endif |
d7b18d44ae4e
Check if PCRE was compiled with --enable-utf (bug #35910).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27450
diff
changeset
|
1415 ]], [[ |
d7b18d44ae4e
Check if PCRE was compiled with --enable-utf (bug #35910).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27450
diff
changeset
|
1416 const char *pattern = "test"; |
d7b18d44ae4e
Check if PCRE was compiled with --enable-utf (bug #35910).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27450
diff
changeset
|
1417 const char *err; |
d7b18d44ae4e
Check if PCRE was compiled with --enable-utf (bug #35910).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27450
diff
changeset
|
1418 int erroffset; |
d7b18d44ae4e
Check if PCRE was compiled with --enable-utf (bug #35910).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27450
diff
changeset
|
1419 pcre *data = pcre_compile (pattern, PCRE_UTF8, &err, &erroffset, nullptr); |
d7b18d44ae4e
Check if PCRE was compiled with --enable-utf (bug #35910).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27450
diff
changeset
|
1420 return (! data); |
d7b18d44ae4e
Check if PCRE was compiled with --enable-utf (bug #35910).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27450
diff
changeset
|
1421 ]])], |
d7b18d44ae4e
Check if PCRE was compiled with --enable-utf (bug #35910).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27450
diff
changeset
|
1422 octave_cv_lib_pcre_ok=yes, |
d7b18d44ae4e
Check if PCRE was compiled with --enable-utf (bug #35910).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27450
diff
changeset
|
1423 octave_cv_lib_pcre_ok=no, |
d7b18d44ae4e
Check if PCRE was compiled with --enable-utf (bug #35910).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27450
diff
changeset
|
1424 octave_cv_lib_pcre_ok=yes) |
d7b18d44ae4e
Check if PCRE was compiled with --enable-utf (bug #35910).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27450
diff
changeset
|
1425 AC_LANG_POP(C++) |
d7b18d44ae4e
Check if PCRE was compiled with --enable-utf (bug #35910).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27450
diff
changeset
|
1426 ]) |
d7b18d44ae4e
Check if PCRE was compiled with --enable-utf (bug #35910).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27450
diff
changeset
|
1427 if test $octave_cv_lib_pcre_ok = yes; then |
d7b18d44ae4e
Check if PCRE was compiled with --enable-utf (bug #35910).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27450
diff
changeset
|
1428 $1 |
d7b18d44ae4e
Check if PCRE was compiled with --enable-utf (bug #35910).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27450
diff
changeset
|
1429 : |
d7b18d44ae4e
Check if PCRE was compiled with --enable-utf (bug #35910).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27450
diff
changeset
|
1430 else |
d7b18d44ae4e
Check if PCRE was compiled with --enable-utf (bug #35910).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27450
diff
changeset
|
1431 $2 |
d7b18d44ae4e
Check if PCRE was compiled with --enable-utf (bug #35910).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27450
diff
changeset
|
1432 : |
d7b18d44ae4e
Check if PCRE was compiled with --enable-utf (bug #35910).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27450
diff
changeset
|
1433 fi |
d7b18d44ae4e
Check if PCRE was compiled with --enable-utf (bug #35910).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27450
diff
changeset
|
1434 ]) |
d7b18d44ae4e
Check if PCRE was compiled with --enable-utf (bug #35910).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27450
diff
changeset
|
1435 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1436 dnl Check whether Qhull works (does not crash). |
8724
a50228129dba
Introduce new macro OCTAVE_GLUTESSCALLBACK_THREEDOTS. Use definitions HAVE_FRAMEWORK_OPENGL and HAVE_GLUTESSCALLBACK_THREEDOTS for Mac's framework OpenGL implementation.
Ben Abbott <bpabbott@mac.com>
parents:
8676
diff
changeset
|
1437 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1438 AC_DEFUN([OCTAVE_CHECK_LIB_QHULL_OK], [ |
29629
93c8df989ea0
qhull: Use reentrant libqhull_r (bug #60016).
Stefan Brüns <stefan.bruens@rwth-aachen.de>
parents:
29588
diff
changeset
|
1439 AC_CACHE_CHECK([whether the qhull_r library works], |
93c8df989ea0
qhull: Use reentrant libqhull_r (bug #60016).
Stefan Brüns <stefan.bruens@rwth-aachen.de>
parents:
29588
diff
changeset
|
1440 [octave_cv_lib_qhull_r_ok], |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1441 [AC_RUN_IFELSE([AC_LANG_PROGRAM([[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1442 #include <stdio.h> |
29629
93c8df989ea0
qhull: Use reentrant libqhull_r (bug #60016).
Stefan Brüns <stefan.bruens@rwth-aachen.de>
parents:
29588
diff
changeset
|
1443 #if defined (HAVE_LIBQHULL_R_LIBQHULL_R_H) |
93c8df989ea0
qhull: Use reentrant libqhull_r (bug #60016).
Stefan Brüns <stefan.bruens@rwth-aachen.de>
parents:
29588
diff
changeset
|
1444 # include <libqhull_r/libqhull_r.h> |
93c8df989ea0
qhull: Use reentrant libqhull_r (bug #60016).
Stefan Brüns <stefan.bruens@rwth-aachen.de>
parents:
29588
diff
changeset
|
1445 # include <libqhull_r/qset_r.h> |
93c8df989ea0
qhull: Use reentrant libqhull_r (bug #60016).
Stefan Brüns <stefan.bruens@rwth-aachen.de>
parents:
29588
diff
changeset
|
1446 # include <libqhull_r/geom_r.h> |
93c8df989ea0
qhull: Use reentrant libqhull_r (bug #60016).
Stefan Brüns <stefan.bruens@rwth-aachen.de>
parents:
29588
diff
changeset
|
1447 # include <libqhull_r/poly_r.h> |
93c8df989ea0
qhull: Use reentrant libqhull_r (bug #60016).
Stefan Brüns <stefan.bruens@rwth-aachen.de>
parents:
29588
diff
changeset
|
1448 # include <libqhull_r/io_r.h> |
93c8df989ea0
qhull: Use reentrant libqhull_r (bug #60016).
Stefan Brüns <stefan.bruens@rwth-aachen.de>
parents:
29588
diff
changeset
|
1449 #elif defined (HAVE_LIBQHULL_R_H) |
93c8df989ea0
qhull: Use reentrant libqhull_r (bug #60016).
Stefan Brüns <stefan.bruens@rwth-aachen.de>
parents:
29588
diff
changeset
|
1450 # include <libqhull_r.h> |
93c8df989ea0
qhull: Use reentrant libqhull_r (bug #60016).
Stefan Brüns <stefan.bruens@rwth-aachen.de>
parents:
29588
diff
changeset
|
1451 # include <qset_r.h> |
93c8df989ea0
qhull: Use reentrant libqhull_r (bug #60016).
Stefan Brüns <stefan.bruens@rwth-aachen.de>
parents:
29588
diff
changeset
|
1452 # include <geom_r.h> |
93c8df989ea0
qhull: Use reentrant libqhull_r (bug #60016).
Stefan Brüns <stefan.bruens@rwth-aachen.de>
parents:
29588
diff
changeset
|
1453 # include <poly_r.h> |
93c8df989ea0
qhull: Use reentrant libqhull_r (bug #60016).
Stefan Brüns <stefan.bruens@rwth-aachen.de>
parents:
29588
diff
changeset
|
1454 # include <io_r.h> |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1455 #endif |
29629
93c8df989ea0
qhull: Use reentrant libqhull_r (bug #60016).
Stefan Brüns <stefan.bruens@rwth-aachen.de>
parents:
29588
diff
changeset
|
1456 #if defined (NEED_QHULL_R_VERSION) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1457 char *qh_version = "version"; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1458 #endif |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1459 ]], [[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1460 int dim = 2; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1461 int n = 4; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1462 coordT points[8] = { -0.5, -0.5, -0.5, 0.5, 0.5, -0.5, 0.5, 0.5 }; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1463 boolT ismalloc = 0; |
29632
162abe58aaef
build: Initialize QHull context structure in configure test (bug #60016).
Markus Mützel <markus.muetzel@gmx.de>
parents:
29629
diff
changeset
|
1464 qhT context = { }; |
29629
93c8df989ea0
qhull: Use reentrant libqhull_r (bug #60016).
Stefan Brüns <stefan.bruens@rwth-aachen.de>
parents:
29588
diff
changeset
|
1465 qhT* qh = &context; |
93c8df989ea0
qhull: Use reentrant libqhull_r (bug #60016).
Stefan Brüns <stefan.bruens@rwth-aachen.de>
parents:
29588
diff
changeset
|
1466 return qh_new_qhull (qh, dim, n, points, ismalloc, "qhull ", 0, stderr); |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1467 ]])], |
29629
93c8df989ea0
qhull: Use reentrant libqhull_r (bug #60016).
Stefan Brüns <stefan.bruens@rwth-aachen.de>
parents:
29588
diff
changeset
|
1468 octave_cv_lib_qhull_r_ok=yes, |
93c8df989ea0
qhull: Use reentrant libqhull_r (bug #60016).
Stefan Brüns <stefan.bruens@rwth-aachen.de>
parents:
29588
diff
changeset
|
1469 octave_cv_lib_qhull_r_ok=no, |
93c8df989ea0
qhull: Use reentrant libqhull_r (bug #60016).
Stefan Brüns <stefan.bruens@rwth-aachen.de>
parents:
29588
diff
changeset
|
1470 octave_cv_lib_qhull_r_ok=yes) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1471 ]) |
29629
93c8df989ea0
qhull: Use reentrant libqhull_r (bug #60016).
Stefan Brüns <stefan.bruens@rwth-aachen.de>
parents:
29588
diff
changeset
|
1472 if test $octave_cv_lib_qhull_r_ok = yes; then |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1473 $1 |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
1474 : |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1475 else |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1476 $2 |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
1477 : |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1478 fi |
8724
a50228129dba
Introduce new macro OCTAVE_GLUTESSCALLBACK_THREEDOTS. Use definitions HAVE_FRAMEWORK_OPENGL and HAVE_GLUTESSCALLBACK_THREEDOTS for Mac's framework OpenGL implementation.
Ben Abbott <bpabbott@mac.com>
parents:
8676
diff
changeset
|
1479 ]) |
20715
5b7643257978
Remove trailing whitespace at end of lines.
Rik <rik@octave.org>
parents:
20420
diff
changeset
|
1480 dnl |
20153
3b3579ad7e46
Check for a modern version of sndfile in configure scripts (bug #44976).
Rik <rik@octave.org>
parents:
19816
diff
changeset
|
1481 dnl Check whether sndfile library is modern enough to include things like Ogg |
3b3579ad7e46
Check for a modern version of sndfile in configure scripts (bug #44976).
Rik <rik@octave.org>
parents:
19816
diff
changeset
|
1482 dnl |
3b3579ad7e46
Check for a modern version of sndfile in configure scripts (bug #44976).
Rik <rik@octave.org>
parents:
19816
diff
changeset
|
1483 AC_DEFUN([OCTAVE_CHECK_LIB_SNDFILE_OK], [ |
3b3579ad7e46
Check for a modern version of sndfile in configure scripts (bug #44976).
Rik <rik@octave.org>
parents:
19816
diff
changeset
|
1484 AC_CACHE_CHECK([whether sndfile library is modern enough], |
3b3579ad7e46
Check for a modern version of sndfile in configure scripts (bug #44976).
Rik <rik@octave.org>
parents:
19816
diff
changeset
|
1485 [octave_cv_lib_sndfile_ok], |
3b3579ad7e46
Check for a modern version of sndfile in configure scripts (bug #44976).
Rik <rik@octave.org>
parents:
19816
diff
changeset
|
1486 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
3b3579ad7e46
Check for a modern version of sndfile in configure scripts (bug #44976).
Rik <rik@octave.org>
parents:
19816
diff
changeset
|
1487 #include <sndfile.h> |
3b3579ad7e46
Check for a modern version of sndfile in configure scripts (bug #44976).
Rik <rik@octave.org>
parents:
19816
diff
changeset
|
1488 ]], [[ |
3b3579ad7e46
Check for a modern version of sndfile in configure scripts (bug #44976).
Rik <rik@octave.org>
parents:
19816
diff
changeset
|
1489 int x = SF_FORMAT_OGG; |
3b3579ad7e46
Check for a modern version of sndfile in configure scripts (bug #44976).
Rik <rik@octave.org>
parents:
19816
diff
changeset
|
1490 ]])], |
3b3579ad7e46
Check for a modern version of sndfile in configure scripts (bug #44976).
Rik <rik@octave.org>
parents:
19816
diff
changeset
|
1491 octave_cv_lib_sndfile_ok=yes, |
3b3579ad7e46
Check for a modern version of sndfile in configure scripts (bug #44976).
Rik <rik@octave.org>
parents:
19816
diff
changeset
|
1492 octave_cv_lib_sndfile_ok=no) |
3b3579ad7e46
Check for a modern version of sndfile in configure scripts (bug #44976).
Rik <rik@octave.org>
parents:
19816
diff
changeset
|
1493 ]) |
3b3579ad7e46
Check for a modern version of sndfile in configure scripts (bug #44976).
Rik <rik@octave.org>
parents:
19816
diff
changeset
|
1494 if test $octave_cv_lib_sndfile_ok = yes; then |
3b3579ad7e46
Check for a modern version of sndfile in configure scripts (bug #44976).
Rik <rik@octave.org>
parents:
19816
diff
changeset
|
1495 $1 |
3b3579ad7e46
Check for a modern version of sndfile in configure scripts (bug #44976).
Rik <rik@octave.org>
parents:
19816
diff
changeset
|
1496 : |
3b3579ad7e46
Check for a modern version of sndfile in configure scripts (bug #44976).
Rik <rik@octave.org>
parents:
19816
diff
changeset
|
1497 else |
3b3579ad7e46
Check for a modern version of sndfile in configure scripts (bug #44976).
Rik <rik@octave.org>
parents:
19816
diff
changeset
|
1498 $2 |
3b3579ad7e46
Check for a modern version of sndfile in configure scripts (bug #44976).
Rik <rik@octave.org>
parents:
19816
diff
changeset
|
1499 : |
3b3579ad7e46
Check for a modern version of sndfile in configure scripts (bug #44976).
Rik <rik@octave.org>
parents:
19816
diff
changeset
|
1500 fi |
3b3579ad7e46
Check for a modern version of sndfile in configure scripts (bug #44976).
Rik <rik@octave.org>
parents:
19816
diff
changeset
|
1501 ]) |
8724
a50228129dba
Introduce new macro OCTAVE_GLUTESSCALLBACK_THREEDOTS. Use definitions HAVE_FRAMEWORK_OPENGL and HAVE_GLUTESSCALLBACK_THREEDOTS for Mac's framework OpenGL implementation.
Ben Abbott <bpabbott@mac.com>
parents:
8676
diff
changeset
|
1502 dnl |
15302
a8cfbc1911e4
build: Set TERM_LIBS before checking for READLINE.
Rik <rik@octave.org>
parents:
15295
diff
changeset
|
1503 dnl Find a suitable termlib to use. |
a8cfbc1911e4
build: Set TERM_LIBS before checking for READLINE.
Rik <rik@octave.org>
parents:
15295
diff
changeset
|
1504 dnl |
a8cfbc1911e4
build: Set TERM_LIBS before checking for READLINE.
Rik <rik@octave.org>
parents:
15295
diff
changeset
|
1505 AC_DEFUN([OCTAVE_CHECK_LIB_TERMLIB], [ |
a8cfbc1911e4
build: Set TERM_LIBS before checking for READLINE.
Rik <rik@octave.org>
parents:
15295
diff
changeset
|
1506 TERM_LIBS= |
15338
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15336
diff
changeset
|
1507 ac_octave_save_LIBS="$LIBS" |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15336
diff
changeset
|
1508 AC_SEARCH_LIBS([tputs], |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15336
diff
changeset
|
1509 [ncurses curses termcap terminfo termlib], |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15336
diff
changeset
|
1510 [], []) |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15336
diff
changeset
|
1511 LIBS="$ac_octave_save_LIBS" |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15336
diff
changeset
|
1512 case "$ac_cv_search_tputs" in |
17034
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
1513 -l*) |
15338
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15336
diff
changeset
|
1514 TERM_LIBS="$ac_cv_search_tputs" |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15336
diff
changeset
|
1515 ;; |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15336
diff
changeset
|
1516 no) |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15336
diff
changeset
|
1517 warn_termlibs="I couldn't find -ltermcap, -lterminfo, -lncurses, -lcurses, or -ltermlib!" |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15336
diff
changeset
|
1518 AC_MSG_WARN([$warn_termlibs]) |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15336
diff
changeset
|
1519 ;; |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15336
diff
changeset
|
1520 esac |
15302
a8cfbc1911e4
build: Set TERM_LIBS before checking for READLINE.
Rik <rik@octave.org>
parents:
15295
diff
changeset
|
1521 |
15338
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15336
diff
changeset
|
1522 dnl Old code (9/9/2012). Delete when new code is definitely proven. |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15336
diff
changeset
|
1523 dnl |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15336
diff
changeset
|
1524 dnl for _termlib in ncurses curses termcap terminfo termlib; do |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15336
diff
changeset
|
1525 dnl AC_CHECK_LIB([${_termlib}], [tputs], [ |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15336
diff
changeset
|
1526 dnl TERM_LIBS="-l${termlib}" |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15336
diff
changeset
|
1527 dnl octave_cv_lib_found_termlib=yes |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15336
diff
changeset
|
1528 dnl break]) |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15336
diff
changeset
|
1529 dnl done |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15336
diff
changeset
|
1530 |
15302
a8cfbc1911e4
build: Set TERM_LIBS before checking for READLINE.
Rik <rik@octave.org>
parents:
15295
diff
changeset
|
1531 AC_SUBST(TERM_LIBS) |
7825
13871b7de124
Import sources for OpenGL-based renderer.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7361
diff
changeset
|
1532 ]) |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1533 dnl |
29367
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1534 dnl Check whether new API is used with QHelpIndexWidget. |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1535 dnl Under new API, QHelpIndexWidget emits documentActivates. |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1536 dnl Under old API, QHelpIndexWidget emits linkActivated. |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1537 dnl New structure/signal API was introduced in Qt 5.15. |
23510
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1538 dnl |
29367
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1539 dnl FIXME: Delete this entirely when we drop support for Qt 5.14 or older. |
24093
7d9ba57201b4
configure: improve Qt feature tests for functionality and consistency
Mike Miller <mtmiller@octave.org>
parents:
24077
diff
changeset
|
1540 dnl |
29367
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1541 AC_DEFUN([OCTAVE_CHECK_NEW_QHELPINDEXWIDGET_API], [ |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1542 AC_CACHE_CHECK([for new QHelpIndexWidget API], |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1543 [octave_cv_new_qhelpindexwidget_api], |
23510
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1544 [AC_LANG_PUSH(C++) |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1545 ac_octave_save_CPPFLAGS="$CPPFLAGS" |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1546 ac_octave_save_CXXFLAGS="$CXXFLAGS" |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1547 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" |
29367
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1548 CXXFLAGS="$CXXPICFLAG $CPPFLAGS" |
23510
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1549 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
29367
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1550 #include <QHelpLink> |
23510
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1551 ]], [[ |
29367
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1552 QHelpLink link; |
23510
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1553 ]])], |
29367
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1554 octave_cv_new_qhelpindexwidget_api=yes, |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1555 octave_cv_new_qhelpindexwidget_api=no) |
23510
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1556 CPPFLAGS="$ac_octave_save_CPPFLAGS" |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1557 CXXFLAGS="$ac_octave_save_CXXFLAGS" |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1558 AC_LANG_POP(C++) |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1559 ]) |
29367
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1560 if test $octave_cv_new_qhelpindexwidget_api = yes; then |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1561 AC_DEFINE(HAVE_NEW_QHELPINDEXWIDGET_API, 1, |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1562 [Define to 1 if using new QHelpIndexWidget API.]) |
23510
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1563 fi |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1564 ]) |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1565 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1566 dnl Check for the Qhull version. |
23510
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1567 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1568 AC_DEFUN([OCTAVE_CHECK_QHULL_VERSION], [ |
29629
93c8df989ea0
qhull: Use reentrant libqhull_r (bug #60016).
Stefan Brüns <stefan.bruens@rwth-aachen.de>
parents:
29588
diff
changeset
|
1569 AC_CACHE_CHECK([for qh_version in $QHULL_R_LIBS], |
93c8df989ea0
qhull: Use reentrant libqhull_r (bug #60016).
Stefan Brüns <stefan.bruens@rwth-aachen.de>
parents:
29588
diff
changeset
|
1570 [octave_cv_lib_qhull_r_version], |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1571 [AC_LINK_IFELSE([AC_LANG_PROGRAM([[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1572 #include <stdio.h> |
29629
93c8df989ea0
qhull: Use reentrant libqhull_r (bug #60016).
Stefan Brüns <stefan.bruens@rwth-aachen.de>
parents:
29588
diff
changeset
|
1573 #if defined (HAVE_LIBQHULL_R_LIBQHULL_R_H) |
93c8df989ea0
qhull: Use reentrant libqhull_r (bug #60016).
Stefan Brüns <stefan.bruens@rwth-aachen.de>
parents:
29588
diff
changeset
|
1574 # include <libqhull_r/libqhull_r.h> |
93c8df989ea0
qhull: Use reentrant libqhull_r (bug #60016).
Stefan Brüns <stefan.bruens@rwth-aachen.de>
parents:
29588
diff
changeset
|
1575 # include <libqhull_r/qset_r.h> |
93c8df989ea0
qhull: Use reentrant libqhull_r (bug #60016).
Stefan Brüns <stefan.bruens@rwth-aachen.de>
parents:
29588
diff
changeset
|
1576 # include <libqhull_r/geom_r.h> |
93c8df989ea0
qhull: Use reentrant libqhull_r (bug #60016).
Stefan Brüns <stefan.bruens@rwth-aachen.de>
parents:
29588
diff
changeset
|
1577 # include <libqhull_r/poly_r.h> |
93c8df989ea0
qhull: Use reentrant libqhull_r (bug #60016).
Stefan Brüns <stefan.bruens@rwth-aachen.de>
parents:
29588
diff
changeset
|
1578 # include <libqhull_r/io_r.h> |
93c8df989ea0
qhull: Use reentrant libqhull_r (bug #60016).
Stefan Brüns <stefan.bruens@rwth-aachen.de>
parents:
29588
diff
changeset
|
1579 #elif defined (HAVE_LIBQHULL_R_H) |
93c8df989ea0
qhull: Use reentrant libqhull_r (bug #60016).
Stefan Brüns <stefan.bruens@rwth-aachen.de>
parents:
29588
diff
changeset
|
1580 # include <libqhull_r.h> |
93c8df989ea0
qhull: Use reentrant libqhull_r (bug #60016).
Stefan Brüns <stefan.bruens@rwth-aachen.de>
parents:
29588
diff
changeset
|
1581 # include <qset_r.h> |
93c8df989ea0
qhull: Use reentrant libqhull_r (bug #60016).
Stefan Brüns <stefan.bruens@rwth-aachen.de>
parents:
29588
diff
changeset
|
1582 # include <geom_r.h> |
93c8df989ea0
qhull: Use reentrant libqhull_r (bug #60016).
Stefan Brüns <stefan.bruens@rwth-aachen.de>
parents:
29588
diff
changeset
|
1583 # include <poly_r.h> |
93c8df989ea0
qhull: Use reentrant libqhull_r (bug #60016).
Stefan Brüns <stefan.bruens@rwth-aachen.de>
parents:
29588
diff
changeset
|
1584 # include <io_r.h> |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1585 #endif |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1586 ]], [[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1587 const char *tmp = qh_version; |
17034
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
1588 ]])], |
29629
93c8df989ea0
qhull: Use reentrant libqhull_r (bug #60016).
Stefan Brüns <stefan.bruens@rwth-aachen.de>
parents:
29588
diff
changeset
|
1589 octave_cv_lib_qhull_r_version=yes, octave_cv_lib_qhull_r_version=no) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1590 ]) |
29629
93c8df989ea0
qhull: Use reentrant libqhull_r (bug #60016).
Stefan Brüns <stefan.bruens@rwth-aachen.de>
parents:
29588
diff
changeset
|
1591 if test $octave_cv_lib_qhull_r_version = no; then |
93c8df989ea0
qhull: Use reentrant libqhull_r (bug #60016).
Stefan Brüns <stefan.bruens@rwth-aachen.de>
parents:
29588
diff
changeset
|
1592 AC_DEFINE(NEED_QHULL_R_VERSION, 1, |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1593 [Define to 1 if the Qhull library needs a qh_version variable defined.]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1594 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1595 ]) |
24093
7d9ba57201b4
configure: improve Qt feature tests for functionality and consistency
Mike Miller <mtmiller@octave.org>
parents:
24077
diff
changeset
|
1596 dnl |
29560
5b7e721844df
provide QOverload template if it is not in <QtGlobal> (bug #60416)
John W. Eaton <jwe@octave.org>
parents:
29519
diff
changeset
|
1597 dnl Check whether Qt has the QOverload template introduced in Qt 5.7. |
5b7e721844df
provide QOverload template if it is not in <QtGlobal> (bug #60416)
John W. Eaton <jwe@octave.org>
parents:
29519
diff
changeset
|
1598 dnl |
5b7e721844df
provide QOverload template if it is not in <QtGlobal> (bug #60416)
John W. Eaton <jwe@octave.org>
parents:
29519
diff
changeset
|
1599 AC_DEFUN([OCTAVE_CHECK_QOVERLOAD_TEMPLATE], [ |
5b7e721844df
provide QOverload template if it is not in <QtGlobal> (bug #60416)
John W. Eaton <jwe@octave.org>
parents:
29519
diff
changeset
|
1600 AC_CACHE_CHECK([for QOverload template], |
5b7e721844df
provide QOverload template if it is not in <QtGlobal> (bug #60416)
John W. Eaton <jwe@octave.org>
parents:
29519
diff
changeset
|
1601 [octave_cv_qoverload_template], |
23510
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1602 [AC_LANG_PUSH(C++) |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1603 ac_octave_save_CPPFLAGS="$CPPFLAGS" |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1604 ac_octave_save_CXXFLAGS="$CXXFLAGS" |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1605 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1606 CXXFLAGS="$CXXPICFLAG $CXXFLAGS" |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1607 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
29560
5b7e721844df
provide QOverload template if it is not in <QtGlobal> (bug #60416)
John W. Eaton <jwe@octave.org>
parents:
29519
diff
changeset
|
1608 #include <QtGlobal> |
23510
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1609 ]], [[ |
29560
5b7e721844df
provide QOverload template if it is not in <QtGlobal> (bug #60416)
John W. Eaton <jwe@octave.org>
parents:
29519
diff
changeset
|
1610 struct Foo |
5b7e721844df
provide QOverload template if it is not in <QtGlobal> (bug #60416)
John W. Eaton <jwe@octave.org>
parents:
29519
diff
changeset
|
1611 { |
5b7e721844df
provide QOverload template if it is not in <QtGlobal> (bug #60416)
John W. Eaton <jwe@octave.org>
parents:
29519
diff
changeset
|
1612 void overloadedFunction (int) const; |
5b7e721844df
provide QOverload template if it is not in <QtGlobal> (bug #60416)
John W. Eaton <jwe@octave.org>
parents:
29519
diff
changeset
|
1613 void overloadedFunction (int, const QString &) const; |
5b7e721844df
provide QOverload template if it is not in <QtGlobal> (bug #60416)
John W. Eaton <jwe@octave.org>
parents:
29519
diff
changeset
|
1614 }; |
5b7e721844df
provide QOverload template if it is not in <QtGlobal> (bug #60416)
John W. Eaton <jwe@octave.org>
parents:
29519
diff
changeset
|
1615 QOverload<int>::of (&Foo::overloadedFunction); |
5b7e721844df
provide QOverload template if it is not in <QtGlobal> (bug #60416)
John W. Eaton <jwe@octave.org>
parents:
29519
diff
changeset
|
1616 QOverload<int, const QString &>::of (&Foo::overloadedFunction); |
23510
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1617 ]])], |
29560
5b7e721844df
provide QOverload template if it is not in <QtGlobal> (bug #60416)
John W. Eaton <jwe@octave.org>
parents:
29519
diff
changeset
|
1618 octave_cv_qoverload_template=yes, |
5b7e721844df
provide QOverload template if it is not in <QtGlobal> (bug #60416)
John W. Eaton <jwe@octave.org>
parents:
29519
diff
changeset
|
1619 octave_cv_qoverload_template=no) |
23510
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1620 CPPFLAGS="$ac_octave_save_CPPFLAGS" |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1621 CXXFLAGS="$ac_octave_save_CXXFLAGS" |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1622 AC_LANG_POP(C++) |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1623 ]) |
29560
5b7e721844df
provide QOverload template if it is not in <QtGlobal> (bug #60416)
John W. Eaton <jwe@octave.org>
parents:
29519
diff
changeset
|
1624 if test $octave_cv_qoverload_template = yes; then |
5b7e721844df
provide QOverload template if it is not in <QtGlobal> (bug #60416)
John W. Eaton <jwe@octave.org>
parents:
29519
diff
changeset
|
1625 AC_DEFINE(HAVE_QOVERLOAD_TEMPLATE, 1, |
5b7e721844df
provide QOverload template if it is not in <QtGlobal> (bug #60416)
John W. Eaton <jwe@octave.org>
parents:
29519
diff
changeset
|
1626 [Define to 1 if you have the `QOverload' template.]) |
23510
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1627 fi |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1628 ]) |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1629 dnl |
29367
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1630 dnl Check whether the Qt class QRegion has the iterators and related |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1631 dnl functions introduced in Qt 5.8. |
29271
0348f3f57e3c
avoid build errors with Qt4 (bug #59813)
John W. Eaton <jwe@octave.org>
parents:
29147
diff
changeset
|
1632 dnl |
29367
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1633 AC_DEFUN([OCTAVE_CHECK_QREGION_ITERATORS], [ |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1634 AC_CACHE_CHECK([for QRegion iterators and related functions], |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1635 [octave_cv_qregion_iterators], |
29271
0348f3f57e3c
avoid build errors with Qt4 (bug #59813)
John W. Eaton <jwe@octave.org>
parents:
29147
diff
changeset
|
1636 [AC_LANG_PUSH(C++) |
0348f3f57e3c
avoid build errors with Qt4 (bug #59813)
John W. Eaton <jwe@octave.org>
parents:
29147
diff
changeset
|
1637 ac_octave_save_CPPFLAGS="$CPPFLAGS" |
0348f3f57e3c
avoid build errors with Qt4 (bug #59813)
John W. Eaton <jwe@octave.org>
parents:
29147
diff
changeset
|
1638 ac_octave_save_CXXFLAGS="$CXXFLAGS" |
0348f3f57e3c
avoid build errors with Qt4 (bug #59813)
John W. Eaton <jwe@octave.org>
parents:
29147
diff
changeset
|
1639 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" |
0348f3f57e3c
avoid build errors with Qt4 (bug #59813)
John W. Eaton <jwe@octave.org>
parents:
29147
diff
changeset
|
1640 CXXFLAGS="$CXXPICFLAG $CXXFLAGS" |
0348f3f57e3c
avoid build errors with Qt4 (bug #59813)
John W. Eaton <jwe@octave.org>
parents:
29147
diff
changeset
|
1641 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
29367
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1642 #include <QRegion> |
29271
0348f3f57e3c
avoid build errors with Qt4 (bug #59813)
John W. Eaton <jwe@octave.org>
parents:
29147
diff
changeset
|
1643 ]], [[ |
29367
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1644 QRegion region; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1645 QRegion::const_iterator it; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1646 it = region.begin (); |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1647 it = region.end (); |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1648 it = region.cbegin (); |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1649 it = region.cend (); |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1650 QRegion::const_reverse_iterator rit; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1651 rit = region.rbegin (); |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1652 rit = region.rend (); |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1653 rit = region.crbegin (); |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1654 rit = region.crend (); |
29271
0348f3f57e3c
avoid build errors with Qt4 (bug #59813)
John W. Eaton <jwe@octave.org>
parents:
29147
diff
changeset
|
1655 ]])], |
29367
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1656 octave_cv_qregion_iterators=yes, |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1657 octave_cv_qregion_iterators=no) |
29271
0348f3f57e3c
avoid build errors with Qt4 (bug #59813)
John W. Eaton <jwe@octave.org>
parents:
29147
diff
changeset
|
1658 CPPFLAGS="$ac_octave_save_CPPFLAGS" |
0348f3f57e3c
avoid build errors with Qt4 (bug #59813)
John W. Eaton <jwe@octave.org>
parents:
29147
diff
changeset
|
1659 CXXFLAGS="$ac_octave_save_CXXFLAGS" |
0348f3f57e3c
avoid build errors with Qt4 (bug #59813)
John W. Eaton <jwe@octave.org>
parents:
29147
diff
changeset
|
1660 AC_LANG_POP(C++) |
0348f3f57e3c
avoid build errors with Qt4 (bug #59813)
John W. Eaton <jwe@octave.org>
parents:
29147
diff
changeset
|
1661 ]) |
29367
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1662 if test $octave_cv_qregion_iterators = yes; then |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1663 AC_DEFINE(HAVE_QREGION_ITERATORS, 1, |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1664 [Define to 1 if you have the `QFontMetrics::horizontalAdvance' function.]) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1665 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1666 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1667 dnl |
22823
e2afee0041bf
new configure option, --without-qscintilla
John W. Eaton <jwe@octave.org>
parents:
22755
diff
changeset
|
1668 dnl Check whether we have QScintilla for the given Qt VERSION. |
20420
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1669 dnl |
22823
e2afee0041bf
new configure option, --without-qscintilla
John W. Eaton <jwe@octave.org>
parents:
22755
diff
changeset
|
1670 AC_DEFUN([OCTAVE_CHECK_QSCINTILLA], [ |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1671 qt_version="$1"; |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1672 use_qscintilla=no |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1673 warn_qscintilla="" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1674 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1675 ## Check for Qt libraries |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1676 case "$qt_version" in |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1677 5) |
23414
a759896c2b53
acinclude.m4: Look for "qscintilla_qt5" as another name for Qt5 scintilla library.
Rik <rik@octave.org>
parents:
23219
diff
changeset
|
1678 octave_qscintilla_libnames="qscintilla2-qt5 qscintilla2_qt5 qt5scintilla2" |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1679 ;; |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1680 *) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1681 AC_MSG_ERROR([Unrecognized Qt version $qt_version]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1682 ;; |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1683 esac |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1684 |
22823
e2afee0041bf
new configure option, --without-qscintilla
John W. Eaton <jwe@octave.org>
parents:
22755
diff
changeset
|
1685 if test $build_qt_gui = yes && test $check_qscintilla = yes; then |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1686 |
22286
f394436a4025
build: improve QScintilla detection to work with distro naming schemes (bug #48773)
Mike Miller <mtmiller@octave.org>
parents:
22257
diff
changeset
|
1687 ## Check for QScintilla library which is used in the Qt GUI editor. |
f394436a4025
build: improve QScintilla detection to work with distro naming schemes (bug #48773)
Mike Miller <mtmiller@octave.org>
parents:
22257
diff
changeset
|
1688 AC_CACHE_CHECK([for the QScintilla library for Qt $qt_version], |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1689 [octave_cv_lib_qscintilla], |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1690 [save_CPPFLAGS="$CPPFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1691 save_CXXFLAGS="$CXXFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1692 save_LDFLAGS="$LDFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1693 save_LIBS="$LIBS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1694 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1695 CXXFLAGS="$CXXPICFLAG $CXXFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1696 LDFLAGS="$QT_LDFLAGS $LDFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1697 AC_LANG_PUSH(C++) |
22286
f394436a4025
build: improve QScintilla detection to work with distro naming schemes (bug #48773)
Mike Miller <mtmiller@octave.org>
parents:
22257
diff
changeset
|
1698 for octave_qscintilla_try in $octave_qscintilla_libnames; do |
f394436a4025
build: improve QScintilla detection to work with distro naming schemes (bug #48773)
Mike Miller <mtmiller@octave.org>
parents:
22257
diff
changeset
|
1699 LIBS="$QT_LIBS -l$octave_qscintilla_try" |
f394436a4025
build: improve QScintilla detection to work with distro naming schemes (bug #48773)
Mike Miller <mtmiller@octave.org>
parents:
22257
diff
changeset
|
1700 AC_LINK_IFELSE([AC_LANG_PROGRAM([[ |
22456
8924139b4f21
fix test for qscintilla (bug #49018)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
1701 #include <Qsci/qsciapis.h> |
8924139b4f21
fix test for qscintilla (bug #49018)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
1702 #include <Qsci/qscilexercpp.h> |
22286
f394436a4025
build: improve QScintilla detection to work with distro naming schemes (bug #48773)
Mike Miller <mtmiller@octave.org>
parents:
22257
diff
changeset
|
1703 ]], [[ |
22456
8924139b4f21
fix test for qscintilla (bug #49018)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
1704 QsciLexer *lexer = new QsciLexerCPP (); |
8924139b4f21
fix test for qscintilla (bug #49018)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
1705 QsciAPIs *lexer_apis = new QsciAPIs (lexer); |
22286
f394436a4025
build: improve QScintilla detection to work with distro naming schemes (bug #48773)
Mike Miller <mtmiller@octave.org>
parents:
22257
diff
changeset
|
1706 ]])], |
f394436a4025
build: improve QScintilla detection to work with distro naming schemes (bug #48773)
Mike Miller <mtmiller@octave.org>
parents:
22257
diff
changeset
|
1707 octave_cv_lib_qscintilla="-l$octave_qscintilla_try", |
f394436a4025
build: improve QScintilla detection to work with distro naming schemes (bug #48773)
Mike Miller <mtmiller@octave.org>
parents:
22257
diff
changeset
|
1708 octave_cv_lib_qscintilla=no) |
f394436a4025
build: improve QScintilla detection to work with distro naming schemes (bug #48773)
Mike Miller <mtmiller@octave.org>
parents:
22257
diff
changeset
|
1709 if test $octave_cv_lib_qscintilla != no; then |
f394436a4025
build: improve QScintilla detection to work with distro naming schemes (bug #48773)
Mike Miller <mtmiller@octave.org>
parents:
22257
diff
changeset
|
1710 break |
f394436a4025
build: improve QScintilla detection to work with distro naming schemes (bug #48773)
Mike Miller <mtmiller@octave.org>
parents:
22257
diff
changeset
|
1711 fi |
f394436a4025
build: improve QScintilla detection to work with distro naming schemes (bug #48773)
Mike Miller <mtmiller@octave.org>
parents:
22257
diff
changeset
|
1712 done |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1713 CPPFLAGS="$save_CPPFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1714 CXXFLAGS="$save_CXXFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1715 LDFLAGS="$save_LDFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1716 LIBS="$save_LIBS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1717 AC_LANG_POP([C++]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1718 ]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1719 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1720 if test $octave_cv_lib_qscintilla = no; then |
22286
f394436a4025
build: improve QScintilla detection to work with distro naming schemes (bug #48773)
Mike Miller <mtmiller@octave.org>
parents:
22257
diff
changeset
|
1721 warn_qscintilla="QScintilla library not found; disabling built-in Qt GUI editor" |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1722 else |
22286
f394436a4025
build: improve QScintilla detection to work with distro naming schemes (bug #48773)
Mike Miller <mtmiller@octave.org>
parents:
22257
diff
changeset
|
1723 ## Let's assume QScintilla library is at the same location as |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1724 ## other regular Qt libraries. |
22286
f394436a4025
build: improve QScintilla detection to work with distro naming schemes (bug #48773)
Mike Miller <mtmiller@octave.org>
parents:
22257
diff
changeset
|
1725 QT_LIBS="$QT_LIBS $octave_cv_lib_qscintilla" |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1726 OCTAVE_CHECK_QSCINTILLA_VERSION |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1727 AC_DEFINE(HAVE_QSCINTILLA, 1, |
22250
2fd4f1a3f4a8
allow building with Qt5 (bug #40252)
John W. Eaton <jwe@octave.org>
parents:
22234
diff
changeset
|
1728 [Define to 1 if the QScintilla library and header files are available.]) |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1729 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1730 save_CPPFLAGS="$CPPFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1731 save_CXXFLAGS="$CXXFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1732 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1733 CXXFLAGS="$CXXPICFLAG $CXXFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1734 AC_LANG_PUSH(C++) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1735 AC_CHECK_HEADERS([Qsci/qscilexeroctave.h Qsci/qscilexermatlab.h]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1736 AC_LANG_POP(C++) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1737 CPPFLAGS="$save_CPPFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1738 CXXFLAGS="$save_CXXFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1739 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1740 use_qscintilla=yes |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1741 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1742 fi |
22823
e2afee0041bf
new configure option, --without-qscintilla
John W. Eaton <jwe@octave.org>
parents:
22755
diff
changeset
|
1743 ]) |
e2afee0041bf
new configure option, --without-qscintilla
John W. Eaton <jwe@octave.org>
parents:
22755
diff
changeset
|
1744 dnl |
23510
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1745 dnl Check whether QScintilla has version 2.6.0 or later |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1746 dnl FIXME: This test uses a version number. It potentially could |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1747 dnl be re-written to actually call the function, but is it worth it? |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1748 dnl |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1749 AC_DEFUN([OCTAVE_CHECK_QSCINTILLA_VERSION], [ |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1750 AC_CACHE_CHECK([whether QScintilla has version 2.6.0 or later], |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1751 [octave_cv_version_2_6_0], |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1752 [AC_LANG_PUSH(C++) |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1753 ac_octave_save_CPPFLAGS="$CPPFLAGS" |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1754 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1755 AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[ |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1756 #include <Qsci/qsciglobal.h> |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1757 ]], [[ |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1758 #if QSCINTILLA_VERSION < 0x020600 |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1759 #error Old FindFirst function found. |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1760 #endif |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1761 ]])], |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1762 octave_cv_version_2_6_0=yes, |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1763 octave_cv_version_2_6_0=no) |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1764 CPPFLAGS="$ac_octave_save_CPPFLAGS" |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1765 AC_LANG_POP(C++) |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1766 ]) |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1767 if test $octave_cv_version_2_6_0 = yes; then |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1768 AC_DEFINE(HAVE_QSCI_VERSION_2_6_0, 1, |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1769 [Define to 1 if QScintilla is of Version 2.6.0 or later.]) |
b0e23bfa9966
maint: sort Octave m4 macro definitions
Mike Miller <mtmiller@octave.org>
parents:
23509
diff
changeset
|
1770 fi |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1771 ]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1772 dnl |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1773 dnl OCTAVE_CHECK_QT |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1774 dnl |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1775 AC_DEFUN([OCTAVE_CHECK_QT], [ |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1776 octave_qt_versions="$1" |
22257
945e7f9c11ff
build: fix configure --without-qt or --with-qt
Mike Miller <mtmiller@octave.org>
parents:
22255
diff
changeset
|
1777 |
945e7f9c11ff
build: fix configure --without-qt or --with-qt
Mike Miller <mtmiller@octave.org>
parents:
22255
diff
changeset
|
1778 build_qt_gui=no |
945e7f9c11ff
build: fix configure --without-qt or --with-qt
Mike Miller <mtmiller@octave.org>
parents:
22255
diff
changeset
|
1779 build_qt_graphics=no |
945e7f9c11ff
build: fix configure --without-qt or --with-qt
Mike Miller <mtmiller@octave.org>
parents:
22255
diff
changeset
|
1780 use_qscintilla=no |
945e7f9c11ff
build: fix configure --without-qt or --with-qt
Mike Miller <mtmiller@octave.org>
parents:
22255
diff
changeset
|
1781 win32_terminal=no |
945e7f9c11ff
build: fix configure --without-qt or --with-qt
Mike Miller <mtmiller@octave.org>
parents:
22255
diff
changeset
|
1782 |
22255
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1783 for ver in $octave_qt_versions; do |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1784 OCTAVE_CHECK_QT_VERSION([$ver]) |
22250
2fd4f1a3f4a8
allow building with Qt5 (bug #40252)
John W. Eaton <jwe@octave.org>
parents:
22234
diff
changeset
|
1785 if test $build_qt_gui = yes; then |
22255
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1786 have_qt_version=$ver |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1787 break |
25134
5fccb7373bc4
allow configure to continue if some Qt tools are found (bug #53571)
John W. Eaton <jwe@octave.org>
parents:
25119
diff
changeset
|
1788 elif test -n "$QT_MODULES_AVAILABLE"; then |
25114
f191e1a26095
if a Qt version appears partially installed, don't check another version
John W. Eaton <jwe@octave.org>
parents:
25098
diff
changeset
|
1789 ## If some modules were found for $ver, then warn about possible |
f191e1a26095
if a Qt version appears partially installed, don't check another version
John W. Eaton <jwe@octave.org>
parents:
25098
diff
changeset
|
1790 ## incomplete or broken Qt installation instead of checking for |
25134
5fccb7373bc4
allow configure to continue if some Qt tools are found (bug #53571)
John W. Eaton <jwe@octave.org>
parents:
25119
diff
changeset
|
1791 ## next version in the list. Don't attempt a similar check for |
27956
2310164737b3
fix many spelling errors (bug #57613)
John W. Eaton <jwe@octave.org>
parents:
26889
diff
changeset
|
1792 ## tools here because Qt4 and Qt5 tools may be installed with |
25134
5fccb7373bc4
allow configure to continue if some Qt tools are found (bug #53571)
John W. Eaton <jwe@octave.org>
parents:
25119
diff
changeset
|
1793 ## the same name so determining whether there is a mix of versions |
5fccb7373bc4
allow configure to continue if some Qt tools are found (bug #53571)
John W. Eaton <jwe@octave.org>
parents:
25119
diff
changeset
|
1794 ## will require more work than just looking which tools are installed. |
25114
f191e1a26095
if a Qt version appears partially installed, don't check another version
John W. Eaton <jwe@octave.org>
parents:
25098
diff
changeset
|
1795 warn_qt_modules="Your installation of Qt version $ver appears incomplete or broken in some way. Fix that or use --with-qt=VER to use another version." |
f191e1a26095
if a Qt version appears partially installed, don't check another version
John W. Eaton <jwe@octave.org>
parents:
25098
diff
changeset
|
1796 break |
22255
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1797 fi |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1798 done |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1799 |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1800 if test $build_qt_gui = yes; then |
25097
cc21f66ecb1c
display more info in configure summary about Qt version and missing features
John W. Eaton <jwe@octave.org>
parents:
25061
diff
changeset
|
1801 BUILD_QT_SUMMARY_MSG="yes (version: $have_qt_version)" |
22255
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1802 if test x"$have_qt_version" = x5; then |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
1803 AC_DEFINE(HAVE_QT5, 1, [Define to 1 if using Qt version 5.]) |
22255
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1804 fi |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1805 else |
25119
14b9e2a1f3e1
if some Qt tools are instaslled, don't check for another version
John W. Eaton <jwe@octave.org>
parents:
25114
diff
changeset
|
1806 if test -n "$QT_MODULES_MISSING" || test -n "$QT_TOOLS_MISSING"; then |
14b9e2a1f3e1
if some Qt tools are instaslled, don't check for another version
John W. Eaton <jwe@octave.org>
parents:
25114
diff
changeset
|
1807 qt_missing=`echo $QT_MODULES_MISSING$QT_TOOLS_MISSING | sed 's/ *$//'` |
14b9e2a1f3e1
if some Qt tools are instaslled, don't check for another version
John W. Eaton <jwe@octave.org>
parents:
25114
diff
changeset
|
1808 BUILD_QT_SUMMARY_MSG="no (missing:$qt_missing)" |
25097
cc21f66ecb1c
display more info in configure summary about Qt version and missing features
John W. Eaton <jwe@octave.org>
parents:
25061
diff
changeset
|
1809 else |
cc21f66ecb1c
display more info in configure summary about Qt version and missing features
John W. Eaton <jwe@octave.org>
parents:
25061
diff
changeset
|
1810 BUILD_QT_SUMMARY_MSG="no" |
cc21f66ecb1c
display more info in configure summary about Qt version and missing features
John W. Eaton <jwe@octave.org>
parents:
25061
diff
changeset
|
1811 fi |
25114
f191e1a26095
if a Qt version appears partially installed, don't check another version
John W. Eaton <jwe@octave.org>
parents:
25098
diff
changeset
|
1812 if test -n "$warn_qt_modules"; then |
f191e1a26095
if a Qt version appears partially installed, don't check another version
John W. Eaton <jwe@octave.org>
parents:
25098
diff
changeset
|
1813 OCTAVE_CONFIGURE_WARNING([warn_qt_modules]) |
f191e1a26095
if a Qt version appears partially installed, don't check another version
John W. Eaton <jwe@octave.org>
parents:
25098
diff
changeset
|
1814 fi |
22255
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1815 if test -n "$warn_qt_libraries"; then |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1816 OCTAVE_CONFIGURE_WARNING([warn_qt_libraries]) |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1817 fi |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1818 if test -n "$warn_qt_version"; then |
27839
a8c5255c34b1
Announce deprecation of Qt4 and removal in Octave version 7.
Rik <rik@octave.org>
parents:
27543
diff
changeset
|
1819 OCTAVE_CONFIGURE_WARNING([warn_qt_version]) |
22255
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1820 fi |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1821 if test -n "$warn_qt_tools"; then |
27839
a8c5255c34b1
Announce deprecation of Qt4 and removal in Octave version 7.
Rik <rik@octave.org>
parents:
27543
diff
changeset
|
1822 OCTAVE_CONFIGURE_WARNING([warn_qt_tools]) |
22255
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1823 fi |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1824 if test -n "$warn_qt_setvbuf"; then |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1825 OCTAVE_CONFIGURE_WARNING([warn_qt_setvbuf]) |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1826 fi |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1827 if test -n "$warn_qt_lib_fcns"; then |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1828 OCTAVE_CONFIGURE_WARNING([warn_qt_lib_fcns]) |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1829 fi |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1830 if test -n "$warn_qt_abstract_item_model"; then |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1831 OCTAVE_CONFIGURE_WARNING([warn_qt_abstract_item_model]) |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1832 fi |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1833 if test -n "$warn_qt_opengl"; then |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1834 OCTAVE_CONFIGURE_WARNING([warn_qt_opengl]) |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1835 fi |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1836 if test -n "$warn_qscintilla"; then |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1837 OCTAVE_CONFIGURE_WARNING([warn_qscintilla]) |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1838 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1839 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1840 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1841 AM_CONDITIONAL([AMCOND_BUILD_QT_GUI], [test $build_qt_gui = yes]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1842 AM_CONDITIONAL([AMCOND_BUILD_QT_GRAPHICS], [test $build_qt_graphics = yes]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1843 AM_CONDITIONAL([AMCOND_HAVE_QSCINTILLA], [test $use_qscintilla = yes]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1844 AM_CONDITIONAL([WIN32_TERMINAL], [test $win32_terminal = yes]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1845 ]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1846 dnl |
24798
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1847 dnl Check whether QOffscreenSurface is present. |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1848 dnl |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1849 AC_DEFUN([OCTAVE_CHECK_QT_OPENGL_OFFSCREEN_OK], [ |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1850 dnl Normally the language and compiler flags would be set and restored |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1851 dnl inside of the AC_CACHE_CHECK body. Because we also need to check for |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1852 dnl Qt header files associated with the compilation test, set and restore |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1853 dnl these values outside of the AC_CACHE_CHECK for this macro only. |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1854 AC_LANG_PUSH(C++) |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1855 ac_octave_save_CPPFLAGS="$CPPFLAGS" |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1856 ac_octave_save_CXXFLAGS="$CXXFLAGS" |
26881
4af9840f9ce5
make building with Qt4 QGLWidget work again (bug #55735)
John W. Eaton <jwe@octave.org>
parents:
26672
diff
changeset
|
1857 CPPFLAGS="$QT_OPENGL_CPPFLAGS $CXXPICFLAG $CPPFLAGS" |
24798
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1858 CXXFLAGS="$CXXPICFLAG $CXXFLAGS" |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1859 AC_CHECK_HEADERS([QOffscreenSurface]) |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1860 AC_CACHE_CHECK([whether Qt supports full offscreen OpenGL rendering], |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1861 [octave_cv_qt_opengl_os_ok], |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1862 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1863 #if HAVE_WINDOWS_H |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1864 # include <windows.h> |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1865 #endif |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1866 #if defined (HAVE_GL_GL_H) |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1867 # include <GL/gl.h> |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1868 #elif defined (HAVE_OPENGL_GL_H) |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1869 # include <OpenGL/gl.h> |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1870 #endif |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1871 #if defined (HAVE_GL_GLU_H) |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1872 # include <GL/glu.h> |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1873 #elif defined HAVE_OPENGL_GLU_H || defined HAVE_FRAMEWORK_OPENGL |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1874 # include <OpenGL/glu.h> |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1875 #endif |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1876 #if defined (HAVE_QOPENGLWIDGET) |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1877 # include <QOpenGLWidget> |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1878 # include <QOpenGLContext> |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1879 #endif |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1880 #if defined (HAVE_QOFFSCREENSURFACE) |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1881 # include <QOffscreenSurface> |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1882 #endif |
25061
5fef743c34d7
build: Check for new help query member in qt 5.9 (bug #53006).
Torsten <mttl@mailbox.org>
parents:
25054
diff
changeset
|
1883 QOpenGLContext ctx; |
24798
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1884 QOffscreenSurface surf; |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1885 ]])], |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1886 octave_cv_qt_opengl_os_ok=yes, |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1887 octave_cv_qt_opengl_os_ok=no) |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1888 ]) |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1889 CPPFLAGS="$ac_octave_save_CPPFLAGS" |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1890 CXXFLAGS="$ac_octave_save_CXXFLAGS" |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1891 AC_LANG_POP(C++) |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1892 if test $octave_cv_qt_opengl_os_ok = yes; then |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1893 $1 |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1894 : |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1895 else |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1896 $2 |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1897 : |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1898 fi |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1899 ]) |
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
1900 dnl |
20420
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1901 dnl Check whether Qt works with full OpenGL support |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1902 dnl |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1903 AC_DEFUN([OCTAVE_CHECK_QT_OPENGL_OK], [ |
24144
8e034cb195f1
configure: set and restore compiler flags when testing for Qt header files
Mike Miller <mtmiller@octave.org>
parents:
24143
diff
changeset
|
1904 dnl Normally the language and compiler flags would be set and restored |
8e034cb195f1
configure: set and restore compiler flags when testing for Qt header files
Mike Miller <mtmiller@octave.org>
parents:
24143
diff
changeset
|
1905 dnl inside of the AC_CACHE_CHECK body. Because we also need to check for |
8e034cb195f1
configure: set and restore compiler flags when testing for Qt header files
Mike Miller <mtmiller@octave.org>
parents:
24143
diff
changeset
|
1906 dnl Qt header files associated with the compilation test, set and restore |
8e034cb195f1
configure: set and restore compiler flags when testing for Qt header files
Mike Miller <mtmiller@octave.org>
parents:
24143
diff
changeset
|
1907 dnl these values outside of the AC_CACHE_CHECK for this macro only. |
8e034cb195f1
configure: set and restore compiler flags when testing for Qt header files
Mike Miller <mtmiller@octave.org>
parents:
24143
diff
changeset
|
1908 AC_LANG_PUSH(C++) |
8e034cb195f1
configure: set and restore compiler flags when testing for Qt header files
Mike Miller <mtmiller@octave.org>
parents:
24143
diff
changeset
|
1909 ac_octave_save_CPPFLAGS="$CPPFLAGS" |
8e034cb195f1
configure: set and restore compiler flags when testing for Qt header files
Mike Miller <mtmiller@octave.org>
parents:
24143
diff
changeset
|
1910 ac_octave_save_CXXFLAGS="$CXXFLAGS" |
26881
4af9840f9ce5
make building with Qt4 QGLWidget work again (bug #55735)
John W. Eaton <jwe@octave.org>
parents:
26672
diff
changeset
|
1911 CPPFLAGS="$QT_OPENGL_CPPFLAGS $CXXPICFLAG $CPPFLAGS" |
24144
8e034cb195f1
configure: set and restore compiler flags when testing for Qt header files
Mike Miller <mtmiller@octave.org>
parents:
24143
diff
changeset
|
1912 CXXFLAGS="$CXXPICFLAG $CXXFLAGS" |
25862
e5a73a8c116c
use wrapper class to call OpenGL functions
John W. Eaton <jwe@octave.org>
parents:
25844
diff
changeset
|
1913 AC_CHECK_HEADERS([QOpenGLWidget QGLWidget QGLFunctions_1_1]) |
20420
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1914 AC_CACHE_CHECK([whether Qt works with OpenGL and GLU], |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1915 [octave_cv_qt_opengl_ok], |
24144
8e034cb195f1
configure: set and restore compiler flags when testing for Qt header files
Mike Miller <mtmiller@octave.org>
parents:
24143
diff
changeset
|
1916 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
20420
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1917 #if HAVE_WINDOWS_H |
24142
59cdf06c940e
use QOpenGLWidget if it is available
John W. Eaton <jwe@octave.org>
parents:
24125
diff
changeset
|
1918 # include <windows.h> |
20420
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1919 #endif |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1920 #if defined (HAVE_GL_GL_H) |
24142
59cdf06c940e
use QOpenGLWidget if it is available
John W. Eaton <jwe@octave.org>
parents:
24125
diff
changeset
|
1921 # include <GL/gl.h> |
20420
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1922 #elif defined (HAVE_OPENGL_GL_H) |
24142
59cdf06c940e
use QOpenGLWidget if it is available
John W. Eaton <jwe@octave.org>
parents:
24125
diff
changeset
|
1923 # include <OpenGL/gl.h> |
20420
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1924 #endif |
21724
aba2e6293dd8
use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents:
21604
diff
changeset
|
1925 #if defined (HAVE_GL_GLU_H) |
24142
59cdf06c940e
use QOpenGLWidget if it is available
John W. Eaton <jwe@octave.org>
parents:
24125
diff
changeset
|
1926 # include <GL/glu.h> |
20420
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1927 #elif defined HAVE_OPENGL_GLU_H || defined HAVE_FRAMEWORK_OPENGL |
24142
59cdf06c940e
use QOpenGLWidget if it is available
John W. Eaton <jwe@octave.org>
parents:
24125
diff
changeset
|
1928 # include <OpenGL/glu.h> |
20420
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1929 #endif |
24142
59cdf06c940e
use QOpenGLWidget if it is available
John W. Eaton <jwe@octave.org>
parents:
24125
diff
changeset
|
1930 #if defined (HAVE_QOPENGLWIDGET) |
59cdf06c940e
use QOpenGLWidget if it is available
John W. Eaton <jwe@octave.org>
parents:
24125
diff
changeset
|
1931 # include <QOpenGLWidget> |
59cdf06c940e
use QOpenGLWidget if it is available
John W. Eaton <jwe@octave.org>
parents:
24125
diff
changeset
|
1932 # define OCTAVE_QT_OPENGL_WIDGET QOpenGLWidget |
59cdf06c940e
use QOpenGLWidget if it is available
John W. Eaton <jwe@octave.org>
parents:
24125
diff
changeset
|
1933 #elif defined (HAVE_QGLWIDGET) |
59cdf06c940e
use QOpenGLWidget if it is available
John W. Eaton <jwe@octave.org>
parents:
24125
diff
changeset
|
1934 # include <QGLWidget> |
59cdf06c940e
use QOpenGLWidget if it is available
John W. Eaton <jwe@octave.org>
parents:
24125
diff
changeset
|
1935 # define OCTAVE_QT_OPENGL_WIDGET QGLWidget |
59cdf06c940e
use QOpenGLWidget if it is available
John W. Eaton <jwe@octave.org>
parents:
24125
diff
changeset
|
1936 #endif |
59cdf06c940e
use QOpenGLWidget if it is available
John W. Eaton <jwe@octave.org>
parents:
24125
diff
changeset
|
1937 class gl_widget : public OCTAVE_QT_OPENGL_WIDGET |
20420
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1938 { |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1939 public: |
24142
59cdf06c940e
use QOpenGLWidget if it is available
John W. Eaton <jwe@octave.org>
parents:
24125
diff
changeset
|
1940 gl_widget (QWidget *parent = 0) |
59cdf06c940e
use QOpenGLWidget if it is available
John W. Eaton <jwe@octave.org>
parents:
24125
diff
changeset
|
1941 : OCTAVE_QT_OPENGL_WIDGET (parent) { } |
20420
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1942 ~gl_widget () {} |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1943 }; |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1944 ]], [[ |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1945 gl_widget widget; |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1946 ]])], |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1947 octave_cv_qt_opengl_ok=yes, |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1948 octave_cv_qt_opengl_ok=no) |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1949 ]) |
24144
8e034cb195f1
configure: set and restore compiler flags when testing for Qt header files
Mike Miller <mtmiller@octave.org>
parents:
24143
diff
changeset
|
1950 CPPFLAGS="$ac_octave_save_CPPFLAGS" |
8e034cb195f1
configure: set and restore compiler flags when testing for Qt header files
Mike Miller <mtmiller@octave.org>
parents:
24143
diff
changeset
|
1951 CXXFLAGS="$ac_octave_save_CXXFLAGS" |
8e034cb195f1
configure: set and restore compiler flags when testing for Qt header files
Mike Miller <mtmiller@octave.org>
parents:
24143
diff
changeset
|
1952 AC_LANG_POP(C++) |
20420
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1953 if test $octave_cv_qt_opengl_ok = yes; then |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1954 $1 |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1955 : |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1956 else |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1957 $2 |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1958 : |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1959 fi |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1960 ]) |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1961 dnl |
29367
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1962 dnl Check whether the Qt::SplitBehavior enum exists and has |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1963 dnl Qt::KeepEmptyParts and Qt::SkipEmptyParts members. This enum |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1964 dnl was introduced or modified in Qt 5.14. |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1965 dnl |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1966 AC_DEFUN([OCTAVE_CHECK_QT_SPLITBEHAVIOR_ENUM], [ |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1967 AC_CACHE_CHECK([for Qt::SplitBehavior enum], |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1968 [octave_cv_qt_splitbehavior_enum], |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1969 [AC_LANG_PUSH(C++) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1970 ac_octave_save_CPPFLAGS="$CPPFLAGS" |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1971 ac_octave_save_CXXFLAGS="$CXXFLAGS" |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1972 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1973 CXXFLAGS="$CXXPICFLAG $CXXFLAGS" |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1974 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1975 #include <Qt> |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1976 ]], [[ |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1977 Qt::SplitBehavior sb_keep = Qt::KeepEmptyParts; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1978 Qt::SplitBehavior sb_skip = Qt::SkipEmptyParts; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1979 ]])], |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1980 octave_cv_qt_splitbehavior_enum=yes, |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1981 octave_cv_qt_splitbehavior_enum=no) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1982 CPPFLAGS="$ac_octave_save_CPPFLAGS" |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1983 CXXFLAGS="$ac_octave_save_CXXFLAGS" |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1984 AC_LANG_POP(C++) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1985 ]) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1986 if test $octave_cv_qt_splitbehavior_enum = yes; then |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1987 AC_DEFINE(HAVE_QT_SPLITBEHAVIOR_ENUM, 1, |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1988 [Define to 1 if you have the `Qt::SplitBehavior' enum.]) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1989 fi |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1990 ]) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
1991 dnl |
25135
ab3904f253c5
correctly track available/missing Qt tools when qtchooser is not found
John W. Eaton <jwe@octave.org>
parents:
25134
diff
changeset
|
1992 dnl OCTAVE_CHECK_QT_TOOL(TOOL) |
ab3904f253c5
correctly track available/missing Qt tools when qtchooser is not found
John W. Eaton <jwe@octave.org>
parents:
25134
diff
changeset
|
1993 dnl |
ab3904f253c5
correctly track available/missing Qt tools when qtchooser is not found
John W. Eaton <jwe@octave.org>
parents:
25134
diff
changeset
|
1994 AC_DEFUN([OCTAVE_CHECK_QT_TOOL], [ |
ab3904f253c5
correctly track available/missing Qt tools when qtchooser is not found
John W. Eaton <jwe@octave.org>
parents:
25134
diff
changeset
|
1995 AC_CHECK_TOOLS(m4_toupper([$1])_QTVER, [$1-qt$qt_version]) |
ab3904f253c5
correctly track available/missing Qt tools when qtchooser is not found
John W. Eaton <jwe@octave.org>
parents:
25134
diff
changeset
|
1996 if test -z "$m4_toupper([$1])_QTVER"; then |
ab3904f253c5
correctly track available/missing Qt tools when qtchooser is not found
John W. Eaton <jwe@octave.org>
parents:
25134
diff
changeset
|
1997 AC_CHECK_TOOLS(m4_toupper([$1]), [$1]) |
ab3904f253c5
correctly track available/missing Qt tools when qtchooser is not found
John W. Eaton <jwe@octave.org>
parents:
25134
diff
changeset
|
1998 if test -n "$m4_toupper([$1])"; then |
ab3904f253c5
correctly track available/missing Qt tools when qtchooser is not found
John W. Eaton <jwe@octave.org>
parents:
25134
diff
changeset
|
1999 if test -n "$QTCHOOSER"; then |
29069
c6796a1c35b2
Call Qt helper programs with flags "-qt=VERSION" (bug #59474).
Rik <rik@octave.org>
parents:
29053
diff
changeset
|
2000 m4_toupper([$1])FLAGS="-qt=$qt_version" |
25135
ab3904f253c5
correctly track available/missing Qt tools when qtchooser is not found
John W. Eaton <jwe@octave.org>
parents:
25134
diff
changeset
|
2001 fi |
ab3904f253c5
correctly track available/missing Qt tools when qtchooser is not found
John W. Eaton <jwe@octave.org>
parents:
25134
diff
changeset
|
2002 QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE $1" |
ab3904f253c5
correctly track available/missing Qt tools when qtchooser is not found
John W. Eaton <jwe@octave.org>
parents:
25134
diff
changeset
|
2003 else |
ab3904f253c5
correctly track available/missing Qt tools when qtchooser is not found
John W. Eaton <jwe@octave.org>
parents:
25134
diff
changeset
|
2004 QT_TOOLS_MISSING="$QT_TOOLS_MISSING $1" |
ab3904f253c5
correctly track available/missing Qt tools when qtchooser is not found
John W. Eaton <jwe@octave.org>
parents:
25134
diff
changeset
|
2005 fi |
ab3904f253c5
correctly track available/missing Qt tools when qtchooser is not found
John W. Eaton <jwe@octave.org>
parents:
25134
diff
changeset
|
2006 else |
ab3904f253c5
correctly track available/missing Qt tools when qtchooser is not found
John W. Eaton <jwe@octave.org>
parents:
25134
diff
changeset
|
2007 m4_toupper([$1])="$m4_toupper([$1])_QTVER" |
ab3904f253c5
correctly track available/missing Qt tools when qtchooser is not found
John W. Eaton <jwe@octave.org>
parents:
25134
diff
changeset
|
2008 QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE $1" |
ab3904f253c5
correctly track available/missing Qt tools when qtchooser is not found
John W. Eaton <jwe@octave.org>
parents:
25134
diff
changeset
|
2009 fi |
ab3904f253c5
correctly track available/missing Qt tools when qtchooser is not found
John W. Eaton <jwe@octave.org>
parents:
25134
diff
changeset
|
2010 ]) |
ab3904f253c5
correctly track available/missing Qt tools when qtchooser is not found
John W. Eaton <jwe@octave.org>
parents:
25134
diff
changeset
|
2011 dnl |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2012 dnl Check whether Qt VERSION is present, supports QtOpenGL and |
24798
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
2013 dnl QScintilla, and will work for Octave. |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2014 dnl |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2015 dnl OCTAVE_CHECK_QT_VERSION(VERSION) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2016 dnl |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2017 AC_DEFUN([OCTAVE_CHECK_QT_VERSION], [AC_MSG_CHECKING([Qt version $1]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2018 QT_CPPFLAGS= |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2019 QT_LDFLAGS= |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2020 QT_LIBS= |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2021 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2022 qt_version="$1"; |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2023 |
22255
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
2024 build_qt_gui=yes |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2025 build_qt_graphics=no |
24798
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
2026 have_qt_opengl_offscreen=no |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2027 win32_terminal=no |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2028 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2029 warn_qt_libraries="" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2030 warn_qt_version="" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2031 warn_qt_tools="" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2032 warn_qt_setvbuf="" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2033 warn_qt_lib_fcns="" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2034 warn_qt_abstract_item_model="" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2035 warn_qt_opengl="" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2036 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2037 ## Check for Qt libraries |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2038 case "$qt_version" in |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2039 5) |
26889
8295dfd22a02
Backed out changeset 4b256f00650c
John W. Eaton <jwe@octave.org>
parents:
26887
diff
changeset
|
2040 QT_OPENGL_MODULE="Qt5OpenGL" |
29519
78f42413e20f
octave-svgconvert: Don't use Qt's SVG module (bug #59546)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
29482
diff
changeset
|
2041 QT_MODULES="Qt5Core Qt5Gui Qt5Help Qt5Network Qt5PrintSupport Qt5Xml" |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2042 ;; |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2043 *) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2044 AC_MSG_ERROR([Unrecognized Qt version $qt_version]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2045 ;; |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2046 esac |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2047 |
25114
f191e1a26095
if a Qt version appears partially installed, don't check another version
John W. Eaton <jwe@octave.org>
parents:
25098
diff
changeset
|
2048 ## Use this check to get info in the log file. |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2049 PKG_CHECK_MODULES(QT, [$QT_MODULES], |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2050 [], |
22255
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
2051 [build_qt_gui=no |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2052 warn_qt_libraries="Qt libraries not found; disabling Qt GUI"]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2053 |
25114
f191e1a26095
if a Qt version appears partially installed, don't check another version
John W. Eaton <jwe@octave.org>
parents:
25098
diff
changeset
|
2054 ## Check the modules again individually to get lists of modules that |
f191e1a26095
if a Qt version appears partially installed, don't check another version
John W. Eaton <jwe@octave.org>
parents:
25098
diff
changeset
|
2055 ## are available and/or missing |
f191e1a26095
if a Qt version appears partially installed, don't check another version
John W. Eaton <jwe@octave.org>
parents:
25098
diff
changeset
|
2056 QT_MODULES_AVAILABLE= |
25097
cc21f66ecb1c
display more info in configure summary about Qt version and missing features
John W. Eaton <jwe@octave.org>
parents:
25061
diff
changeset
|
2057 QT_MODULES_MISSING= |
25114
f191e1a26095
if a Qt version appears partially installed, don't check another version
John W. Eaton <jwe@octave.org>
parents:
25098
diff
changeset
|
2058 for qt_mod in $QT_MODULES; do |
f191e1a26095
if a Qt version appears partially installed, don't check another version
John W. Eaton <jwe@octave.org>
parents:
25098
diff
changeset
|
2059 if $PKG_CONFIG --exists $qt_mod; then |
f191e1a26095
if a Qt version appears partially installed, don't check another version
John W. Eaton <jwe@octave.org>
parents:
25098
diff
changeset
|
2060 QT_MODULES_AVAILABLE="$QT_MODULES_AVAILABLE $qt_mod" |
f191e1a26095
if a Qt version appears partially installed, don't check another version
John W. Eaton <jwe@octave.org>
parents:
25098
diff
changeset
|
2061 else |
f191e1a26095
if a Qt version appears partially installed, don't check another version
John W. Eaton <jwe@octave.org>
parents:
25098
diff
changeset
|
2062 QT_MODULES_MISSING="$QT_MODULES_MISSING $qt_mod" |
f191e1a26095
if a Qt version appears partially installed, don't check another version
John W. Eaton <jwe@octave.org>
parents:
25098
diff
changeset
|
2063 fi |
f191e1a26095
if a Qt version appears partially installed, don't check another version
John W. Eaton <jwe@octave.org>
parents:
25098
diff
changeset
|
2064 done |
25097
cc21f66ecb1c
display more info in configure summary about Qt version and missing features
John W. Eaton <jwe@octave.org>
parents:
25061
diff
changeset
|
2065 |
22255
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
2066 if test $build_qt_gui = yes; then |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2067 ## Retrieve Qt compilation and linker flags |
23835
6ae0292aaa5c
configure: ensure empty pkg-config results are actually empty (bug #51680)
Mike Miller <mtmiller@octave.org>
parents:
23414
diff
changeset
|
2068 QT_CPPFLAGS="$($PKG_CONFIG --cflags-only-I $QT_MODULES | $SED -e 's/^ *$//')" |
6ae0292aaa5c
configure: ensure empty pkg-config results are actually empty (bug #51680)
Mike Miller <mtmiller@octave.org>
parents:
23414
diff
changeset
|
2069 QT_LDFLAGS="$($PKG_CONFIG --libs-only-L $QT_MODULES | $SED -e 's/^ *$//')" |
6ae0292aaa5c
configure: ensure empty pkg-config results are actually empty (bug #51680)
Mike Miller <mtmiller@octave.org>
parents:
23414
diff
changeset
|
2070 QT_LIBS="$($PKG_CONFIG --libs-only-l $QT_MODULES | $SED -e 's/^ *$//')" |
26889
8295dfd22a02
Backed out changeset 4b256f00650c
John W. Eaton <jwe@octave.org>
parents:
26887
diff
changeset
|
2071 QT_OPENGL_CPPFLAGS="$($PKG_CONFIG --cflags-only-I $QT_OPENGL_MODULE | $SED -e 's/^ *$//')" |
8295dfd22a02
Backed out changeset 4b256f00650c
John W. Eaton <jwe@octave.org>
parents:
26887
diff
changeset
|
2072 QT_OPENGL_LDFLAGS="$($PKG_CONFIG --libs-only-L $QT_OPENGL_MODULE | $SED -e 's/^ *$//')" |
8295dfd22a02
Backed out changeset 4b256f00650c
John W. Eaton <jwe@octave.org>
parents:
26887
diff
changeset
|
2073 QT_OPENGL_LIBS="$($PKG_CONFIG --libs-only-l $QT_OPENGL_MODULE | $SED -e 's/^ *$//')" |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2074 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2075 case $host_os in |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2076 *darwin*) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2077 ## Qt might be installed in framework |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2078 if test -z "$QT_LIBS"; then |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2079 QT_LDFLAGS="`$PKG_CONFIG --libs-only-other $QT_MODULES | tr ' ' '\n' | $GREP -e '-F' | uniq | tr '\n' ' '`" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2080 QT_LIBS="`$PKG_CONFIG --libs-only-other $QT_MODULES | tr ' ' '\n' | $GREP -v -e '-F' | uniq | tr '\n' ' '`" |
26889
8295dfd22a02
Backed out changeset 4b256f00650c
John W. Eaton <jwe@octave.org>
parents:
26887
diff
changeset
|
2081 QT_OPENGL_LDFLAGS="`$PKG_CONFIG --libs-only-other $QT_OPENGL_MODULE | tr ' ' '\n' | $GREP -e '-F' | uniq | tr '\n' ' '`" |
8295dfd22a02
Backed out changeset 4b256f00650c
John W. Eaton <jwe@octave.org>
parents:
26887
diff
changeset
|
2082 QT_OPENGL_LIBS="`$PKG_CONFIG --libs-only-other $QT_OPENGL_MODULE | tr ' ' '\n' | $GREP -v -e '-F' | uniq | tr '\n' ' '`" |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2083 ## Enabling link_all_deps works around libtool's imperfect handling |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2084 ## of the -F flag |
29663
5811df727e96
build: Don't try to expand Makefile variable in configure script.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29661
diff
changeset
|
2085 if test -n "$QT_LDFLAGS"; then |
5811df727e96
build: Don't try to expand Makefile variable in configure script.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29661
diff
changeset
|
2086 link_all_deps=yes |
5811df727e96
build: Don't try to expand Makefile variable in configure script.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29661
diff
changeset
|
2087 fi |
5811df727e96
build: Don't try to expand Makefile variable in configure script.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29661
diff
changeset
|
2088 AM_CONDITIONAL([AMCOND_LINK_ALL_DEPS], [test $link_all_deps = yes]) |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2089 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2090 ;; |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2091 esac |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2092 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2093 |
25119
14b9e2a1f3e1
if some Qt tools are instaslled, don't check for another version
John W. Eaton <jwe@octave.org>
parents:
25114
diff
changeset
|
2094 QT_TOOLS_AVAILABLE= |
14b9e2a1f3e1
if some Qt tools are instaslled, don't check for another version
John W. Eaton <jwe@octave.org>
parents:
25114
diff
changeset
|
2095 QT_TOOLS_MISSING= |
14b9e2a1f3e1
if some Qt tools are instaslled, don't check for another version
John W. Eaton <jwe@octave.org>
parents:
25114
diff
changeset
|
2096 |
22255
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
2097 if test $build_qt_gui = yes; then |
23154
80a2434ba83c
refactor checks for Qt tools (bug #50214)
John W. Eaton <jwe@octave.org>
parents:
23088
diff
changeset
|
2098 AC_CHECK_TOOLS(QTCHOOSER, [qtchooser]) |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2099 |
25135
ab3904f253c5
correctly track available/missing Qt tools when qtchooser is not found
John W. Eaton <jwe@octave.org>
parents:
25134
diff
changeset
|
2100 OCTAVE_CHECK_QT_TOOL([moc]) |
ab3904f253c5
correctly track available/missing Qt tools when qtchooser is not found
John W. Eaton <jwe@octave.org>
parents:
25134
diff
changeset
|
2101 OCTAVE_CHECK_QT_TOOL([uic]) |
ab3904f253c5
correctly track available/missing Qt tools when qtchooser is not found
John W. Eaton <jwe@octave.org>
parents:
25134
diff
changeset
|
2102 OCTAVE_CHECK_QT_TOOL([rcc]) |
ab3904f253c5
correctly track available/missing Qt tools when qtchooser is not found
John W. Eaton <jwe@octave.org>
parents:
25134
diff
changeset
|
2103 OCTAVE_CHECK_QT_TOOL([lrelease]) |
ab3904f253c5
correctly track available/missing Qt tools when qtchooser is not found
John W. Eaton <jwe@octave.org>
parents:
25134
diff
changeset
|
2104 OCTAVE_CHECK_QT_TOOL([qcollectiongenerator]) |
ab3904f253c5
correctly track available/missing Qt tools when qtchooser is not found
John W. Eaton <jwe@octave.org>
parents:
25134
diff
changeset
|
2105 OCTAVE_CHECK_QT_TOOL([qhelpgenerator]) |
24873
486bc22482ca
Improve Doxygen generation.
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24837
diff
changeset
|
2106 |
25119
14b9e2a1f3e1
if some Qt tools are instaslled, don't check for another version
John W. Eaton <jwe@octave.org>
parents:
25114
diff
changeset
|
2107 if test -n "$QT_TOOLS_MISSING"; then |
25029
91671d57817e
configure: mention qcollectiongenerator and qhelpgenerator in diagnostics (bug #53474)
Mike Miller <mtmiller@octave.org>
parents:
24938
diff
changeset
|
2108 warn_qt_tools="one or more of the Qt utilities moc, uic, rcc, lrelease, qcollectiongenerator, and qhelpgenerator not found; disabling Qt GUI" |
22255
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
2109 build_qt_gui=no |
23154
80a2434ba83c
refactor checks for Qt tools (bug #50214)
John W. Eaton <jwe@octave.org>
parents:
23088
diff
changeset
|
2110 MOC_QTVER= |
80a2434ba83c
refactor checks for Qt tools (bug #50214)
John W. Eaton <jwe@octave.org>
parents:
23088
diff
changeset
|
2111 UIC_QTVER= |
80a2434ba83c
refactor checks for Qt tools (bug #50214)
John W. Eaton <jwe@octave.org>
parents:
23088
diff
changeset
|
2112 RCC_QTVER= |
80a2434ba83c
refactor checks for Qt tools (bug #50214)
John W. Eaton <jwe@octave.org>
parents:
23088
diff
changeset
|
2113 LRELEASE_QTVER= |
24875
7c7b60dd4d4c
Generate Qt compressed help and collection files for the manual (bug #53006)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24873
diff
changeset
|
2114 QCOLLECTIONGENERATOR_QTVER= |
24873
486bc22482ca
Improve Doxygen generation.
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24837
diff
changeset
|
2115 QHELPGENERATOR_QTVER= |
486bc22482ca
Improve Doxygen generation.
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24837
diff
changeset
|
2116 MOCFLAGS= |
486bc22482ca
Improve Doxygen generation.
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24837
diff
changeset
|
2117 UICFLAGS= |
486bc22482ca
Improve Doxygen generation.
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24837
diff
changeset
|
2118 RCCFLAGS= |
486bc22482ca
Improve Doxygen generation.
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24837
diff
changeset
|
2119 LRELEASEFLAGS= |
24938
4f1da669b610
build: export and use qcollectiongenerator command line options correctly
Mike Miller <mtmiller@octave.org>
parents:
24890
diff
changeset
|
2120 QCOLLECTIONGENERATORFLAGS= |
24873
486bc22482ca
Improve Doxygen generation.
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24837
diff
changeset
|
2121 QHELPGENERATORFLAGS= |
23154
80a2434ba83c
refactor checks for Qt tools (bug #50214)
John W. Eaton <jwe@octave.org>
parents:
23088
diff
changeset
|
2122 $as_unset ac_cv_prog_MOC_QTVER |
23198
8db35b1a4f63
build: Clear ac_cv_prog_ac_ct_XXXX qt variables if correct qt was not found (Bug #50214)
John D
parents:
23175
diff
changeset
|
2123 $as_unset ac_cv_prog_ac_ct_MOC_QTVER |
23154
80a2434ba83c
refactor checks for Qt tools (bug #50214)
John W. Eaton <jwe@octave.org>
parents:
23088
diff
changeset
|
2124 $as_unset ac_cv_prog_UIC_QTVER |
23198
8db35b1a4f63
build: Clear ac_cv_prog_ac_ct_XXXX qt variables if correct qt was not found (Bug #50214)
John D
parents:
23175
diff
changeset
|
2125 $as_unset ac_cv_prog_ac_ct_UIC_QTVER |
23154
80a2434ba83c
refactor checks for Qt tools (bug #50214)
John W. Eaton <jwe@octave.org>
parents:
23088
diff
changeset
|
2126 $as_unset ac_cv_prog_RCC_QTVER |
23198
8db35b1a4f63
build: Clear ac_cv_prog_ac_ct_XXXX qt variables if correct qt was not found (Bug #50214)
John D
parents:
23175
diff
changeset
|
2127 $as_unset ac_cv_prog_ac_ct_RCC_QTVER |
23154
80a2434ba83c
refactor checks for Qt tools (bug #50214)
John W. Eaton <jwe@octave.org>
parents:
23088
diff
changeset
|
2128 $as_unset ac_cv_prog_LRELEASE_QTVER |
23198
8db35b1a4f63
build: Clear ac_cv_prog_ac_ct_XXXX qt variables if correct qt was not found (Bug #50214)
John D
parents:
23175
diff
changeset
|
2129 $as_unset ac_cv_prog_ac_ct_LRELEASE_QTVER |
24938
4f1da669b610
build: export and use qcollectiongenerator command line options correctly
Mike Miller <mtmiller@octave.org>
parents:
24890
diff
changeset
|
2130 $as_unset ac_cv_prog_QCOLLECTIONGENERATOR_QTVER |
4f1da669b610
build: export and use qcollectiongenerator command line options correctly
Mike Miller <mtmiller@octave.org>
parents:
24890
diff
changeset
|
2131 $as_unset ac_cv_prog_ac_ct_QCOLLECTIONGENERATOR_QTVER |
24873
486bc22482ca
Improve Doxygen generation.
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24837
diff
changeset
|
2132 $as_unset ac_cv_prog_QHELPGENERATOR_QTVER |
486bc22482ca
Improve Doxygen generation.
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24837
diff
changeset
|
2133 $as_unset ac_cv_prog_ac_ct_QHELPGENERATOR_QTVER |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2134 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2135 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2136 |
22255
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
2137 if test $build_qt_gui = yes; then |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2138 case $host_os in |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2139 mingw* | msdosmsvc*) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2140 AC_CHECK_FUNCS([setvbuf], [win32_terminal=yes], |
22255
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
2141 [build_qt_gui=no |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2142 warn_qt_setvbuf="setvbuf not found; disabling Qt GUI"]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2143 ;; |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2144 *) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2145 AC_CHECK_HEADERS([pty.h libutil.h util.h]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2146 AC_SEARCH_LIBS([openpty], [util], |
24810
8a92f442c4a2
configure.ac: Overhaul file (bug #53186).
Rik <rik@octave.org>
parents:
24798
diff
changeset
|
2147 [AC_DEFINE(HAVE_OPENPTY, 1, [Define to 1 if openpty exists])]) |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2148 AC_CHECK_FUNCS([chmod chown ftruncate mmap munmap], [], |
22255
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
2149 [build_qt_gui=no |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2150 warn_qt_lib_fcns="At least one of chmod, chown, ftruncate, mmap, and munmap not found; disabling Qt GUI"]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2151 ;; |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2152 esac |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2153 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2154 |
22255
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
2155 if test $build_qt_gui = yes; then |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2156 ## We have what we need to build the Qt GUI. The remaining |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2157 ## checks below are for optional features related to the Qt GUI. |
22255
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
2158 |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
2159 AC_DEFINE(HAVE_QT, 1, |
25029
91671d57817e
configure: mention qcollectiongenerator and qhelpgenerator in diagnostics (bug #53474)
Mike Miller <mtmiller@octave.org>
parents:
24938
diff
changeset
|
2160 [Define to 1 if Qt is available, with all required functions, libraries, developer header files, and utilities.]) |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2161 |
24827
1e0718c1867c
eliminate most Qt version checks
John W. Eaton <jwe@octave.org>
parents:
24825
diff
changeset
|
2162 AC_LANG_PUSH(C++) |
1e0718c1867c
eliminate most Qt version checks
John W. Eaton <jwe@octave.org>
parents:
24825
diff
changeset
|
2163 ac_octave_save_CPPFLAGS="$CPPFLAGS" |
1e0718c1867c
eliminate most Qt version checks
John W. Eaton <jwe@octave.org>
parents:
24825
diff
changeset
|
2164 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" |
1e0718c1867c
eliminate most Qt version checks
John W. Eaton <jwe@octave.org>
parents:
24825
diff
changeset
|
2165 AC_CHECK_HEADERS([QStandardPaths]) |
1e0718c1867c
eliminate most Qt version checks
John W. Eaton <jwe@octave.org>
parents:
24825
diff
changeset
|
2166 CPPFLAGS="$ac_octave_save_CPPFLAGS" |
1e0718c1867c
eliminate most Qt version checks
John W. Eaton <jwe@octave.org>
parents:
24825
diff
changeset
|
2167 AC_LANG_POP(C++) |
1e0718c1867c
eliminate most Qt version checks
John W. Eaton <jwe@octave.org>
parents:
24825
diff
changeset
|
2168 |
22255
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
2169 ## We don't need to unset cache variables for any of the remaining |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
2170 ## tests if they fail because we have already decided that the Qt |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
2171 ## version that we are testing now will be the one used. |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
2172 |
28846
2219027f5bd4
avoid deprecated Qt QFontMetrics::width function
John W. Eaton <jwe@octave.org>
parents:
28845
diff
changeset
|
2173 OCTAVE_CHECK_FUNC_QFONTMETRICS_HORIZONTAL_ADVANCE |
25046
a4c687fec320
gui: set Qt Application and Desktop metadata for desktop integration (bug #53102)
Mike Miller <mtmiller@octave.org>
parents:
25042
diff
changeset
|
2174 OCTAVE_CHECK_FUNC_QGUIAPPLICATION_SETDESKTOPFILENAME |
25061
5fef743c34d7
build: Check for new help query member in qt 5.9 (bug #53006).
Torsten <mttl@mailbox.org>
parents:
25054
diff
changeset
|
2175 OCTAVE_CHECK_FUNC_QHELPSEARCHQUERYWIDGET_SEARCHINPUT |
29034
e3bc897115ed
Change feature test to OCTAVE_CHECK_NEW_QHELPINDEXWIDGET_API in cset a0ff81c8b8e8.
Rik <rik@octave.org>
parents:
29031
diff
changeset
|
2176 OCTAVE_CHECK_NEW_QHELPINDEXWIDGET_API |
28835
2735fb9007e9
avoid QList deprecated function warnings
John W. Eaton <jwe@octave.org>
parents:
28527
diff
changeset
|
2177 OCTAVE_CHECK_FUNC_QLIST_ITERATOR_CONSTRUCTOR |
29147
5d7a651bf0bb
fix error when restoring previous main window layout (bug #59426)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29069
diff
changeset
|
2178 OCTAVE_CHECK_FUNC_QMAINWINDOW_RESIZEDOCKS |
29482
67f1d5fc69bb
avoid warning about deprecated Qprinter::setPaperSize function
John W. Eaton <jwe@octave.org>
parents:
29470
diff
changeset
|
2179 OCTAVE_CHECK_FUNC_QPRINTER_SETPAGESIZE |
25884
4e108574385c
Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053)
John Swensen <jpswensen@gmail.com>
parents:
25862
diff
changeset
|
2180 OCTAVE_CHECK_FUNC_QSCREEN_DEVICEPIXELRATIO |
29053
0678fdb81efc
avoid deprecated QHelpEngine::linksForIdentifier function
John W. Eaton <jwe@octave.org>
parents:
29049
diff
changeset
|
2181 OCTAVE_CHECK_FUNC_QHELPENGINE_DOCUMENTSFORIDENTIFIER |
27215
274766cae722
allow building with Qt4 to work again
John W. Eaton <jwe@octave.org>
parents:
27134
diff
changeset
|
2182 OCTAVE_CHECK_FUNC_QWHEELEVENT_ANGLEDELTA |
29048
440ace36950e
avoid warnings about deprecated QWheelEvent::pos method
John W. Eaton <jwe@octave.org>
parents:
29047
diff
changeset
|
2183 OCTAVE_CHECK_FUNC_QWHEELEVENT_POSITION |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2184 |
29560
5b7e721844df
provide QOverload template if it is not in <QtGlobal> (bug #60416)
John W. Eaton <jwe@octave.org>
parents:
29519
diff
changeset
|
2185 OCTAVE_CHECK_QOVERLOAD_TEMPLATE |
28845
50c112129700
avoid deprecated Qt QRegion::rects function
John W. Eaton <jwe@octave.org>
parents:
28835
diff
changeset
|
2186 OCTAVE_CHECK_QREGION_ITERATORS |
29049
461bd8b9ce91
use Qt::SplitBehavior enum and values if available
John W. Eaton <jwe@octave.org>
parents:
29048
diff
changeset
|
2187 OCTAVE_CHECK_QT_SPLITBEHAVIOR_ENUM |
28845
50c112129700
avoid deprecated Qt QRegion::rects function
John W. Eaton <jwe@octave.org>
parents:
28835
diff
changeset
|
2188 |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2189 if test -n "$OPENGL_LIBS"; then |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2190 OCTAVE_CHECK_QT_OPENGL_OK([build_qt_graphics=yes], |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2191 [warn_qt_opengl="Qt does not work with the OpenGL libs (GL and GLU); disabling OpenGL graphics with Qt GUI"]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2192 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2193 if test $build_qt_graphics = yes; then |
24837
ae6679369a80
Rely on QOffscreenSurface functionality rather than its presence (bug #53278)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24827
diff
changeset
|
2194 AC_DEFINE(HAVE_QT_GRAPHICS, 1, [Define to 1 if Qt works with OpenGL libs (GL and GLU)]) |
24798
45470049a43f
Allow getframe and print to work without osmesa (bug #53186).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24623
diff
changeset
|
2195 OCTAVE_CHECK_QT_OPENGL_OFFSCREEN_OK([have_qt_opengl_offscreen=yes]) |
24837
ae6679369a80
Rely on QOffscreenSurface functionality rather than its presence (bug #53278)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24827
diff
changeset
|
2196 if test $have_qt_opengl_offscreen = yes; then |
ae6679369a80
Rely on QOffscreenSurface functionality rather than its presence (bug #53278)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24827
diff
changeset
|
2197 AC_DEFINE(HAVE_QT_OFFSCREEN, 1, [Define to 1 if Qt handles offscreen OpenGL rendering]) |
ae6679369a80
Rely on QOffscreenSurface functionality rather than its presence (bug #53278)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
24827
diff
changeset
|
2198 fi |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2199 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2200 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2201 |
22823
e2afee0041bf
new configure option, --without-qscintilla
John W. Eaton <jwe@octave.org>
parents:
22755
diff
changeset
|
2202 OCTAVE_CHECK_QSCINTILLA([$qt_version]) |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2203 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2204 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2205 AC_SUBST(MOCFLAGS) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2206 AC_SUBST(UICFLAGS) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2207 AC_SUBST(RCCFLAGS) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2208 AC_SUBST(LRELEASEFLAGS) |
24938
4f1da669b610
build: export and use qcollectiongenerator command line options correctly
Mike Miller <mtmiller@octave.org>
parents:
24890
diff
changeset
|
2209 AC_SUBST(QCOLLECTIONGENERATORFLAGS) |
4f1da669b610
build: export and use qcollectiongenerator command line options correctly
Mike Miller <mtmiller@octave.org>
parents:
24890
diff
changeset
|
2210 AC_SUBST(QHELPGENERATORFLAGS) |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2211 AC_SUBST(QT_CPPFLAGS) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2212 AC_SUBST(QT_LDFLAGS) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2213 AC_SUBST(QT_LIBS) |
26881
4af9840f9ce5
make building with Qt4 QGLWidget work again (bug #55735)
John W. Eaton <jwe@octave.org>
parents:
26672
diff
changeset
|
2214 AC_SUBST(QT_OPENGL_CPPFLAGS) |
4af9840f9ce5
make building with Qt4 QGLWidget work again (bug #55735)
John W. Eaton <jwe@octave.org>
parents:
26672
diff
changeset
|
2215 AC_SUBST(QT_OPENGL_LDFLAGS) |
25931
332be8be16eb
dynamically load qt graphics
John W. Eaton <jwe@octave.org>
parents:
25884
diff
changeset
|
2216 AC_SUBST(QT_OPENGL_LIBS) |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2217 ]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
2218 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2219 dnl Check if the default Fortran INTEGER is 64 bits wide. |
22986
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22899
diff
changeset
|
2220 dnl If cross-compiling, assume 4 bytes unless the cache value |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22899
diff
changeset
|
2221 dnl is already set. |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2222 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2223 AC_DEFUN([OCTAVE_CHECK_SIZEOF_FORTRAN_INTEGER], [ |
22986
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22899
diff
changeset
|
2224 AC_CACHE_CHECK([default size of Fortran INTEGER], |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2225 [octave_cv_sizeof_fortran_integer], |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
2226 [ac_octave_save_FFLAGS="$FFLAGS" |
22986
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22899
diff
changeset
|
2227 FFLAGS="$FFLAGS $F77_INTEGER_8_FLAG" |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22899
diff
changeset
|
2228 AC_LANG_PUSH(Fortran 77) |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22899
diff
changeset
|
2229 AC_RUN_IFELSE([AC_LANG_PROGRAM(,[[ |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22899
diff
changeset
|
2230 integer*8 n8 |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22899
diff
changeset
|
2231 integer n |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22899
diff
changeset
|
2232 c Generate -2**33 + 1. |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22899
diff
changeset
|
2233 n8 = 2 |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22899
diff
changeset
|
2234 n8 = -4 * (n8 ** 30) |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22899
diff
changeset
|
2235 n8 = n8 + 1 |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22899
diff
changeset
|
2236 c Convert to default integer type. If the values are no longer equal, |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22899
diff
changeset
|
2237 c assume the default integer size is 32-bits. |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22899
diff
changeset
|
2238 n = n8 |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22899
diff
changeset
|
2239 if (n .ne. n8) stop 1 |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22899
diff
changeset
|
2240 ]])], |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22899
diff
changeset
|
2241 octave_cv_sizeof_fortran_integer=8, |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22899
diff
changeset
|
2242 octave_cv_sizeof_fortran_integer=4, |
21707d6a02c7
make --enable-64 the default
John W. Eaton <jwe@octave.org>
parents:
22899
diff
changeset
|
2243 octave_cv_sizeof_fortran_integer=4) |
24022
84a52be0cf53
configure: fix restoring of FFLAGS when checking Fortran integer size
Mike Miller <mtmiller@octave.org>
parents:
23981
diff
changeset
|
2244 AC_LANG_POP(Fortran 77) |
84a52be0cf53
configure: fix restoring of FFLAGS when checking Fortran integer size
Mike Miller <mtmiller@octave.org>
parents:
23981
diff
changeset
|
2245 FFLAGS="$ac_octave_save_FFLAGS" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2246 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2247 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2248 dnl |
26991
c188513f5496
configure: disable building with SUNDIALS when the API is too old (bug #55937)
Mike Miller <mtmiller@octave.org>
parents:
26938
diff
changeset
|
2249 dnl Check whether SUNDIALS libraries provide a compatible interface. |
c188513f5496
configure: disable building with SUNDIALS when the API is too old (bug #55937)
Mike Miller <mtmiller@octave.org>
parents:
26938
diff
changeset
|
2250 dnl The current recommended interface was introduced in SUNDIALS version 4. |
c188513f5496
configure: disable building with SUNDIALS when the API is too old (bug #55937)
Mike Miller <mtmiller@octave.org>
parents:
26938
diff
changeset
|
2251 dnl The deprecated interface that Octave currently works to be compatible with |
c188513f5496
configure: disable building with SUNDIALS when the API is too old (bug #55937)
Mike Miller <mtmiller@octave.org>
parents:
26938
diff
changeset
|
2252 dnl was introduced in SUNDIALS version 3. |
c188513f5496
configure: disable building with SUNDIALS when the API is too old (bug #55937)
Mike Miller <mtmiller@octave.org>
parents:
26938
diff
changeset
|
2253 dnl |
c188513f5496
configure: disable building with SUNDIALS when the API is too old (bug #55937)
Mike Miller <mtmiller@octave.org>
parents:
26938
diff
changeset
|
2254 AC_DEFUN([OCTAVE_CHECK_SUNDIALS_COMPATIBLE_API], [ |
c188513f5496
configure: disable building with SUNDIALS when the API is too old (bug #55937)
Mike Miller <mtmiller@octave.org>
parents:
26938
diff
changeset
|
2255 ac_octave_save_LIBS=$LIBS |
27013
b37c1656aa42
configure: test all SUNKLU functions after core SUNDIALS features (bug #55937)
Mike Miller <mtmiller@octave.org>
parents:
26992
diff
changeset
|
2256 LIBS="$SUNDIALS_IDA_LIBS $SUNDIALS_NVECSERIAL_LIBS $LIBS" |
26991
c188513f5496
configure: disable building with SUNDIALS when the API is too old (bug #55937)
Mike Miller <mtmiller@octave.org>
parents:
26938
diff
changeset
|
2257 dnl Current API functions present in SUNDIALS version 4 |
28739
3eb2fab71028
Allocate memory for Jacobian in __ode15__ more efficiently (bug #55905).
Bill Greene <w.h.greene@gmail.com>
parents:
28608
diff
changeset
|
2258 AC_CHECK_FUNCS([IDASetJacFn IDASetLinearSolver SUNLinSol_Dense SUNSparseMatrix_Reallocate]) |
26991
c188513f5496
configure: disable building with SUNDIALS when the API is too old (bug #55937)
Mike Miller <mtmiller@octave.org>
parents:
26938
diff
changeset
|
2259 dnl FIXME: The purpose of the following tests is to detect the deprecated |
c188513f5496
configure: disable building with SUNDIALS when the API is too old (bug #55937)
Mike Miller <mtmiller@octave.org>
parents:
26938
diff
changeset
|
2260 dnl API from SUNDIALS version 3, which should only be used if the current |
c188513f5496
configure: disable building with SUNDIALS when the API is too old (bug #55937)
Mike Miller <mtmiller@octave.org>
parents:
26938
diff
changeset
|
2261 dnl API tests above failed. For now, always test for ida_direct.h. |
c188513f5496
configure: disable building with SUNDIALS when the API is too old (bug #55937)
Mike Miller <mtmiller@octave.org>
parents:
26938
diff
changeset
|
2262 AC_CHECK_HEADERS([ida/ida_direct.h ida_direct.h]) |
c188513f5496
configure: disable building with SUNDIALS when the API is too old (bug #55937)
Mike Miller <mtmiller@octave.org>
parents:
26938
diff
changeset
|
2263 dnl Each of these is a deprecated analog to the functions listed above. |
27013
b37c1656aa42
configure: test all SUNKLU functions after core SUNDIALS features (bug #55937)
Mike Miller <mtmiller@octave.org>
parents:
26992
diff
changeset
|
2264 AC_CHECK_FUNCS([IDADlsSetJacFn IDADlsSetLinearSolver SUNDenseLinearSolver]) |
26991
c188513f5496
configure: disable building with SUNDIALS when the API is too old (bug #55937)
Mike Miller <mtmiller@octave.org>
parents:
26938
diff
changeset
|
2265 LIBS=$ac_octave_save_LIBS |
c188513f5496
configure: disable building with SUNDIALS when the API is too old (bug #55937)
Mike Miller <mtmiller@octave.org>
parents:
26938
diff
changeset
|
2266 AC_MSG_CHECKING([whether SUNDIALS API provides the necessary functions]) |
c188513f5496
configure: disable building with SUNDIALS when the API is too old (bug #55937)
Mike Miller <mtmiller@octave.org>
parents:
26938
diff
changeset
|
2267 if test "x$ac_cv_func_IDASetJacFn" = xyes \ |
c188513f5496
configure: disable building with SUNDIALS when the API is too old (bug #55937)
Mike Miller <mtmiller@octave.org>
parents:
26938
diff
changeset
|
2268 && test "x$ac_cv_func_IDASetLinearSolver" = xyes \ |
c188513f5496
configure: disable building with SUNDIALS when the API is too old (bug #55937)
Mike Miller <mtmiller@octave.org>
parents:
26938
diff
changeset
|
2269 && test "x$ac_cv_func_SUNLinSol_Dense" = xyes; then |
c188513f5496
configure: disable building with SUNDIALS when the API is too old (bug #55937)
Mike Miller <mtmiller@octave.org>
parents:
26938
diff
changeset
|
2270 octave_have_sundials_compatible_api=yes |
c188513f5496
configure: disable building with SUNDIALS when the API is too old (bug #55937)
Mike Miller <mtmiller@octave.org>
parents:
26938
diff
changeset
|
2271 elif test "x$ac_cv_func_IDADlsSetJacFn" = xyes \ |
c188513f5496
configure: disable building with SUNDIALS when the API is too old (bug #55937)
Mike Miller <mtmiller@octave.org>
parents:
26938
diff
changeset
|
2272 && test "x$ac_cv_func_IDADlsSetLinearSolver" = xyes \ |
c188513f5496
configure: disable building with SUNDIALS when the API is too old (bug #55937)
Mike Miller <mtmiller@octave.org>
parents:
26938
diff
changeset
|
2273 && test "x$ac_cv_func_SUNDenseLinearSolver" = xyes; then |
c188513f5496
configure: disable building with SUNDIALS when the API is too old (bug #55937)
Mike Miller <mtmiller@octave.org>
parents:
26938
diff
changeset
|
2274 octave_have_sundials_compatible_api=yes |
c188513f5496
configure: disable building with SUNDIALS when the API is too old (bug #55937)
Mike Miller <mtmiller@octave.org>
parents:
26938
diff
changeset
|
2275 else |
c188513f5496
configure: disable building with SUNDIALS when the API is too old (bug #55937)
Mike Miller <mtmiller@octave.org>
parents:
26938
diff
changeset
|
2276 octave_have_sundials_compatible_api=no |
c188513f5496
configure: disable building with SUNDIALS when the API is too old (bug #55937)
Mike Miller <mtmiller@octave.org>
parents:
26938
diff
changeset
|
2277 fi |
c188513f5496
configure: disable building with SUNDIALS when the API is too old (bug #55937)
Mike Miller <mtmiller@octave.org>
parents:
26938
diff
changeset
|
2278 AC_MSG_RESULT([$octave_have_sundials_compatible_api]) |
c188513f5496
configure: disable building with SUNDIALS when the API is too old (bug #55937)
Mike Miller <mtmiller@octave.org>
parents:
26938
diff
changeset
|
2279 if test $octave_have_sundials_compatible_api = no; then |
26992
05f389459461
configure: avoid excessive SUNDIALS warning messages when already disabled
Mike Miller <mtmiller@octave.org>
parents:
26991
diff
changeset
|
2280 warn_sundials_disabled="SUNDIALS libraries do not provide an API that is compatible with Octave. The solvers ode15i and ode15s will be disabled." |
05f389459461
configure: avoid excessive SUNDIALS warning messages when already disabled
Mike Miller <mtmiller@octave.org>
parents:
26991
diff
changeset
|
2281 OCTAVE_CONFIGURE_WARNING([warn_sundials_disabled]) |
26991
c188513f5496
configure: disable building with SUNDIALS when the API is too old (bug #55937)
Mike Miller <mtmiller@octave.org>
parents:
26938
diff
changeset
|
2282 fi |
c188513f5496
configure: disable building with SUNDIALS when the API is too old (bug #55937)
Mike Miller <mtmiller@octave.org>
parents:
26938
diff
changeset
|
2283 ]) |
c188513f5496
configure: disable building with SUNDIALS when the API is too old (bug #55937)
Mike Miller <mtmiller@octave.org>
parents:
26938
diff
changeset
|
2284 dnl |
23981
6420142ff32c
configure: fix capitalization of SUNDIALS, reword related terms
Mike Miller <mtmiller@octave.org>
parents:
23980
diff
changeset
|
2285 dnl Check whether SUNDIALS IDA library is configured with double |
23021
6094018f5e72
refactor configure checks for Sundials (bug #50003)
John W. Eaton <jwe@octave.org>
parents:
23017
diff
changeset
|
2286 dnl precision realtype. |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2287 dnl |
23980
eb6602171d59
configure: make SUNDIALS double precision test cross-compile-safe (bug #51904)
Mike Miller <mtmiller@octave.org>
parents:
23836
diff
changeset
|
2288 AC_DEFUN([OCTAVE_CHECK_SUNDIALS_SIZEOF_REALTYPE], [ |
23981
6420142ff32c
configure: fix capitalization of SUNDIALS, reword related terms
Mike Miller <mtmiller@octave.org>
parents:
23980
diff
changeset
|
2289 AC_CACHE_CHECK([whether SUNDIALS IDA is configured with double precision realtype], |
23980
eb6602171d59
configure: make SUNDIALS double precision test cross-compile-safe (bug #51904)
Mike Miller <mtmiller@octave.org>
parents:
23836
diff
changeset
|
2290 [octave_cv_sundials_realtype_is_double], |
eb6602171d59
configure: make SUNDIALS double precision test cross-compile-safe (bug #51904)
Mike Miller <mtmiller@octave.org>
parents:
23836
diff
changeset
|
2291 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
22899
31bd8a50d44c
Add Sundials library support
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
22890
diff
changeset
|
2292 #if defined (HAVE_IDA_IDA_H) |
26900
ebe7e12765ba
fix sundials configure warnings (bug #55911)
John W. Eaton <jwe@octave.org>
parents:
26898
diff
changeset
|
2293 # include <ida/ida.h> |
22899
31bd8a50d44c
Add Sundials library support
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
22890
diff
changeset
|
2294 #endif |
31bd8a50d44c
Add Sundials library support
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
22890
diff
changeset
|
2295 #include <assert.h> |
31bd8a50d44c
Add Sundials library support
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
22890
diff
changeset
|
2296 ]], [[ |
23980
eb6602171d59
configure: make SUNDIALS double precision test cross-compile-safe (bug #51904)
Mike Miller <mtmiller@octave.org>
parents:
23836
diff
changeset
|
2297 static_assert (sizeof (realtype) == sizeof (double), |
eb6602171d59
configure: make SUNDIALS double precision test cross-compile-safe (bug #51904)
Mike Miller <mtmiller@octave.org>
parents:
23836
diff
changeset
|
2298 "SUNDIALS is not configured for double precision"); |
22899
31bd8a50d44c
Add Sundials library support
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
22890
diff
changeset
|
2299 ]])], |
23980
eb6602171d59
configure: make SUNDIALS double precision test cross-compile-safe (bug #51904)
Mike Miller <mtmiller@octave.org>
parents:
23836
diff
changeset
|
2300 octave_cv_sundials_realtype_is_double=yes, |
eb6602171d59
configure: make SUNDIALS double precision test cross-compile-safe (bug #51904)
Mike Miller <mtmiller@octave.org>
parents:
23836
diff
changeset
|
2301 octave_cv_sundials_realtype_is_double=no) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2302 ]) |
23980
eb6602171d59
configure: make SUNDIALS double precision test cross-compile-safe (bug #51904)
Mike Miller <mtmiller@octave.org>
parents:
23836
diff
changeset
|
2303 if test $octave_cv_sundials_realtype_is_double = no; then |
26992
05f389459461
configure: avoid excessive SUNDIALS warning messages when already disabled
Mike Miller <mtmiller@octave.org>
parents:
26991
diff
changeset
|
2304 warn_sundials_disabled="SUNDIALS IDA library not configured with double precision realtype. The solvers ode15i and ode15s will be disabled." |
05f389459461
configure: avoid excessive SUNDIALS warning messages when already disabled
Mike Miller <mtmiller@octave.org>
parents:
26991
diff
changeset
|
2305 OCTAVE_CONFIGURE_WARNING([warn_sundials_disabled]) |
23021
6094018f5e72
refactor configure checks for Sundials (bug #50003)
John W. Eaton <jwe@octave.org>
parents:
23017
diff
changeset
|
2306 fi |
6094018f5e72
refactor configure checks for Sundials (bug #50003)
John W. Eaton <jwe@octave.org>
parents:
23017
diff
changeset
|
2307 ]) |
6094018f5e72
refactor configure checks for Sundials (bug #50003)
John W. Eaton <jwe@octave.org>
parents:
23017
diff
changeset
|
2308 dnl |
29367
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2309 dnl Check whether SUNDIALS IDA library has the SUNLINSOL_DENSE linear solver. |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2310 dnl |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2311 AC_DEFUN([OCTAVE_CHECK_SUNDIALS_SUNLINSOL_DENSE], [ |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2312 AC_CHECK_HEADERS([sunlinsol/sunlinsol_dense.h], |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2313 octave_cv_sundials_sunlinsol_dense=yes, |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2314 octave_cv_sundials_sunlinsol_dense=no) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2315 ]) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2316 if test $octave_cv_sundials_sunlinsol_dense = yes; then |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2317 AC_DEFINE(HAVE_SUNDIALS_SUNLINSOL_DENSE, 1, |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2318 [Define to 1 if SUNDIALS IDA includes the SUNLINSOL_DENSE linear solver.]) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2319 else |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2320 warn_sundials_disabled="SUNDIALS IDA library does not include the SUNLINSOL_DENSE linear solver. The solvers ode15i and ode15s will be disabled." |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2321 OCTAVE_CONFIGURE_WARNING([warn_sundials_disabled]) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2322 fi |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2323 ]) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2324 dnl |
26894
ee6300e77c92
Update detection of sundials in the build system (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26889
diff
changeset
|
2325 dnl Check whether SUNDIALS IDA library is configured with SUNLINSOL_KLU |
23021
6094018f5e72
refactor configure checks for Sundials (bug #50003)
John W. Eaton <jwe@octave.org>
parents:
23017
diff
changeset
|
2326 dnl enabled. |
6094018f5e72
refactor configure checks for Sundials (bug #50003)
John W. Eaton <jwe@octave.org>
parents:
23017
diff
changeset
|
2327 dnl |
26894
ee6300e77c92
Update detection of sundials in the build system (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26889
diff
changeset
|
2328 AC_DEFUN([OCTAVE_CHECK_SUNDIALS_SUNLINSOL_KLU], [ |
26938
58e300954518
search for klu.h in more places (bug #55950)
John W. Eaton <jwe@octave.org>
parents:
26937
diff
changeset
|
2329 ## Including <sunlinsol/sunlinsol_klu.h> may depend on including klu.h |
58e300954518
search for klu.h in more places (bug #55950)
John W. Eaton <jwe@octave.org>
parents:
26937
diff
changeset
|
2330 ## first. So perform the check as follows using several different |
58e300954518
search for klu.h in more places (bug #55950)
John W. Eaton <jwe@octave.org>
parents:
26937
diff
changeset
|
2331 ## possible locations for klu.h instead of using OCTAVE_CHECK_LIB to |
58e300954518
search for klu.h in more places (bug #55950)
John W. Eaton <jwe@octave.org>
parents:
26937
diff
changeset
|
2332 ## check for sunlinsol_klu.h. |
58e300954518
search for klu.h in more places (bug #55950)
John W. Eaton <jwe@octave.org>
parents:
26937
diff
changeset
|
2333 AC_CHECK_HEADERS([klu.h klu/klu.h suitesparse/klu.h ufsparse/klu.h]) |
26937
cfa2a65c9fdc
fix sunlinsol_klu.h detection with sundials 4.x (bug #55950)
John W. Eaton <jwe@octave.org>
parents:
26923
diff
changeset
|
2334 AC_CHECK_HEADERS([sunlinsol/sunlinsol_klu.h], [], [], |
26938
58e300954518
search for klu.h in more places (bug #55950)
John W. Eaton <jwe@octave.org>
parents:
26937
diff
changeset
|
2335 [#if defined (HAVE_KLU_H) |
58e300954518
search for klu.h in more places (bug #55950)
John W. Eaton <jwe@octave.org>
parents:
26937
diff
changeset
|
2336 # include <klu.h> |
58e300954518
search for klu.h in more places (bug #55950)
John W. Eaton <jwe@octave.org>
parents:
26937
diff
changeset
|
2337 #elif defined (HAVE_KLU_KLU_H) |
58e300954518
search for klu.h in more places (bug #55950)
John W. Eaton <jwe@octave.org>
parents:
26937
diff
changeset
|
2338 # include <klu/klu.h> |
58e300954518
search for klu.h in more places (bug #55950)
John W. Eaton <jwe@octave.org>
parents:
26937
diff
changeset
|
2339 #elif defined (HAVE_SUITESPARSE_KLU_H) |
58e300954518
search for klu.h in more places (bug #55950)
John W. Eaton <jwe@octave.org>
parents:
26937
diff
changeset
|
2340 # include <suitesparse/klu.h> |
58e300954518
search for klu.h in more places (bug #55950)
John W. Eaton <jwe@octave.org>
parents:
26937
diff
changeset
|
2341 #elif defined (HAVE_UFSPARSE_KLU_H) |
58e300954518
search for klu.h in more places (bug #55950)
John W. Eaton <jwe@octave.org>
parents:
26937
diff
changeset
|
2342 # include <ufsparse/klu.h> |
26937
cfa2a65c9fdc
fix sunlinsol_klu.h detection with sundials 4.x (bug #55950)
John W. Eaton <jwe@octave.org>
parents:
26923
diff
changeset
|
2343 #endif |
cfa2a65c9fdc
fix sunlinsol_klu.h detection with sundials 4.x (bug #55950)
John W. Eaton <jwe@octave.org>
parents:
26923
diff
changeset
|
2344 ]) |
26910
075c4d3bf1de
use OCTAVE_CHECK_LIB to check for sundials_sunlinsolklu library
John W. Eaton <jwe@octave.org>
parents:
26909
diff
changeset
|
2345 OCTAVE_CHECK_LIB(sundials_sunlinsolklu, SUNLINSOL_KLU, [], |
26937
cfa2a65c9fdc
fix sunlinsol_klu.h detection with sundials 4.x (bug #55950)
John W. Eaton <jwe@octave.org>
parents:
26923
diff
changeset
|
2346 [], [SUNKLU], [], |
26992
05f389459461
configure: avoid excessive SUNDIALS warning messages when already disabled
Mike Miller <mtmiller@octave.org>
parents:
26991
diff
changeset
|
2347 [don't use SUNDIALS SUNLINSOL_KLU library, disable ode15i and ode15s sparse Jacobian], |
27013
b37c1656aa42
configure: test all SUNKLU functions after core SUNDIALS features (bug #55937)
Mike Miller <mtmiller@octave.org>
parents:
26992
diff
changeset
|
2348 [AC_CHECK_FUNCS([SUNLinSol_KLU SUNKLU]) |
b37c1656aa42
configure: test all SUNKLU functions after core SUNDIALS features (bug #55937)
Mike Miller <mtmiller@octave.org>
parents:
26992
diff
changeset
|
2349 AC_CACHE_CHECK([whether compiling a program that calls SUNKLU works], |
26910
075c4d3bf1de
use OCTAVE_CHECK_LIB to check for sundials_sunlinsolklu library
John W. Eaton <jwe@octave.org>
parents:
26909
diff
changeset
|
2350 [octave_cv_sundials_sunlinsol_klu], |
075c4d3bf1de
use OCTAVE_CHECK_LIB to check for sundials_sunlinsolklu library
John W. Eaton <jwe@octave.org>
parents:
26909
diff
changeset
|
2351 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
26894
ee6300e77c92
Update detection of sundials in the build system (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26889
diff
changeset
|
2352 #if defined (HAVE_IDA_IDA_H) |
ee6300e77c92
Update detection of sundials in the build system (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26889
diff
changeset
|
2353 #include <ida/ida.h> |
ee6300e77c92
Update detection of sundials in the build system (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26889
diff
changeset
|
2354 #endif |
26895
a1acd11bad19
Directly include klu.h in __ode15__.cc (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26894
diff
changeset
|
2355 #if defined (HAVE_KLU_H) |
a1acd11bad19
Directly include klu.h in __ode15__.cc (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26894
diff
changeset
|
2356 #include <klu.h> |
a1acd11bad19
Directly include klu.h in __ode15__.cc (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26894
diff
changeset
|
2357 #endif |
a1acd11bad19
Directly include klu.h in __ode15__.cc (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26894
diff
changeset
|
2358 #if defined (HAVE_KLU_KLU_H) |
a1acd11bad19
Directly include klu.h in __ode15__.cc (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26894
diff
changeset
|
2359 #include <klu/klu.h> |
a1acd11bad19
Directly include klu.h in __ode15__.cc (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26894
diff
changeset
|
2360 #endif |
a1acd11bad19
Directly include klu.h in __ode15__.cc (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26894
diff
changeset
|
2361 #if defined (HAVE_SUITESPARSE_KLU_H) |
a1acd11bad19
Directly include klu.h in __ode15__.cc (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26894
diff
changeset
|
2362 #include <suitesparse/klu.h> |
a1acd11bad19
Directly include klu.h in __ode15__.cc (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26894
diff
changeset
|
2363 #endif |
a1acd11bad19
Directly include klu.h in __ode15__.cc (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26894
diff
changeset
|
2364 #if defined (HAVE_UFPARSE_KLU_H) |
a1acd11bad19
Directly include klu.h in __ode15__.cc (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26894
diff
changeset
|
2365 #include <ufsparse/klu.h> |
a1acd11bad19
Directly include klu.h in __ode15__.cc (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26894
diff
changeset
|
2366 #endif |
26894
ee6300e77c92
Update detection of sundials in the build system (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26889
diff
changeset
|
2367 #if defined (HAVE_SUNLINSOL_SUNLINSOL_KLU_H) |
ee6300e77c92
Update detection of sundials in the build system (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26889
diff
changeset
|
2368 #include <sunlinsol/sunlinsol_klu.h> |
23021
6094018f5e72
refactor configure checks for Sundials (bug #50003)
John W. Eaton <jwe@octave.org>
parents:
23017
diff
changeset
|
2369 #endif |
6094018f5e72
refactor configure checks for Sundials (bug #50003)
John W. Eaton <jwe@octave.org>
parents:
23017
diff
changeset
|
2370 ]], [[ |
26894
ee6300e77c92
Update detection of sundials in the build system (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26889
diff
changeset
|
2371 SUNKLU (0, 0); |
23021
6094018f5e72
refactor configure checks for Sundials (bug #50003)
John W. Eaton <jwe@octave.org>
parents:
23017
diff
changeset
|
2372 ]])], |
26894
ee6300e77c92
Update detection of sundials in the build system (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26889
diff
changeset
|
2373 octave_cv_sundials_sunlinsol_klu=yes, |
ee6300e77c92
Update detection of sundials in the build system (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26889
diff
changeset
|
2374 octave_cv_sundials_sunlinsol_klu=no) |
26910
075c4d3bf1de
use OCTAVE_CHECK_LIB to check for sundials_sunlinsolklu library
John W. Eaton <jwe@octave.org>
parents:
26909
diff
changeset
|
2375 ])]) |
26923
c81b471cdb28
build: avoid test syntax error in sundials configuration (bug #55926)
Mike Miller <mtmiller@octave.org>
parents:
26910
diff
changeset
|
2376 if test "x$ac_cv_header_sunlinsol_sunlinsol_klu_h" = xyes \ |
c81b471cdb28
build: avoid test syntax error in sundials configuration (bug #55926)
Mike Miller <mtmiller@octave.org>
parents:
26910
diff
changeset
|
2377 && test "x$octave_cv_sundials_sunlinsol_klu" = xyes; then |
26894
ee6300e77c92
Update detection of sundials in the build system (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26889
diff
changeset
|
2378 AC_DEFINE(HAVE_SUNDIALS_SUNLINSOL_KLU, 1, |
ee6300e77c92
Update detection of sundials in the build system (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26889
diff
changeset
|
2379 [Define to 1 if SUNDIALS IDA is configured with SUNLINSOL_KLU enabled.]) |
23021
6094018f5e72
refactor configure checks for Sundials (bug #50003)
John W. Eaton <jwe@octave.org>
parents:
23017
diff
changeset
|
2380 else |
26992
05f389459461
configure: avoid excessive SUNDIALS warning messages when already disabled
Mike Miller <mtmiller@octave.org>
parents:
26991
diff
changeset
|
2381 warn_sundials_sunlinsol_klu="SUNDIALS IDA library not configured with SUNLINSOL_KLU or sunlinksol_klu.h is not usable. The solvers ode15i and ode15s will not support the sparse Jacobian feature." |
26894
ee6300e77c92
Update detection of sundials in the build system (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26889
diff
changeset
|
2382 OCTAVE_CONFIGURE_WARNING([warn_sundials_sunlinsol_klu]) |
22899
31bd8a50d44c
Add Sundials library support
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
22890
diff
changeset
|
2383 fi |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2384 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2385 dnl |
29367
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2386 dnl Like AC_CONFIG_FILES, but don't touch the output file if it already |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2387 dnl exists and hasn't changed. |
28938
8592190176a8
build: Re-instate configure test for SUNLinSol_Dense header (bug #59248).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28933
diff
changeset
|
2388 dnl |
29367
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2389 AC_DEFUN([OCTAVE_CONFIG_MOVE_IF_CHANGE_FILES], [ |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2390 m4_foreach_w([elt], [$1], [ |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2391 AC_CONFIG_FILES(elt[-tmp:]patsubst(elt, [.sh$], [.in.sh])) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2392 AC_CONFIG_COMMANDS(elt, |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2393 [$SHELL $srcdir/build-aux/move-if-change ]elt[-tmp ]elt)])]) |
28938
8592190176a8
build: Re-instate configure test for SUNLinSol_Dense header (bug #59248).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28933
diff
changeset
|
2394 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2395 dnl Add warning to final summary. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2396 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2397 AC_DEFUN([OCTAVE_CONFIGURE_WARNING], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2398 AC_MSG_WARN([$][$1]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2399 m4_set_add([summary_warning_list], [$1]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2400 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2401 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2402 dnl Print final summary. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2403 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2404 AC_DEFUN([OCTAVE_CONFIGURE_WARNING_SUMMARY], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2405 m4_set_foreach([summary_warning_list], [elt], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2406 if test -n "[$]elt"; then |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2407 AC_MSG_WARN([$]elt) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2408 warn_msg_printed=true |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2409 fi]) |
8724
a50228129dba
Introduce new macro OCTAVE_GLUTESSCALLBACK_THREEDOTS. Use definitions HAVE_FRAMEWORK_OPENGL and HAVE_GLUTESSCALLBACK_THREEDOTS for Mac's framework OpenGL implementation.
Ben Abbott <bpabbott@mac.com>
parents:
8676
diff
changeset
|
2410 ]) |
a50228129dba
Introduce new macro OCTAVE_GLUTESSCALLBACK_THREEDOTS. Use definitions HAVE_FRAMEWORK_OPENGL and HAVE_GLUTESSCALLBACK_THREEDOTS for Mac's framework OpenGL implementation.
Ben Abbott <bpabbott@mac.com>
parents:
8676
diff
changeset
|
2411 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2412 dnl Check if the C++ library has the bit_and, bit_or, and bit_xor |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2413 dnl templates defined. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2414 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2415 AC_DEFUN([OCTAVE_CXX_BITWISE_OP_TEMPLATES], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2416 AC_CACHE_CHECK([whether bit_and, bit_or, bit_xor are defined in the C++ library], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2417 [octave_cv_cxx_bitwise_op_templates], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2418 [AC_LANG_PUSH(C++) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2419 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2420 #include <functional> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2421 ]], [[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2422 int x = 0; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2423 int y = 1; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2424 int z1 = std::bit_and<int>() (x, y); |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2425 int z2 = std::bit_or<int>() (x, y); |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2426 int z3 = std::bit_xor<int>() (x, y); |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2427 ]])], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2428 octave_cv_cxx_bitwise_op_templates=yes, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2429 octave_cv_cxx_bitwise_op_templates=no) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2430 AC_LANG_POP(C++) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2431 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2432 if test $octave_cv_cxx_bitwise_op_templates = yes; then |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2433 AC_DEFINE(HAVE_CXX_BITWISE_OP_TEMPLATES, 1, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2434 [Define to 1 if C++ library has templated bitwise operators.]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2435 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2436 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2437 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2438 dnl Check if the C++ library has functions to access real and imaginary |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2439 dnl parts of complex numbers independently via references. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2440 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2441 AC_DEFUN([OCTAVE_CXX_COMPLEX_REFERENCE_ACCESSORS], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2442 AC_CACHE_CHECK([whether complex class can reference components independently], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2443 [octave_cv_cxx_complex_reference_accessors], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2444 [AC_LANG_PUSH(C++) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2445 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2446 #include <complex> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2447 ]], [[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2448 std::complex<double> x; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2449 x.real () = 1.0; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2450 x.imag () = 1.0; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2451 ]])], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2452 octave_cv_cxx_complex_reference_accessors=yes, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2453 octave_cv_cxx_complex_reference_accessors=no) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2454 AC_LANG_POP(C++) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2455 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2456 if test $octave_cv_cxx_complex_reference_accessors = yes; then |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2457 AC_DEFINE(HAVE_CXX_COMPLEX_REFERENCE_ACCESSORS, 1, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2458 [Define to 1 if C++ complex class has T& real (void) and T& imag (void) methods.]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2459 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2460 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2461 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2462 dnl Check if the C++ library has functions to set real and imaginary |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2463 dnl parts of complex numbers independently. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2464 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2465 AC_DEFUN([OCTAVE_CXX_COMPLEX_SETTERS], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2466 AC_CACHE_CHECK([whether complex class can set components independently], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2467 [octave_cv_cxx_complex_setters], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2468 [AC_LANG_PUSH(C++) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2469 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2470 #include <complex> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2471 ]], [[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2472 std::complex<double> x; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2473 x.real (1.0); |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2474 x.imag (2.0); |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2475 ]])], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2476 octave_cv_cxx_complex_setters=yes, octave_cv_cxx_complex_setters=no) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2477 AC_LANG_POP(C++) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2478 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2479 if test $octave_cv_cxx_complex_setters = yes; then |
17034
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2480 AC_DEFINE(HAVE_CXX_COMPLEX_SETTERS, 1, |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2481 [Define to 1 if C++ complex class has void real (T) and void imag (T) methods.]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2482 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2483 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2484 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2485 dnl Check if the compiler supports dynamic auto arrays. |
10471
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10380
diff
changeset
|
2486 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2487 AC_DEFUN([OCTAVE_CXX_DYNAMIC_AUTO_ARRAYS], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2488 AC_CACHE_CHECK([whether C++ supports dynamic auto arrays], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2489 [octave_cv_cxx_dynamic_auto_arrays], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2490 [AC_LANG_PUSH(C++) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2491 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2492 void test(char *); |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2493 int length(); |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2494 char x[length()]; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2495 test(x); |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2496 ]])], |
17034
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2497 octave_cv_cxx_dynamic_auto_arrays=yes, |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2498 octave_cv_cxx_dynamic_auto_arrays=no) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2499 AC_LANG_POP(C++) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2500 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2501 if test $octave_cv_cxx_dynamic_auto_arrays = yes; then |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2502 AC_DEFINE(HAVE_DYNAMIC_AUTO_ARRAYS, 1, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2503 [Define to 1 if C++ supports dynamic auto arrays.]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2504 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2505 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2506 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2507 dnl Check if C++ compiler handles FLAG command line option. If two |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2508 dnl arguments are specified, execute the second arg as shell commands. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2509 dnl Otherwise, add FLAG to CXXFLAGS if the compiler accepts the flag. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2510 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2511 AC_DEFUN([OCTAVE_CXX_FLAG], [ |
17661
1978a6c76aa9
Use user-specified SED during build process (bug #40273).
Rik <rik@octave.org>
parents:
17615
diff
changeset
|
2512 ac_safe=`echo "$1" | $SED 'y%./+-:=%__p___%'` |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2513 AC_MSG_CHECKING([whether ${CXX-g++} accepts $1]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2514 AC_CACHE_VAL([octave_cv_cxx_flag_$ac_safe], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2515 [AC_LANG_PUSH(C++) |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
2516 ac_octave_save_CXXFLAGS="$CXXFLAGS" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2517 CXXFLAGS="$CXXFLAGS $1" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2518 AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2519 eval "octave_cv_cxx_flag_$ac_safe=yes", |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2520 eval "octave_cv_cxx_flag_$ac_safe=no") |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
2521 CXXFLAGS="$ac_octave_save_CXXFLAGS" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2522 AC_LANG_POP(C++) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2523 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2524 if eval "test \"`echo '$octave_cv_cxx_flag_'$ac_safe`\" = yes"; then |
15319
daf74ce2afdc
m4/acinclude.m4: Use more consistent m4 quoting of arguments to macros.
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
2525 AC_MSG_RESULT([yes]) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2526 ifelse([$2], , |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2527 [CXXFLAGS="$CXXFLAGS $1" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2528 AC_MSG_RESULT([adding $1 to CXXFLAGS])], [$2]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2529 else |
15319
daf74ce2afdc
m4/acinclude.m4: Use more consistent m4 quoting of arguments to macros.
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
2530 AC_MSG_RESULT([no]) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2531 ifelse([$3], , , [$3]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2532 fi |
10471
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10380
diff
changeset
|
2533 ]) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2534 dnl |
29367
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2535 dnl OCTAVE_DEFINE_MKOCTFILE_DYNAMIC_LINK_OPTIONS |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2536 dnl |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2537 dnl Requires the following variables to already be set: |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2538 dnl |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2539 dnl AR |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2540 dnl CFLAGS |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2541 dnl CXX |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2542 dnl CXXFLAGS |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2543 dnl EXEEXT |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2544 dnl GCC |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2545 dnl GREP |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2546 dnl GXX |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2547 dnl LDFLAGS |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2548 dnl ac_cv_f77_compiler_gnu |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2549 dnl ac_top_build_prefix |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2550 dnl canonical_host_type |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2551 dnl have_msvc |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2552 dnl |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2553 AC_DEFUN_ONCE([OCTAVE_DEFINE_MKOCTFILE_DYNAMIC_LINK_OPTIONS], [ |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2554 ### Set system-dependent options for building shared libraries. |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2555 ### These are used by mkoctfile to create dynamically loadable |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2556 ### .oct and .mex files. It would be great if we could somehow |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2557 ### use libtool to get this information. |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2558 |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2559 CPICFLAG=-fPIC |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2560 CXXPICFLAG=-fPIC |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2561 FPICFLAG=-fPIC |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2562 SH_LDFLAGS=-shared |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2563 DL_LDFLAGS="${SH_LDFLAGS}" |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2564 MKOCTFILE_DL_LDFLAGS="${DL_LDFLAGS}" |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2565 NO_OCT_FILE_STRIP=false |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2566 TEMPLATE_AR="${AR}" |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2567 TEMPLATE_ARFLAGS="${ARFLAGS}" |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2568 library_path_var=LD_LIBRARY_PATH |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2569 ldpreloadsep=" " |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2570 case $canonical_host_type in |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2571 *-*-386bsd* | *-*-netbsd*) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2572 SH_LDFLAGS=-Bshareable |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2573 ;; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2574 *-*-openbsd*) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2575 SH_LDFLAGS="-shared -fPIC" |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2576 ;; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2577 *-*-freebsd*) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2578 SH_LDFLAGS="-shared -Wl,-x" |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2579 ;; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2580 alpha*-dec-osf*) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2581 CPICFLAG= |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2582 CXXPICFLAG= |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2583 FPICFLAG= |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2584 SH_LDFLAGS="-shared -Wl,-expect_unresolved -Wl,'*'" |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2585 ;; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2586 *-*-darwin*) |
29808 | 2587 DL_LDFLAGS="-bundle -undefined dynamic_lookup -bind_at_load -bundle_loader ${ac_top_build_prefix}src/octave${EXEEXT} ${LDFLAGS}" |
29367
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2588 dnl Contains variables that are defined and undefined at this point, so use |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2589 dnl appropriate quoting to defer expansion of ${bindir} and ${version}. |
29588
b4cb9d04f3cf
build: Use dynamic symbol lookup for functions in libraries on macOS (bug #53627).
Andrew Janke <andrew@apjanke.net>
parents:
29560
diff
changeset
|
2590 MKOCTFILE_DL_LDFLAGS='-bundle -undefined dynamic_lookup -bind_at_load -bundle_loader ${bindir}/octave-${version}'"${EXEEXT}" |
29367
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2591 SH_LDFLAGS="-dynamiclib -single_module ${LDFLAGS}" |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2592 case $canonical_host_type in |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2593 powerpc-*) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2594 CXXPICFLAG= |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2595 CPICFLAG= |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2596 FPICFLAG= |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2597 ;; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2598 esac |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2599 NO_OCT_FILE_STRIP=true |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2600 library_path_var=DYLD_LIBRARY_PATH |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2601 ;; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2602 *-*-cygwin*) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2603 CPICFLAG= |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2604 CXXPICFLAG= |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2605 FPICFLAG= |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2606 DL_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc" |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2607 SH_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-auto-image-base" |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2608 ldpreloadsep=":" |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2609 ;; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2610 *-*-mingw*) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2611 if test $have_msvc = yes; then |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2612 DL_LDFLAGS="-shared" |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2613 CPICFLAG= |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2614 CXXPICFLAG= |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2615 FPICFLAG= |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2616 SH_LDFLAGS="-shared" |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2617 if test -n "`echo $CFLAGS | $GREP -e '-g'`" || test -n "`echo $CXXFLAGS | $GREP -e '-g'`"; then |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2618 DL_LDFLAGS="$DL_LDFLAGS -g" |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2619 SH_LDFLAGS="$SH_LDFLAGS -g" |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2620 fi |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2621 NO_OCT_FILE_STRIP=true |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2622 library_path_var=PATH |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2623 else |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2624 CPICFLAG= |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2625 CXXPICFLAG= |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2626 FPICFLAG= |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2627 DL_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc" |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2628 SH_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-auto-image-base" |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2629 library_path_var=PATH |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2630 fi |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2631 ;; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2632 *-*-msdosmsvc) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2633 DL_LDFLAGS="-shared" |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2634 CPICFLAG= |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2635 CXXPICFLAG= |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2636 FPICFLAG= |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2637 SH_LDFLAGS="-shared" |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2638 if test -n "`echo $CFLAGS | $GREP -e '-g'`" || test -n "`echo $CXXFLAGS | $GREP -e '-g'`"; then |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2639 DL_LDFLAGS="$DL_LDFLAGS -g" |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2640 SH_LDFLAGS="$SH_LDFLAGS -g" |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2641 fi |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2642 NO_OCT_FILE_STRIP=true |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2643 library_path_var=PATH |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2644 ;; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2645 *-*-linux* | *-*-gnu*) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2646 MKOCTFILE_DL_LDFLAGS="-shared -Wl,-Bsymbolic" |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2647 ;; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2648 i[[3456]]86-*-sco3.2v5*) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2649 SH_LDFLAGS=-G |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2650 ;; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2651 rs6000-ibm-aix* | powerpc-ibm-aix*) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2652 CPICFLAG= |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2653 CXXPICFLAG= |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2654 FPICFLAG= |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2655 library_path_var=LIBPATH |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2656 ;; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2657 hppa*-hp-hpux*) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2658 if test $ac_cv_f77_compiler_gnu = yes; then |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2659 FPICFLAG=-fPIC |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2660 else |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2661 FPICFLAG=+Z |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2662 fi |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2663 SH_LDFLAGS="-shared -fPIC" |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2664 library_path_var=SHLIB_PATH |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2665 ;; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2666 ia64*-hp-hpux*) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2667 if test $ac_cv_f77_compiler_gnu = yes; then |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2668 FPICFLAG=-fPIC |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2669 else |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2670 FPICFLAG=+Z |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2671 fi |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2672 SH_LDFLAGS="-shared -fPIC" |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2673 ;; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2674 *-sgi-*) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2675 CPICFLAG= |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2676 CXXPICFLAG= |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2677 FPICFLAG= |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2678 ;; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2679 sparc-sun-sunos4*) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2680 if test $ac_cv_f77_compiler_gnu = yes; then |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2681 FPICFLAG=-fPIC |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2682 else |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2683 FPICFLAG=-PIC |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2684 fi |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2685 SH_LDFLAGS="-assert nodefinitions" |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2686 ;; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2687 sparc-sun-solaris2* | i386-pc-solaris2*) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2688 if test $ac_cv_f77_compiler_gnu = yes; then |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2689 FPICFLAG=-fPIC |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2690 else |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2691 FPICFLAG=-KPIC |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2692 fi |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2693 if test "$GCC" = yes; then |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2694 CPICFLAG=-fPIC |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2695 else |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2696 CPICFLAG=-KPIC |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2697 fi |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2698 if test "$GXX" = yes; then |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2699 CXXPICFLAG=-fPIC |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2700 SH_LDFLAGS=-shared |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2701 else |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2702 CXXPICFLAG=-KPIC |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2703 SH_LDFLAGS=-G |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2704 fi |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2705 ## Template closures in archive libraries need a different mechanism. |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2706 if test "$GXX" != yes; then |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2707 TEMPLATE_AR="${CXX}" |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2708 TEMPLATE_ARFLAGS="-xar -o" |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2709 fi |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2710 ;; |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2711 esac |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2712 |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2713 AC_MSG_NOTICE([defining FPICFLAG to be $FPICFLAG]) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2714 AC_MSG_NOTICE([defining CPICFLAG to be $CPICFLAG]) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2715 AC_MSG_NOTICE([defining CXXPICFLAG to be $CXXPICFLAG]) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2716 AC_MSG_NOTICE([defining SH_LDFLAGS to be $SH_LDFLAGS]) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2717 AC_MSG_NOTICE([defining DL_LDFLAGS to be $DL_LDFLAGS]) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2718 AC_MSG_NOTICE([defining MKOCTFILE_DL_LDFLAGS to be $MKOCTFILE_DL_LDFLAGS]) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2719 AC_MSG_NOTICE([defining NO_OCT_FILE_STRIP to be $NO_OCT_FILE_STRIP]) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2720 AC_MSG_NOTICE([defining TEMPLATE_AR to be $TEMPLATE_AR]) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2721 AC_MSG_NOTICE([defining TEMPLATE_ARFLAGS to be $TEMPLATE_ARFLAGS]) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2722 AC_MSG_NOTICE([defining library_path_var to be $library_path_var]) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2723 AC_SUBST(FPICFLAG) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2724 AC_SUBST(CPICFLAG) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2725 AC_SUBST(CXXPICFLAG) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2726 AC_SUBST(SH_LDFLAGS) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2727 AC_SUBST(DL_LDFLAGS) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2728 AC_SUBST(MKOCTFILE_DL_LDFLAGS) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2729 AC_SUBST(NO_OCT_FILE_STRIP) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2730 AC_SUBST(TEMPLATE_AR) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2731 AC_SUBST(TEMPLATE_ARFLAGS) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2732 AC_SUBST(library_path_var) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2733 AC_SUBST(ldpreloadsep) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2734 AM_SUBST_NOTMAKE(ldpreloadsep) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2735 ]) |
8608b7e50720
maint: sort m4 macros alphabetically in acinclude.m4.
Rik <rik@octave.org>
parents:
29366
diff
changeset
|
2736 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2737 dnl Allow the user disable support for command line editing using GNU |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2738 dnl readline. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2739 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2740 AC_DEFUN([OCTAVE_ENABLE_READLINE], [ |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16012
diff
changeset
|
2741 USE_READLINE=yes |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2742 READLINE_LIBS= |
15319
daf74ce2afdc
m4/acinclude.m4: Use more consistent m4 quoting of arguments to macros.
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
2743 AC_ARG_ENABLE([readline], |
15238
c4779a180134
avoid confusing --disable-foo (default is yes) configure help messages
John W. Eaton <jwe@octave.org>
parents:
15166
diff
changeset
|
2744 [AS_HELP_STRING([--disable-readline], |
18141
5e72998000fb
acinclude.m4 (OCTAVE_ENABLE_READLINE): correct the help for --disable-readline
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
18058
diff
changeset
|
2745 [do not use readline library])], |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2746 [if test "$enableval" = no; then |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16012
diff
changeset
|
2747 USE_READLINE=no |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2748 warn_readline="command editing and history features require GNU Readline" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2749 fi]) |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16012
diff
changeset
|
2750 if test $USE_READLINE = yes; then |
15302
a8cfbc1911e4
build: Set TERM_LIBS before checking for READLINE.
Rik <rik@octave.org>
parents:
15295
diff
changeset
|
2751 dnl RHEL 5 and older systems require termlib set before enabling readline |
a8cfbc1911e4
build: Set TERM_LIBS before checking for READLINE.
Rik <rik@octave.org>
parents:
15295
diff
changeset
|
2752 AC_REQUIRE([OCTAVE_CHECK_LIB_TERMLIB]) |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
2753 ac_octave_save_LIBS="$LIBS" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2754 LIBS="$TERM_LIBS" |
15319
daf74ce2afdc
m4/acinclude.m4: Use more consistent m4 quoting of arguments to macros.
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
2755 AC_CHECK_LIB([readline], [rl_set_keyboard_input_timeout], |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2756 [READLINE_LIBS="-lreadline" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2757 AC_DEFINE(USE_READLINE, 1, [Define to 1 to use the readline library.]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2758 ], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2759 [AC_MSG_WARN([I need GNU Readline 4.2 or later]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2760 AC_MSG_ERROR([this is fatal unless you specify --disable-readline]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2761 ]) |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
2762 LIBS="$ac_octave_save_LIBS" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2763 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2764 AC_SUBST(READLINE_LIBS) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2765 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2766 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2767 dnl Check if Fortran compiler handles FLAG command line option. If |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2768 dnl two arguments are specified, execute the second arg as shell |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2769 dnl commands. Otherwise, add FLAG to FFLAGS if the compiler accepts |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2770 dnl the flag. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2771 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2772 AC_DEFUN([OCTAVE_F77_FLAG], [ |
17661
1978a6c76aa9
Use user-specified SED during build process (bug #40273).
Rik <rik@octave.org>
parents:
17615
diff
changeset
|
2773 ac_safe=`echo "$1" | $SED 'y%./+-:=%__p___%'` |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2774 AC_MSG_CHECKING([whether ${F77-g77} accepts $1]) |
15319
daf74ce2afdc
m4/acinclude.m4: Use more consistent m4 quoting of arguments to macros.
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
2775 AC_CACHE_VAL([octave_cv_f77_flag_$ac_safe], [ |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2776 AC_LANG_PUSH(Fortran 77) |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
2777 ac_octave_save_FFLAGS="$FFLAGS" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2778 FFLAGS="$FFLAGS $1" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2779 AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2780 eval "octave_cv_f77_flag_$ac_safe=yes", |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2781 eval "octave_cv_f77_flag_$ac_safe=no") |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
2782 FFLAGS="$ac_octave_save_FFLAGS" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2783 AC_LANG_POP(Fortran 77) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2784 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2785 if eval "test \"`echo '$octave_cv_f77_flag_'$ac_safe`\" = yes"; then |
15319
daf74ce2afdc
m4/acinclude.m4: Use more consistent m4 quoting of arguments to macros.
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
2786 AC_MSG_RESULT([yes]) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2787 ifelse([$2], , |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2788 [FFLAGS="$FFLAGS $1" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2789 AC_MSG_RESULT([adding $1 to FFLAGS])], [$2]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2790 else |
15319
daf74ce2afdc
m4/acinclude.m4: Use more consistent m4 quoting of arguments to macros.
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
2791 AC_MSG_RESULT([no]) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2792 ifelse([$3], , , [$3]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2793 fi |
10471
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10380
diff
changeset
|
2794 ]) |
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10380
diff
changeset
|
2795 dnl |
8595
dee5d60257e4
Use Carbon framework to determine ScreenSize on Mac.
Thomas Treichl <Thomas.Treichl@gmx.net>
parents:
8169
diff
changeset
|
2796 dnl Check to see if the compiler and the linker can handle the flags |
8635
bef8f001032f
Further improvements for OCTAVE_HAVE_FRAMEWORK and the test for the MacOSX Carbon framework.
Thomas Treichl <Thomas.Treichl@gmx.net>
parents:
8595
diff
changeset
|
2797 dnl "-framework $1" for the given prologue $2 and the given body $3 of |
bef8f001032f
Further improvements for OCTAVE_HAVE_FRAMEWORK and the test for the MacOSX Carbon framework.
Thomas Treichl <Thomas.Treichl@gmx.net>
parents:
8595
diff
changeset
|
2798 dnl a source file. Arguments 2 and 3 optionally can also be empty. |
bef8f001032f
Further improvements for OCTAVE_HAVE_FRAMEWORK and the test for the MacOSX Carbon framework.
Thomas Treichl <Thomas.Treichl@gmx.net>
parents:
8595
diff
changeset
|
2799 dnl Add options (lower case letters $1) "--with-framework-$1" and |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2800 dnl "--without-framework-$1". If this test is successful then perform |
8635
bef8f001032f
Further improvements for OCTAVE_HAVE_FRAMEWORK and the test for the MacOSX Carbon framework.
Thomas Treichl <Thomas.Treichl@gmx.net>
parents:
8595
diff
changeset
|
2801 dnl $4, otherwise do $5. |
8595
dee5d60257e4
Use Carbon framework to determine ScreenSize on Mac.
Thomas Treichl <Thomas.Treichl@gmx.net>
parents:
8169
diff
changeset
|
2802 dnl |
9654
a307a6f77fb3
aclocal.m4: consistently quote first arg to AC_DEFUN
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2803 AC_DEFUN([OCTAVE_HAVE_FRAMEWORK], [ |
10012
2441327485a3
use m4 quating in aclocal.m4 autoconf macros with variable expansion
Rik <rdrider0-list@yahoo.com>
parents:
10011
diff
changeset
|
2804 AC_MSG_CHECKING([whether ${LD-ld} accepts -framework $1]) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2805 AC_CACHE_VAL([octave_cv_framework_$1], |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
2806 [ac_octave_save_LDFLAGS="$LDFLAGS" |
8595
dee5d60257e4
Use Carbon framework to determine ScreenSize on Mac.
Thomas Treichl <Thomas.Treichl@gmx.net>
parents:
8169
diff
changeset
|
2807 LDFLAGS="$LDFLAGS -framework $1" |
8635
bef8f001032f
Further improvements for OCTAVE_HAVE_FRAMEWORK and the test for the MacOSX Carbon framework.
Thomas Treichl <Thomas.Treichl@gmx.net>
parents:
8595
diff
changeset
|
2808 AC_LANG_PUSH(C++) |
8595
dee5d60257e4
Use Carbon framework to determine ScreenSize on Mac.
Thomas Treichl <Thomas.Treichl@gmx.net>
parents:
8169
diff
changeset
|
2809 AC_LINK_IFELSE([AC_LANG_PROGRAM([$2], [$3])], |
8635
bef8f001032f
Further improvements for OCTAVE_HAVE_FRAMEWORK and the test for the MacOSX Carbon framework.
Thomas Treichl <Thomas.Treichl@gmx.net>
parents:
8595
diff
changeset
|
2810 eval "octave_cv_framework_$1=yes", |
bef8f001032f
Further improvements for OCTAVE_HAVE_FRAMEWORK and the test for the MacOSX Carbon framework.
Thomas Treichl <Thomas.Treichl@gmx.net>
parents:
8595
diff
changeset
|
2811 eval "octave_cv_framework_$1=no") |
bef8f001032f
Further improvements for OCTAVE_HAVE_FRAMEWORK and the test for the MacOSX Carbon framework.
Thomas Treichl <Thomas.Treichl@gmx.net>
parents:
8595
diff
changeset
|
2812 AC_LANG_POP(C++) |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
2813 LDFLAGS="$ac_octave_save_LDFLAGS" |
8595
dee5d60257e4
Use Carbon framework to determine ScreenSize on Mac.
Thomas Treichl <Thomas.Treichl@gmx.net>
parents:
8169
diff
changeset
|
2814 ]) |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
2815 if test "$octave_cv_framework_$1" = yes; then |
15319
daf74ce2afdc
m4/acinclude.m4: Use more consistent m4 quoting of arguments to macros.
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
2816 AC_MSG_RESULT([yes]) |
8635
bef8f001032f
Further improvements for OCTAVE_HAVE_FRAMEWORK and the test for the MacOSX Carbon framework.
Thomas Treichl <Thomas.Treichl@gmx.net>
parents:
8595
diff
changeset
|
2817 AC_ARG_WITH(framework-m4_tolower($1), |
17034
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2818 [AS_HELP_STRING([--without-framework-m4_tolower($1)], |
8635
bef8f001032f
Further improvements for OCTAVE_HAVE_FRAMEWORK and the test for the MacOSX Carbon framework.
Thomas Treichl <Thomas.Treichl@gmx.net>
parents:
8595
diff
changeset
|
2819 [don't use framework $1])], |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2820 with_have_framework=$withval, with_have_framework=yes) |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
2821 if test "$with_have_framework" = yes; then |
8635
bef8f001032f
Further improvements for OCTAVE_HAVE_FRAMEWORK and the test for the MacOSX Carbon framework.
Thomas Treichl <Thomas.Treichl@gmx.net>
parents:
8595
diff
changeset
|
2822 [$4] |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
2823 : |
8635
bef8f001032f
Further improvements for OCTAVE_HAVE_FRAMEWORK and the test for the MacOSX Carbon framework.
Thomas Treichl <Thomas.Treichl@gmx.net>
parents:
8595
diff
changeset
|
2824 else |
bef8f001032f
Further improvements for OCTAVE_HAVE_FRAMEWORK and the test for the MacOSX Carbon framework.
Thomas Treichl <Thomas.Treichl@gmx.net>
parents:
8595
diff
changeset
|
2825 AC_MSG_NOTICE([framework rejected by --without-framework-m4_tolower($1)]) |
bef8f001032f
Further improvements for OCTAVE_HAVE_FRAMEWORK and the test for the MacOSX Carbon framework.
Thomas Treichl <Thomas.Treichl@gmx.net>
parents:
8595
diff
changeset
|
2826 [$5] |
bef8f001032f
Further improvements for OCTAVE_HAVE_FRAMEWORK and the test for the MacOSX Carbon framework.
Thomas Treichl <Thomas.Treichl@gmx.net>
parents:
8595
diff
changeset
|
2827 fi |
8595
dee5d60257e4
Use Carbon framework to determine ScreenSize on Mac.
Thomas Treichl <Thomas.Treichl@gmx.net>
parents:
8169
diff
changeset
|
2828 else |
15319
daf74ce2afdc
m4/acinclude.m4: Use more consistent m4 quoting of arguments to macros.
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
2829 AC_MSG_RESULT([no]) |
8595
dee5d60257e4
Use Carbon framework to determine ScreenSize on Mac.
Thomas Treichl <Thomas.Treichl@gmx.net>
parents:
8169
diff
changeset
|
2830 [$5] |
dee5d60257e4
Use Carbon framework to determine ScreenSize on Mac.
Thomas Treichl <Thomas.Treichl@gmx.net>
parents:
8169
diff
changeset
|
2831 fi |
dee5d60257e4
Use Carbon framework to determine ScreenSize on Mac.
Thomas Treichl <Thomas.Treichl@gmx.net>
parents:
8169
diff
changeset
|
2832 ]) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2833 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2834 dnl Check for IEEE 754 data format. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2835 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2836 AC_DEFUN([OCTAVE_IEEE754_DATA_FORMAT], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2837 AC_MSG_CHECKING([for IEEE 754 data format]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2838 AC_CACHE_VAL([octave_cv_ieee754_data_format], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2839 [AC_RUN_IFELSE([AC_LANG_SOURCE([[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2840 int |
17034
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2841 main (void) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2842 { |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2843 typedef union { unsigned char c[8]; double d; } ieeebytes; |
17034
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2844 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2845 ieeebytes l = {0x1c, 0xbc, 0x6e, 0xf2, 0x54, 0x8b, 0x11, 0x43}; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2846 ieeebytes b = {0x43, 0x11, 0x8b, 0x54, 0xf2, 0x6e, 0xbc, 0x1c}; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2847 |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2848 return l.d != 1234567891234567.0 && b.d != 1234567891234567.0; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2849 } |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2850 ]])], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2851 octave_cv_ieee754_data_format=yes, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2852 octave_cv_ieee754_data_format=no, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2853 octave_cv_ieee754_data_format=yes) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2854 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2855 if test "$cross_compiling" = yes; then |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2856 AC_MSG_RESULT([$octave_cv_ieee754_data_format assumed for cross compilation]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2857 else |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2858 AC_MSG_RESULT([$octave_cv_ieee754_data_format]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2859 fi |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
2860 if test $octave_cv_ieee754_data_format = yes; then |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2861 AC_DEFINE(HAVE_IEEE754_DATA_FORMAT, 1, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2862 [Define to 1 if your system uses IEEE 754 data format.]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2863 else |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2864 ## If the format is unknown, then you will probably not have a |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2865 ## useful system, so we will abort here. Anyone wishing to |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2866 ## experiment with building Octave on a system without IEEE |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2867 ## floating point should be capable of removing this check and |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2868 ## the one in the octave_ieee_init function in liboctave/lo-ieee.cc. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2869 AC_MSG_ERROR([IEEE 754 data format required for building Octave]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2870 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2871 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2872 dnl |
29365
e9b7ac7031fb
Compute with NA correctly on MIPS architecture (bug #59830).
Rik <rik@octave.org>
parents:
29358
diff
changeset
|
2873 dnl Check if MIPS processor is target and quiet signalling NaN value is |
e9b7ac7031fb
Compute with NA correctly on MIPS architecture (bug #59830).
Rik <rik@octave.org>
parents:
29358
diff
changeset
|
2874 dnl opposite of IEEE 754-2008 standard used by all other architectures. |
e9b7ac7031fb
Compute with NA correctly on MIPS architecture (bug #59830).
Rik <rik@octave.org>
parents:
29358
diff
changeset
|
2875 dnl |
e9b7ac7031fb
Compute with NA correctly on MIPS architecture (bug #59830).
Rik <rik@octave.org>
parents:
29358
diff
changeset
|
2876 AC_DEFUN([OCTAVE_MIPS_NAN], [ |
e9b7ac7031fb
Compute with NA correctly on MIPS architecture (bug #59830).
Rik <rik@octave.org>
parents:
29358
diff
changeset
|
2877 AC_CACHE_CHECK([whether MIPS processor is using non-standard NaN encoding], |
e9b7ac7031fb
Compute with NA correctly on MIPS architecture (bug #59830).
Rik <rik@octave.org>
parents:
29358
diff
changeset
|
2878 [octave_cv_mips_nan], |
e9b7ac7031fb
Compute with NA correctly on MIPS architecture (bug #59830).
Rik <rik@octave.org>
parents:
29358
diff
changeset
|
2879 [AC_LANG_PUSH(C++) |
e9b7ac7031fb
Compute with NA correctly on MIPS architecture (bug #59830).
Rik <rik@octave.org>
parents:
29358
diff
changeset
|
2880 AC_RUN_IFELSE([AC_LANG_PROGRAM([[ |
e9b7ac7031fb
Compute with NA correctly on MIPS architecture (bug #59830).
Rik <rik@octave.org>
parents:
29358
diff
changeset
|
2881 #include <cmath> |
e9b7ac7031fb
Compute with NA correctly on MIPS architecture (bug #59830).
Rik <rik@octave.org>
parents:
29358
diff
changeset
|
2882 #include <limits> |
e9b7ac7031fb
Compute with NA correctly on MIPS architecture (bug #59830).
Rik <rik@octave.org>
parents:
29358
diff
changeset
|
2883 ]], [[ |
e9b7ac7031fb
Compute with NA correctly on MIPS architecture (bug #59830).
Rik <rik@octave.org>
parents:
29358
diff
changeset
|
2884 /* FIXME: Only test is that MIPS is the target architecture. |
e9b7ac7031fb
Compute with NA correctly on MIPS architecture (bug #59830).
Rik <rik@octave.org>
parents:
29358
diff
changeset
|
2885 * This should be AND'ed with a test for whether the actual NaN |
e9b7ac7031fb
Compute with NA correctly on MIPS architecture (bug #59830).
Rik <rik@octave.org>
parents:
29358
diff
changeset
|
2886 * value for the high word (LO_IEEE_NA_HW) has the value |
e9b7ac7031fb
Compute with NA correctly on MIPS architecture (bug #59830).
Rik <rik@octave.org>
parents:
29358
diff
changeset
|
2887 * 0x7FF840F4 (normal) or 0x7FF040F4 (non-standard). Template code |
e9b7ac7031fb
Compute with NA correctly on MIPS architecture (bug #59830).
Rik <rik@octave.org>
parents:
29358
diff
changeset
|
2888 * that could work is in liboctave/utils/lo-ieee.cc but it also |
e9b7ac7031fb
Compute with NA correctly on MIPS architecture (bug #59830).
Rik <rik@octave.org>
parents:
29358
diff
changeset
|
2889 * depends on knowing whether the architecture is big-endian or |
e9b7ac7031fb
Compute with NA correctly on MIPS architecture (bug #59830).
Rik <rik@octave.org>
parents:
29358
diff
changeset
|
2890 * little-endian. */ |
e9b7ac7031fb
Compute with NA correctly on MIPS architecture (bug #59830).
Rik <rik@octave.org>
parents:
29358
diff
changeset
|
2891 #if defined (__mips__) |
e9b7ac7031fb
Compute with NA correctly on MIPS architecture (bug #59830).
Rik <rik@octave.org>
parents:
29358
diff
changeset
|
2892 return (0); |
e9b7ac7031fb
Compute with NA correctly on MIPS architecture (bug #59830).
Rik <rik@octave.org>
parents:
29358
diff
changeset
|
2893 #else |
e9b7ac7031fb
Compute with NA correctly on MIPS architecture (bug #59830).
Rik <rik@octave.org>
parents:
29358
diff
changeset
|
2894 return (1); |
29366 | 2895 #endif |
29365
e9b7ac7031fb
Compute with NA correctly on MIPS architecture (bug #59830).
Rik <rik@octave.org>
parents:
29358
diff
changeset
|
2896 ]])], |
e9b7ac7031fb
Compute with NA correctly on MIPS architecture (bug #59830).
Rik <rik@octave.org>
parents:
29358
diff
changeset
|
2897 octave_cv_mips_nan=yes, |
29370
8e549734531e
Add default value to OCTAVE_MIPS_NAN configure macro for cross-compiling (bug #59830)
Rik <rik@octave.org>
parents:
29365
diff
changeset
|
2898 octave_cv_mips_nan=no, |
29365
e9b7ac7031fb
Compute with NA correctly on MIPS architecture (bug #59830).
Rik <rik@octave.org>
parents:
29358
diff
changeset
|
2899 octave_cv_mips_nan=no) |
e9b7ac7031fb
Compute with NA correctly on MIPS architecture (bug #59830).
Rik <rik@octave.org>
parents:
29358
diff
changeset
|
2900 AC_LANG_POP(C++) |
e9b7ac7031fb
Compute with NA correctly on MIPS architecture (bug #59830).
Rik <rik@octave.org>
parents:
29358
diff
changeset
|
2901 ]) |
e9b7ac7031fb
Compute with NA correctly on MIPS architecture (bug #59830).
Rik <rik@octave.org>
parents:
29358
diff
changeset
|
2902 if test $octave_cv_mips_nan = yes; then |
e9b7ac7031fb
Compute with NA correctly on MIPS architecture (bug #59830).
Rik <rik@octave.org>
parents:
29358
diff
changeset
|
2903 AC_DEFINE(HAVE_MIPS_NAN, 1, |
e9b7ac7031fb
Compute with NA correctly on MIPS architecture (bug #59830).
Rik <rik@octave.org>
parents:
29358
diff
changeset
|
2904 [Define to 1 if MIPS processor is using non-standard NaN encoding.]) |
e9b7ac7031fb
Compute with NA correctly on MIPS architecture (bug #59830).
Rik <rik@octave.org>
parents:
29358
diff
changeset
|
2905 fi |
e9b7ac7031fb
Compute with NA correctly on MIPS architecture (bug #59830).
Rik <rik@octave.org>
parents:
29358
diff
changeset
|
2906 ]) |
e9b7ac7031fb
Compute with NA correctly on MIPS architecture (bug #59830).
Rik <rik@octave.org>
parents:
29358
diff
changeset
|
2907 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2908 dnl Check for ar. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2909 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2910 AC_DEFUN([OCTAVE_PROG_AR], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2911 if test -z "$AR"; then |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2912 AR=ar |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2913 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2914 AC_SUBST(AR) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2915 |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2916 if test -z "$ARFLAGS"; then |
23402
1fadf480a63b
maint: tweak ARFLAGS and AR_FLAGS defaults and comments
Mike Miller <mtmiller@octave.org>
parents:
23400
diff
changeset
|
2917 ARFLAGS="cr" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2918 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2919 AC_SUBST(ARFLAGS) |
23400
b5ee9b985a82
Silence compile warning about 'u' modifier to ar.
Rik <rik@octave.org>
parents:
23329
diff
changeset
|
2920 |
23402
1fadf480a63b
maint: tweak ARFLAGS and AR_FLAGS defaults and comments
Mike Miller <mtmiller@octave.org>
parents:
23400
diff
changeset
|
2921 dnl FIXME: Remove when libtool updated (placed 4/15/2017). |
23400
b5ee9b985a82
Silence compile warning about 'u' modifier to ar.
Rik <rik@octave.org>
parents:
23329
diff
changeset
|
2922 dnl This silences the following unnecessary warning during compile: |
b5ee9b985a82
Silence compile warning about 'u' modifier to ar.
Rik <rik@octave.org>
parents:
23329
diff
changeset
|
2923 dnl ar: `u' modifier ignored since `D' is the default (see `U') |
b5ee9b985a82
Silence compile warning about 'u' modifier to ar.
Rik <rik@octave.org>
parents:
23329
diff
changeset
|
2924 if test -z "$AR_FLAGS"; then |
23402
1fadf480a63b
maint: tweak ARFLAGS and AR_FLAGS defaults and comments
Mike Miller <mtmiller@octave.org>
parents:
23400
diff
changeset
|
2925 AR_FLAGS="$ARFLAGS" |
23400
b5ee9b985a82
Silence compile warning about 'u' modifier to ar.
Rik <rik@octave.org>
parents:
23329
diff
changeset
|
2926 fi |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2927 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2928 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2929 dnl Check for bison. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2930 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2931 AC_DEFUN([OCTAVE_PROG_BISON], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2932 AC_PROG_YACC |
26672
df42ea23502f
build: support GNU bison 3.3, silence POSIX compatibility warning (bug #55613)
Mike Miller <mtmiller@octave.org>
parents:
26541
diff
changeset
|
2933 WARN_YFLAGS= |
16784
0fabe0f49f38
use better method to determine whether we are using flex and bison
John W. Eaton <jwe@octave.org>
parents:
16733
diff
changeset
|
2934 |
0fabe0f49f38
use better method to determine whether we are using flex and bison
John W. Eaton <jwe@octave.org>
parents:
16733
diff
changeset
|
2935 case "`$YACC --version`" in |
17197
fbee0d312af5
acinclude.m4: Remove some unnecessary double quotes around variables.
Rik <rik@octave.org>
parents:
17196
diff
changeset
|
2936 *bison*) tmp_have_bison=yes ;; |
16784
0fabe0f49f38
use better method to determine whether we are using flex and bison
John W. Eaton <jwe@octave.org>
parents:
16733
diff
changeset
|
2937 *) tmp_have_bison=no ;; |
0fabe0f49f38
use better method to determine whether we are using flex and bison
John W. Eaton <jwe@octave.org>
parents:
16733
diff
changeset
|
2938 esac |
0fabe0f49f38
use better method to determine whether we are using flex and bison
John W. Eaton <jwe@octave.org>
parents:
16733
diff
changeset
|
2939 |
17197
fbee0d312af5
acinclude.m4: Remove some unnecessary double quotes around variables.
Rik <rik@octave.org>
parents:
17196
diff
changeset
|
2940 if test $tmp_have_bison = yes; then |
26672
df42ea23502f
build: support GNU bison 3.3, silence POSIX compatibility warning (bug #55613)
Mike Miller <mtmiller@octave.org>
parents:
26541
diff
changeset
|
2941 dnl FIXME: Call GNU bison with the `-Wno-yacc` option, which works with |
df42ea23502f
build: support GNU bison 3.3, silence POSIX compatibility warning (bug #55613)
Mike Miller <mtmiller@octave.org>
parents:
26541
diff
changeset
|
2942 dnl bison 2.5 and all later versions, as recommended by the bison NEWS. |
df42ea23502f
build: support GNU bison 3.3, silence POSIX compatibility warning (bug #55613)
Mike Miller <mtmiller@octave.org>
parents:
26541
diff
changeset
|
2943 dnl This is needed as long as Octave supports Autoconf version 2.69 or |
df42ea23502f
build: support GNU bison 3.3, silence POSIX compatibility warning (bug #55613)
Mike Miller <mtmiller@octave.org>
parents:
26541
diff
changeset
|
2944 dnl older. In Autoconf 2.70, AC_PROG_YACC no longer adds the `-y` |
df42ea23502f
build: support GNU bison 3.3, silence POSIX compatibility warning (bug #55613)
Mike Miller <mtmiller@octave.org>
parents:
26541
diff
changeset
|
2945 dnl option to emulate POSIX yacc. |
df42ea23502f
build: support GNU bison 3.3, silence POSIX compatibility warning (bug #55613)
Mike Miller <mtmiller@octave.org>
parents:
26541
diff
changeset
|
2946 WARN_YFLAGS="-Wno-yacc" |
df42ea23502f
build: support GNU bison 3.3, silence POSIX compatibility warning (bug #55613)
Mike Miller <mtmiller@octave.org>
parents:
26541
diff
changeset
|
2947 |
18974
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
2948 AC_CACHE_CHECK([syntax of bison api.prefix (or name-prefix) declaration], |
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
2949 [octave_cv_bison_api_prefix_decl_style], [ |
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
2950 style="api name" |
19105
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
2951 quote="quote brace" |
18974
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
2952 for s in $style; do |
19105
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
2953 for q in $quote; do |
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
2954 if test $s = "api"; then |
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
2955 if test $q = "quote"; then |
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
2956 def='%define api.prefix "foo_"' |
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
2957 else |
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
2958 def='%define api.prefix {foo_}' |
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
2959 fi |
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
2960 else |
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
2961 if test $q = "quote"; then |
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
2962 def='%name-prefix="foo_"' |
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
2963 else |
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
2964 def='%name-prefix {foo_}' |
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
2965 fi |
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
2966 fi |
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
2967 cat << EOF > conftest.yy |
18974
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
2968 $def |
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
2969 %start input |
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
2970 %% |
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
2971 input:; |
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
2972 %% |
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
2973 EOF |
19105
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
2974 ## Older versions of bison only warn and exit with success. |
26672
df42ea23502f
build: support GNU bison 3.3, silence POSIX compatibility warning (bug #55613)
Mike Miller <mtmiller@octave.org>
parents:
26541
diff
changeset
|
2975 octave_bison_output=`$YACC $WARN_YFLAGS conftest.yy 2>&1` |
19105
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
2976 ac_status=$? |
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
2977 if test $ac_status -eq 0 && test -z "$octave_bison_output"; then |
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
2978 octave_cv_bison_api_prefix_decl_style="$s $q" |
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
2979 break |
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
2980 fi |
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
2981 done |
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
2982 if test -n "$octave_cv_bison_api_prefix_decl_style"; then |
18974
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
2983 break |
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
2984 fi |
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
2985 done |
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
2986 rm -f conftest.yy y.tab.h y.tab.c |
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
2987 ]) |
29746
7f339da6cabd
avoid possible gcc warning about C++ one definition rule (bug #60586)
John W. Eaton <jwe@octave.org>
parents:
29663
diff
changeset
|
2988 |
7f339da6cabd
avoid possible gcc warning about C++ one definition rule (bug #60586)
John W. Eaton <jwe@octave.org>
parents:
29663
diff
changeset
|
2989 AC_CACHE_CHECK([whether api.prefix applies to yysymbol_kind_t], |
7f339da6cabd
avoid possible gcc warning about C++ one definition rule (bug #60586)
John W. Eaton <jwe@octave.org>
parents:
29663
diff
changeset
|
2990 [octave_cv_bison_api_prefix_applies_to_yysymbol_kind_t], [ |
7f339da6cabd
avoid possible gcc warning about C++ one definition rule (bug #60586)
John W. Eaton <jwe@octave.org>
parents:
29663
diff
changeset
|
2991 [case "$octave_cv_bison_api_prefix_decl_style" in |
7f339da6cabd
avoid possible gcc warning about C++ one definition rule (bug #60586)
John W. Eaton <jwe@octave.org>
parents:
29663
diff
changeset
|
2992 "api brace") |
7f339da6cabd
avoid possible gcc warning about C++ one definition rule (bug #60586)
John W. Eaton <jwe@octave.org>
parents:
29663
diff
changeset
|
2993 def='%define api.prefix {PREFIX_}' |
7f339da6cabd
avoid possible gcc warning about C++ one definition rule (bug #60586)
John W. Eaton <jwe@octave.org>
parents:
29663
diff
changeset
|
2994 ;; |
7f339da6cabd
avoid possible gcc warning about C++ one definition rule (bug #60586)
John W. Eaton <jwe@octave.org>
parents:
29663
diff
changeset
|
2995 "api quote") |
7f339da6cabd
avoid possible gcc warning about C++ one definition rule (bug #60586)
John W. Eaton <jwe@octave.org>
parents:
29663
diff
changeset
|
2996 def='%define api.prefix "PREFIX_"' |
7f339da6cabd
avoid possible gcc warning about C++ one definition rule (bug #60586)
John W. Eaton <jwe@octave.org>
parents:
29663
diff
changeset
|
2997 ;; |
7f339da6cabd
avoid possible gcc warning about C++ one definition rule (bug #60586)
John W. Eaton <jwe@octave.org>
parents:
29663
diff
changeset
|
2998 "name brace") |
7f339da6cabd
avoid possible gcc warning about C++ one definition rule (bug #60586)
John W. Eaton <jwe@octave.org>
parents:
29663
diff
changeset
|
2999 def='%define name-prefix {PREFIX_}' |
7f339da6cabd
avoid possible gcc warning about C++ one definition rule (bug #60586)
John W. Eaton <jwe@octave.org>
parents:
29663
diff
changeset
|
3000 ;; |
7f339da6cabd
avoid possible gcc warning about C++ one definition rule (bug #60586)
John W. Eaton <jwe@octave.org>
parents:
29663
diff
changeset
|
3001 "name quote") |
7f339da6cabd
avoid possible gcc warning about C++ one definition rule (bug #60586)
John W. Eaton <jwe@octave.org>
parents:
29663
diff
changeset
|
3002 def='%define name-prefix "PREFIX_"' |
7f339da6cabd
avoid possible gcc warning about C++ one definition rule (bug #60586)
John W. Eaton <jwe@octave.org>
parents:
29663
diff
changeset
|
3003 ;; |
7f339da6cabd
avoid possible gcc warning about C++ one definition rule (bug #60586)
John W. Eaton <jwe@octave.org>
parents:
29663
diff
changeset
|
3004 esac] |
7f339da6cabd
avoid possible gcc warning about C++ one definition rule (bug #60586)
John W. Eaton <jwe@octave.org>
parents:
29663
diff
changeset
|
3005 cat << EOF > conftest.yy |
7f339da6cabd
avoid possible gcc warning about C++ one definition rule (bug #60586)
John W. Eaton <jwe@octave.org>
parents:
29663
diff
changeset
|
3006 $def |
7f339da6cabd
avoid possible gcc warning about C++ one definition rule (bug #60586)
John W. Eaton <jwe@octave.org>
parents:
29663
diff
changeset
|
3007 %start input |
7f339da6cabd
avoid possible gcc warning about C++ one definition rule (bug #60586)
John W. Eaton <jwe@octave.org>
parents:
29663
diff
changeset
|
3008 %% |
7f339da6cabd
avoid possible gcc warning about C++ one definition rule (bug #60586)
John W. Eaton <jwe@octave.org>
parents:
29663
diff
changeset
|
3009 input:; |
7f339da6cabd
avoid possible gcc warning about C++ one definition rule (bug #60586)
John W. Eaton <jwe@octave.org>
parents:
29663
diff
changeset
|
3010 %% |
7f339da6cabd
avoid possible gcc warning about C++ one definition rule (bug #60586)
John W. Eaton <jwe@octave.org>
parents:
29663
diff
changeset
|
3011 EOF |
7f339da6cabd
avoid possible gcc warning about C++ one definition rule (bug #60586)
John W. Eaton <jwe@octave.org>
parents:
29663
diff
changeset
|
3012 ## Older versions of bison only warn and exit with success. |
7f339da6cabd
avoid possible gcc warning about C++ one definition rule (bug #60586)
John W. Eaton <jwe@octave.org>
parents:
29663
diff
changeset
|
3013 $YACC $WARN_YFLAGS conftest.yy |
7f339da6cabd
avoid possible gcc warning about C++ one definition rule (bug #60586)
John W. Eaton <jwe@octave.org>
parents:
29663
diff
changeset
|
3014 if grep PREFIX_symbol_kind_t y.tab.c > /dev/null; then |
7f339da6cabd
avoid possible gcc warning about C++ one definition rule (bug #60586)
John W. Eaton <jwe@octave.org>
parents:
29663
diff
changeset
|
3015 octave_cv_bison_api_prefix_applies_to_yysymbol_kind_t=yes |
7f339da6cabd
avoid possible gcc warning about C++ one definition rule (bug #60586)
John W. Eaton <jwe@octave.org>
parents:
29663
diff
changeset
|
3016 else |
7f339da6cabd
avoid possible gcc warning about C++ one definition rule (bug #60586)
John W. Eaton <jwe@octave.org>
parents:
29663
diff
changeset
|
3017 octave_cv_bison_api_prefix_applies_to_yysymbol_kind_t=no |
7f339da6cabd
avoid possible gcc warning about C++ one definition rule (bug #60586)
John W. Eaton <jwe@octave.org>
parents:
29663
diff
changeset
|
3018 fi |
7f339da6cabd
avoid possible gcc warning about C++ one definition rule (bug #60586)
John W. Eaton <jwe@octave.org>
parents:
29663
diff
changeset
|
3019 rm -f conftest.yy y.tab.h y.tab.c |
7f339da6cabd
avoid possible gcc warning about C++ one definition rule (bug #60586)
John W. Eaton <jwe@octave.org>
parents:
29663
diff
changeset
|
3020 ]) |
18974
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
3021 fi |
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
3022 |
25637
e1c3d1c6e896
don't substitute api.prefix style in bison input files
John W. Eaton <jwe@octave.org>
parents:
25559
diff
changeset
|
3023 if test -z "$octave_cv_bison_api_prefix_decl_style" \ |
e1c3d1c6e896
don't substitute api.prefix style in bison input files
John W. Eaton <jwe@octave.org>
parents:
25559
diff
changeset
|
3024 || test "$octave_cv_bison_api_prefix_decl_style" != "api brace"; then |
19105
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
3025 tmp_have_bison=no |
18974
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
3026 warn_bison_api_prefix_decl_style=" |
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
3027 |
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
3028 I wasn't able to find a suitable style for declaring the api prefix |
25637
e1c3d1c6e896
don't substitute api.prefix style in bison input files
John W. Eaton <jwe@octave.org>
parents:
25559
diff
changeset
|
3029 in a bison input file so I'm disabling bison. We expect bison to |
e1c3d1c6e896
don't substitute api.prefix style in bison input files
John W. Eaton <jwe@octave.org>
parents:
25559
diff
changeset
|
3030 understand the '%define api.prefix { PREFIX }' syntax. |
18974
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
3031 " |
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
3032 OCTAVE_CONFIGURE_WARNING([warn_bison_api_prefix_decl_style]) |
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
3033 fi |
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
3034 |
17197
fbee0d312af5
acinclude.m4: Remove some unnecessary double quotes around variables.
Rik <rik@octave.org>
parents:
17196
diff
changeset
|
3035 if test $tmp_have_bison = no; then |
25310
0b253ba6eb91
avoid syntax errors in build-aux/subst scripts
John W. Eaton <jwe@octave.org>
parents:
25299
diff
changeset
|
3036 YACC='${top_srcdir}/build-aux/missing bison' |
16784
0fabe0f49f38
use better method to determine whether we are using flex and bison
John W. Eaton <jwe@octave.org>
parents:
16733
diff
changeset
|
3037 warn_bison=" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3038 |
19105
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
3039 I didn't find bison, or the version of bison that I found does not |
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
3040 support all the features that are required, but it's only a problem |
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
3041 if you need to reconstruct parse.cc, which is the case if you're |
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
3042 building from VCS sources. |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3043 " |
16784
0fabe0f49f38
use better method to determine whether we are using flex and bison
John W. Eaton <jwe@octave.org>
parents:
16733
diff
changeset
|
3044 OCTAVE_CONFIGURE_WARNING([warn_bison]) |
29746
7f339da6cabd
avoid possible gcc warning about C++ one definition rule (bug #60586)
John W. Eaton <jwe@octave.org>
parents:
29663
diff
changeset
|
3045 |
16784
0fabe0f49f38
use better method to determine whether we are using flex and bison
John W. Eaton <jwe@octave.org>
parents:
16733
diff
changeset
|
3046 fi |
29746
7f339da6cabd
avoid possible gcc warning about C++ one definition rule (bug #60586)
John W. Eaton <jwe@octave.org>
parents:
29663
diff
changeset
|
3047 if test "$octave_cv_bison_api_prefix_applies_to_yysymbol_kind_t" = no; then |
7f339da6cabd
avoid possible gcc warning about C++ one definition rule (bug #60586)
John W. Eaton <jwe@octave.org>
parents:
29663
diff
changeset
|
3048 OCTAVE_PARSER_CPPFLAGS="-Dyysymbol_kind_t=octave_symbol_kind_t" |
7f339da6cabd
avoid possible gcc warning about C++ one definition rule (bug #60586)
John W. Eaton <jwe@octave.org>
parents:
29663
diff
changeset
|
3049 OCTAVE_TEX_PARSER_CPPFLAGS="-Dyysymbol_kind_t=octave_tex_symbol_kind_t" |
7f339da6cabd
avoid possible gcc warning about C++ one definition rule (bug #60586)
John W. Eaton <jwe@octave.org>
parents:
29663
diff
changeset
|
3050 fi |
7f339da6cabd
avoid possible gcc warning about C++ one definition rule (bug #60586)
John W. Eaton <jwe@octave.org>
parents:
29663
diff
changeset
|
3051 AC_SUBST(OCTAVE_PARSER_CPPFLAGS) |
7f339da6cabd
avoid possible gcc warning about C++ one definition rule (bug #60586)
John W. Eaton <jwe@octave.org>
parents:
29663
diff
changeset
|
3052 AC_SUBST(OCTAVE_TEX_PARSER_CPPFLAGS) |
26672
df42ea23502f
build: support GNU bison 3.3, silence POSIX compatibility warning (bug #55613)
Mike Miller <mtmiller@octave.org>
parents:
26541
diff
changeset
|
3053 AC_SUBST(WARN_YFLAGS) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3054 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3055 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3056 dnl Find find program. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3057 dnl |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
3058 ## Prefer GNU find if found. |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3059 AN_MAKEVAR([FIND], [OCTAVE_PROG_FIND]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3060 AN_PROGRAM([gfind], [OCTAVE_PROG_FIND]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3061 AN_PROGRAM([find], [OCTAVE_PROG_FIND]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3062 AC_DEFUN([OCTAVE_PROG_FIND], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3063 AC_CHECK_PROGS(FIND, [gfind find]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3064 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3065 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3066 dnl Check for flex. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3067 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3068 AC_DEFUN([OCTAVE_PROG_FLEX], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3069 ## For now, don't define LEXLIB to be -lfl -- we don't use anything in |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3070 ## it, and it might not be installed. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3071 ## |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3072 ## Also make sure that we generate an interactive scanner if we are |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3073 ## using flex. |
29661
9e670ec38513
* acinclude.m4 (OCTAVE_PROG_FLEX): Pass noyywrap to AC_PROG_LEX. (bug #60601)
John W. Eaton <jwe@octave.org>
parents:
29647
diff
changeset
|
3074 dnl We declare %noyywrap in the lexer files so we use the noyywrap |
9e670ec38513
* acinclude.m4 (OCTAVE_PROG_FLEX): Pass noyywrap to AC_PROG_LEX. (bug #60601)
John W. Eaton <jwe@octave.org>
parents:
29647
diff
changeset
|
3075 dnl option here to skip the search for that function. |
9e670ec38513
* acinclude.m4 (OCTAVE_PROG_FLEX): Pass noyywrap to AC_PROG_LEX. (bug #60601)
John W. Eaton <jwe@octave.org>
parents:
29647
diff
changeset
|
3076 AC_PROG_LEX([noyywrap]) |
16784
0fabe0f49f38
use better method to determine whether we are using flex and bison
John W. Eaton <jwe@octave.org>
parents:
16733
diff
changeset
|
3077 case "`$LEX --version`" in |
0fabe0f49f38
use better method to determine whether we are using flex and bison
John W. Eaton <jwe@octave.org>
parents:
16733
diff
changeset
|
3078 *flex*) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3079 LFLAGS="-I" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3080 AC_MSG_RESULT([defining LFLAGS to be $LFLAGS]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3081 LEXLIB= |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3082 ;; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3083 *) |
25310
0b253ba6eb91
avoid syntax errors in build-aux/subst scripts
John W. Eaton <jwe@octave.org>
parents:
25299
diff
changeset
|
3084 LEX='${top_srcdir}/build-aux/missing flex' |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3085 warn_flex=" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3086 |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3087 I didn't find flex, but it's only a problem if you need to reconstruct |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3088 lex.cc, which is the case if you're building from VCS sources. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3089 " |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3090 OCTAVE_CONFIGURE_WARNING([warn_flex]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3091 ;; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3092 esac |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3093 AC_SUBST(LFLAGS) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3094 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3095 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3096 dnl Check for ghostscript. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3097 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3098 AC_DEFUN([OCTAVE_PROG_GHOSTSCRIPT], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3099 case "$canonical_host_type" in |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3100 *-*-mingw* | *-*-msdosmsvc) |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
3101 ac_octave_gs_names="gswin32c gs mgs" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3102 ;; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3103 *) |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
3104 ac_octave_gs_names="gs" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3105 ;; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3106 esac |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
3107 AC_CHECK_PROGS(GHOSTSCRIPT, [$ac_octave_gs_names]) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3108 if test -z "$GHOSTSCRIPT"; then |
25310
0b253ba6eb91
avoid syntax errors in build-aux/subst scripts
John W. Eaton <jwe@octave.org>
parents:
25299
diff
changeset
|
3109 GHOSTSCRIPT='${top_srcdir}/build-aux/missing gs' |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3110 warn_ghostscript=" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3111 |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3112 I didn't find ghostscript, so reconstructing figures for the manual |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3113 will fail, and saving graphics in some output formats will fail when |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3114 using Octave |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3115 " |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3116 OCTAVE_CONFIGURE_WARNING([warn_ghostscript]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3117 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3118 AC_SUBST(GHOSTSCRIPT) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3119 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3120 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3121 dnl Check for gnuplot. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3122 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3123 AC_DEFUN([OCTAVE_PROG_GNUPLOT], [ |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
3124 ac_octave_gp_names="gnuplot" |
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
3125 ac_octave_gp_default="gnuplot" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3126 if test "$cross_compiling" = yes; then |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
3127 GNUPLOT="$ac_octave_gp_default" |
26071
658153e1976d
Fix failing BIST tests and oddities when gnuplot is not present (bug #55023).
Rik <rik@octave.org>
parents:
25843
diff
changeset
|
3128 GNUPLOT_BINARY=$GNUPLOT |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3129 AC_MSG_RESULT([assuming $GNUPLOT exists on $canonical_host_type host]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3130 else |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
3131 AC_CHECK_PROGS(GNUPLOT, [$ac_octave_gp_names]) |
26071
658153e1976d
Fix failing BIST tests and oddities when gnuplot is not present (bug #55023).
Rik <rik@octave.org>
parents:
25843
diff
changeset
|
3132 GNUPLOT_BINARY=$GNUPLOT |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3133 if test -z "$GNUPLOT"; then |
26071
658153e1976d
Fix failing BIST tests and oddities when gnuplot is not present (bug #55023).
Rik <rik@octave.org>
parents:
25843
diff
changeset
|
3134 GNUPLOT="$ac_octave_gp_default" |
658153e1976d
Fix failing BIST tests and oddities when gnuplot is not present (bug #55023).
Rik <rik@octave.org>
parents:
25843
diff
changeset
|
3135 GNUPLOT_BINARY="" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3136 warn_gnuplot=" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3137 |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3138 gnuplot not found. It isn't necessary to have gnuplot installed, but |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3139 without native graphics or gnuplot you won't be able to use any of |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3140 Octave's plotting commands. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3141 " |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3142 OCTAVE_CONFIGURE_WARNING([warn_gnuplot]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3143 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3144 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3145 AC_SUBST(GNUPLOT) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3146 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3147 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3148 dnl Check for gperf. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3149 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3150 AC_DEFUN([OCTAVE_PROG_GPERF], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3151 AC_CHECK_PROG(GPERF, gperf, gperf, []) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3152 if test -z "$GPERF"; then |
25310
0b253ba6eb91
avoid syntax errors in build-aux/subst scripts
John W. Eaton <jwe@octave.org>
parents:
25299
diff
changeset
|
3153 GPERF='${top_srcdir}/build-aux/missing gperf' |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3154 warn_gperf=" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3155 |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3156 I didn't find gperf, but it's only a problem if you need to |
17034
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
3157 reconstruct oct-gperf.h |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3158 " |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3159 OCTAVE_CONFIGURE_WARNING([warn_gperf]) |
25310
0b253ba6eb91
avoid syntax errors in build-aux/subst scripts
John W. Eaton <jwe@octave.org>
parents:
25299
diff
changeset
|
3160 GPERF='${top_srcdir}/build-aux/missing gperf' |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3161 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3162 AC_SUBST(GPERF) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3163 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3164 dnl |
19744
1687269e31e4
build: Generate Octave logo icons from SVG source (bug #37062)
Mike Miller <mtmiller@ieee.org>
parents:
19697
diff
changeset
|
3165 dnl Find icotool program. |
1687269e31e4
build: Generate Octave logo icons from SVG source (bug #37062)
Mike Miller <mtmiller@ieee.org>
parents:
19697
diff
changeset
|
3166 dnl |
1687269e31e4
build: Generate Octave logo icons from SVG source (bug #37062)
Mike Miller <mtmiller@ieee.org>
parents:
19697
diff
changeset
|
3167 AC_DEFUN([OCTAVE_PROG_ICOTOOL], [ |
1687269e31e4
build: Generate Octave logo icons from SVG source (bug #37062)
Mike Miller <mtmiller@ieee.org>
parents:
19697
diff
changeset
|
3168 AC_CHECK_PROG(ICOTOOL, icotool, icotool, []) |
19753
bc2a8db22831
build: Use the missing script for icotool and rsvg-convert
Mike Miller <mtmiller@ieee.org>
parents:
19744
diff
changeset
|
3169 if test -z "$ICOTOOL"; then |
25310
0b253ba6eb91
avoid syntax errors in build-aux/subst scripts
John W. Eaton <jwe@octave.org>
parents:
25299
diff
changeset
|
3170 ICOTOOL='${top_srcdir}/build-aux/missing icotool' |
19753
bc2a8db22831
build: Use the missing script for icotool and rsvg-convert
Mike Miller <mtmiller@ieee.org>
parents:
19744
diff
changeset
|
3171 warn_icotool=" |
bc2a8db22831
build: Use the missing script for icotool and rsvg-convert
Mike Miller <mtmiller@ieee.org>
parents:
19744
diff
changeset
|
3172 |
bc2a8db22831
build: Use the missing script for icotool and rsvg-convert
Mike Miller <mtmiller@ieee.org>
parents:
19744
diff
changeset
|
3173 I didn't find icotool, but it's only a problem if you need to |
bc2a8db22831
build: Use the missing script for icotool and rsvg-convert
Mike Miller <mtmiller@ieee.org>
parents:
19744
diff
changeset
|
3174 reconstruct octave-logo.ico, which is the case if you're building from |
bc2a8db22831
build: Use the missing script for icotool and rsvg-convert
Mike Miller <mtmiller@ieee.org>
parents:
19744
diff
changeset
|
3175 VCS sources. |
bc2a8db22831
build: Use the missing script for icotool and rsvg-convert
Mike Miller <mtmiller@ieee.org>
parents:
19744
diff
changeset
|
3176 " |
bc2a8db22831
build: Use the missing script for icotool and rsvg-convert
Mike Miller <mtmiller@ieee.org>
parents:
19744
diff
changeset
|
3177 OCTAVE_CONFIGURE_WARNING([warn_icotool]) |
bc2a8db22831
build: Use the missing script for icotool and rsvg-convert
Mike Miller <mtmiller@ieee.org>
parents:
19744
diff
changeset
|
3178 fi |
19744
1687269e31e4
build: Generate Octave logo icons from SVG source (bug #37062)
Mike Miller <mtmiller@ieee.org>
parents:
19697
diff
changeset
|
3179 AC_SUBST(ICOTOOL) |
1687269e31e4
build: Generate Octave logo icons from SVG source (bug #37062)
Mike Miller <mtmiller@ieee.org>
parents:
19697
diff
changeset
|
3180 ]) |
1687269e31e4
build: Generate Octave logo icons from SVG source (bug #37062)
Mike Miller <mtmiller@ieee.org>
parents:
19697
diff
changeset
|
3181 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3182 dnl Check for makeinfo. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3183 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3184 AC_DEFUN([OCTAVE_PROG_MAKEINFO], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3185 dnl use MKINFO, not MAKEINFO, for variable name because Automake |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3186 dnl automatically defines a value for MAKEINFO even when it does not |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3187 dnl exist which will then fool the 'test -z' line. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3188 AC_CHECK_PROG(MKINFO, makeinfo, makeinfo, []) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3189 if test -z "$MKINFO"; then |
16012
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15969
diff
changeset
|
3190 warn_makeinfo=" |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15969
diff
changeset
|
3191 |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15969
diff
changeset
|
3192 I didn't find makeinfo, which is required for reading documentation. |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15969
diff
changeset
|
3193 You may install a copy later for Octave to use. |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15969
diff
changeset
|
3194 " |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15969
diff
changeset
|
3195 OCTAVE_CONFIGURE_WARNING([warn_makeinfo]) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3196 fi |
24623
f39ae754a7d8
configure: test that makeinfo supports the @sortas command
Mike Miller <mtmiller@octave.org>
parents:
24534
diff
changeset
|
3197 dnl If we have a GNU makeinfo program, see if it supports the @sortas command |
f39ae754a7d8
configure: test that makeinfo supports the @sortas command
Mike Miller <mtmiller@octave.org>
parents:
24534
diff
changeset
|
3198 dnl for defining a custom sort key for an index entry. |
f39ae754a7d8
configure: test that makeinfo supports the @sortas command
Mike Miller <mtmiller@octave.org>
parents:
24534
diff
changeset
|
3199 if test -n "$MKINFO"; then |
f39ae754a7d8
configure: test that makeinfo supports the @sortas command
Mike Miller <mtmiller@octave.org>
parents:
24534
diff
changeset
|
3200 AC_CACHE_CHECK([for makeinfo support for @sortas command], |
f39ae754a7d8
configure: test that makeinfo supports the @sortas command
Mike Miller <mtmiller@octave.org>
parents:
24534
diff
changeset
|
3201 [octave_cv_makeinfo_sortas_command], |
f39ae754a7d8
configure: test that makeinfo supports the @sortas command
Mike Miller <mtmiller@octave.org>
parents:
24534
diff
changeset
|
3202 [cat << EOF > conftest.texi |
f39ae754a7d8
configure: test that makeinfo supports the @sortas command
Mike Miller <mtmiller@octave.org>
parents:
24534
diff
changeset
|
3203 \input texinfo |
f39ae754a7d8
configure: test that makeinfo supports the @sortas command
Mike Miller <mtmiller@octave.org>
parents:
24534
diff
changeset
|
3204 @node Top |
f39ae754a7d8
configure: test that makeinfo supports the @sortas command
Mike Miller <mtmiller@octave.org>
parents:
24534
diff
changeset
|
3205 @top Document |
f39ae754a7d8
configure: test that makeinfo supports the @sortas command
Mike Miller <mtmiller@octave.org>
parents:
24534
diff
changeset
|
3206 @menu |
f39ae754a7d8
configure: test that makeinfo supports the @sortas command
Mike Miller <mtmiller@octave.org>
parents:
24534
diff
changeset
|
3207 * Chapter:: |
f39ae754a7d8
configure: test that makeinfo supports the @sortas command
Mike Miller <mtmiller@octave.org>
parents:
24534
diff
changeset
|
3208 * Index:: |
f39ae754a7d8
configure: test that makeinfo supports the @sortas command
Mike Miller <mtmiller@octave.org>
parents:
24534
diff
changeset
|
3209 @end menu |
f39ae754a7d8
configure: test that makeinfo supports the @sortas command
Mike Miller <mtmiller@octave.org>
parents:
24534
diff
changeset
|
3210 @node Chapter |
f39ae754a7d8
configure: test that makeinfo supports the @sortas command
Mike Miller <mtmiller@octave.org>
parents:
24534
diff
changeset
|
3211 @chapter Chapter |
f39ae754a7d8
configure: test that makeinfo supports the @sortas command
Mike Miller <mtmiller@octave.org>
parents:
24534
diff
changeset
|
3212 @cindex @sortas{a} foo |
f39ae754a7d8
configure: test that makeinfo supports the @sortas command
Mike Miller <mtmiller@octave.org>
parents:
24534
diff
changeset
|
3213 @node Index |
f39ae754a7d8
configure: test that makeinfo supports the @sortas command
Mike Miller <mtmiller@octave.org>
parents:
24534
diff
changeset
|
3214 @unnumbered Index |
f39ae754a7d8
configure: test that makeinfo supports the @sortas command
Mike Miller <mtmiller@octave.org>
parents:
24534
diff
changeset
|
3215 @printindex cp |
f39ae754a7d8
configure: test that makeinfo supports the @sortas command
Mike Miller <mtmiller@octave.org>
parents:
24534
diff
changeset
|
3216 @bye |
f39ae754a7d8
configure: test that makeinfo supports the @sortas command
Mike Miller <mtmiller@octave.org>
parents:
24534
diff
changeset
|
3217 EOF |
f39ae754a7d8
configure: test that makeinfo supports the @sortas command
Mike Miller <mtmiller@octave.org>
parents:
24534
diff
changeset
|
3218 if $MKINFO --no-warn conftest.texi 2>/dev/null; then |
f39ae754a7d8
configure: test that makeinfo supports the @sortas command
Mike Miller <mtmiller@octave.org>
parents:
24534
diff
changeset
|
3219 octave_cv_makeinfo_sortas_command=yes |
f39ae754a7d8
configure: test that makeinfo supports the @sortas command
Mike Miller <mtmiller@octave.org>
parents:
24534
diff
changeset
|
3220 else |
f39ae754a7d8
configure: test that makeinfo supports the @sortas command
Mike Miller <mtmiller@octave.org>
parents:
24534
diff
changeset
|
3221 octave_cv_makeinfo_sortas_command=no |
f39ae754a7d8
configure: test that makeinfo supports the @sortas command
Mike Miller <mtmiller@octave.org>
parents:
24534
diff
changeset
|
3222 fi |
f39ae754a7d8
configure: test that makeinfo supports the @sortas command
Mike Miller <mtmiller@octave.org>
parents:
24534
diff
changeset
|
3223 rm -f conftest.info conftest.texi |
f39ae754a7d8
configure: test that makeinfo supports the @sortas command
Mike Miller <mtmiller@octave.org>
parents:
24534
diff
changeset
|
3224 ]) |
f39ae754a7d8
configure: test that makeinfo supports the @sortas command
Mike Miller <mtmiller@octave.org>
parents:
24534
diff
changeset
|
3225 if test $octave_cv_makeinfo_sortas_command = no; then |
f39ae754a7d8
configure: test that makeinfo supports the @sortas command
Mike Miller <mtmiller@octave.org>
parents:
24534
diff
changeset
|
3226 warn_makeinfo=" |
f39ae754a7d8
configure: test that makeinfo supports the @sortas command
Mike Miller <mtmiller@octave.org>
parents:
24534
diff
changeset
|
3227 |
f39ae754a7d8
configure: test that makeinfo supports the @sortas command
Mike Miller <mtmiller@octave.org>
parents:
24534
diff
changeset
|
3228 I wasn't able to find a version of GNU makeinfo that supports the |
f39ae754a7d8
configure: test that makeinfo supports the @sortas command
Mike Miller <mtmiller@octave.org>
parents:
24534
diff
changeset
|
3229 @sortas command, but it's only a problem if you need to build the |
f39ae754a7d8
configure: test that makeinfo supports the @sortas command
Mike Miller <mtmiller@octave.org>
parents:
24534
diff
changeset
|
3230 manual, which is the case if you're building from VCS sources. |
f39ae754a7d8
configure: test that makeinfo supports the @sortas command
Mike Miller <mtmiller@octave.org>
parents:
24534
diff
changeset
|
3231 " |
f39ae754a7d8
configure: test that makeinfo supports the @sortas command
Mike Miller <mtmiller@octave.org>
parents:
24534
diff
changeset
|
3232 OCTAVE_CONFIGURE_WARNING([warn_makeinfo]) |
f39ae754a7d8
configure: test that makeinfo supports the @sortas command
Mike Miller <mtmiller@octave.org>
parents:
24534
diff
changeset
|
3233 fi |
f39ae754a7d8
configure: test that makeinfo supports the @sortas command
Mike Miller <mtmiller@octave.org>
parents:
24534
diff
changeset
|
3234 fi |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3235 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3236 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3237 dnl What pager should we use? |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3238 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3239 AC_DEFUN([OCTAVE_PROG_PAGER], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3240 if test "$cross_compiling" = yes; then |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3241 DEFAULT_PAGER=less |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3242 AC_MSG_RESULT([assuming $DEFAULT_PAGER exists on $canonical_host_type host]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3243 AC_SUBST(DEFAULT_PAGER) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3244 else |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
3245 ac_octave_possible_pagers="less more page pg" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3246 case "$canonical_host_type" in |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3247 *-*-cygwin* | *-*-mingw32* | *-*-msdosmsvc) |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
3248 ac_octave_possible_pagers="$ac_octave_possible_pagers more.com" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3249 ;; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3250 esac |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3251 |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
3252 AC_CHECK_PROGS(DEFAULT_PAGER, [$ac_octave_possible_pagers], []) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3253 if test -z "$DEFAULT_PAGER"; then |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3254 warn_less="I couldn't find \`less', \`more', \`page', or \`pg'" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3255 OCTAVE_CONFIGURE_WARNING([warn_less]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3256 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3257 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3258 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3259 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3260 dnl Find Perl program. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3261 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3262 AC_DEFUN([OCTAVE_PROG_PERL], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3263 AC_CHECK_PROG(PERL, perl, perl, []) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3264 AC_SUBST(PERL) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3265 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3266 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3267 dnl Find Python program. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3268 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3269 AC_DEFUN([OCTAVE_PROG_PYTHON], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3270 AC_CHECK_PROG(PYTHON, python, python, []) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3271 AC_SUBST(PYTHON) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3272 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3273 dnl |
19744
1687269e31e4
build: Generate Octave logo icons from SVG source (bug #37062)
Mike Miller <mtmiller@ieee.org>
parents:
19697
diff
changeset
|
3274 dnl Find rsvg-convert program. |
1687269e31e4
build: Generate Octave logo icons from SVG source (bug #37062)
Mike Miller <mtmiller@ieee.org>
parents:
19697
diff
changeset
|
3275 dnl |
1687269e31e4
build: Generate Octave logo icons from SVG source (bug #37062)
Mike Miller <mtmiller@ieee.org>
parents:
19697
diff
changeset
|
3276 AC_DEFUN([OCTAVE_PROG_RSVG_CONVERT], [ |
1687269e31e4
build: Generate Octave logo icons from SVG source (bug #37062)
Mike Miller <mtmiller@ieee.org>
parents:
19697
diff
changeset
|
3277 AC_CHECK_PROG(RSVG_CONVERT, rsvg-convert, rsvg-convert, []) |
19753
bc2a8db22831
build: Use the missing script for icotool and rsvg-convert
Mike Miller <mtmiller@ieee.org>
parents:
19744
diff
changeset
|
3278 if test -z "$RSVG_CONVERT"; then |
25310
0b253ba6eb91
avoid syntax errors in build-aux/subst scripts
John W. Eaton <jwe@octave.org>
parents:
25299
diff
changeset
|
3279 RSVG_CONVERT='${top_srcdir}/build-aux/missing rsvg-convert' |
19753
bc2a8db22831
build: Use the missing script for icotool and rsvg-convert
Mike Miller <mtmiller@ieee.org>
parents:
19744
diff
changeset
|
3280 warn_rsvg_convert=" |
bc2a8db22831
build: Use the missing script for icotool and rsvg-convert
Mike Miller <mtmiller@ieee.org>
parents:
19744
diff
changeset
|
3281 |
bc2a8db22831
build: Use the missing script for icotool and rsvg-convert
Mike Miller <mtmiller@ieee.org>
parents:
19744
diff
changeset
|
3282 I didn't find rsvg-convert, but it's only a problem if you need to |
bc2a8db22831
build: Use the missing script for icotool and rsvg-convert
Mike Miller <mtmiller@ieee.org>
parents:
19744
diff
changeset
|
3283 reconstruct octave-logo-*.png, which is the case if you're building |
bc2a8db22831
build: Use the missing script for icotool and rsvg-convert
Mike Miller <mtmiller@ieee.org>
parents:
19744
diff
changeset
|
3284 from VCS sources. |
bc2a8db22831
build: Use the missing script for icotool and rsvg-convert
Mike Miller <mtmiller@ieee.org>
parents:
19744
diff
changeset
|
3285 " |
bc2a8db22831
build: Use the missing script for icotool and rsvg-convert
Mike Miller <mtmiller@ieee.org>
parents:
19744
diff
changeset
|
3286 OCTAVE_CONFIGURE_WARNING([warn_rsvg_convert]) |
bc2a8db22831
build: Use the missing script for icotool and rsvg-convert
Mike Miller <mtmiller@ieee.org>
parents:
19744
diff
changeset
|
3287 fi |
19744
1687269e31e4
build: Generate Octave logo icons from SVG source (bug #37062)
Mike Miller <mtmiller@ieee.org>
parents:
19697
diff
changeset
|
3288 AC_SUBST(RSVG_CONVERT) |
1687269e31e4
build: Generate Octave logo icons from SVG source (bug #37062)
Mike Miller <mtmiller@ieee.org>
parents:
19697
diff
changeset
|
3289 ]) |
1687269e31e4
build: Generate Octave logo icons from SVG source (bug #37062)
Mike Miller <mtmiller@ieee.org>
parents:
19697
diff
changeset
|
3290 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3291 dnl Find sed program. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3292 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3293 # Check for a fully-functional sed program, that truncates |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3294 # as few characters as possible and that supports "\(X\|Y\)" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3295 # style regular expression alternation. Prefer GNU sed if found. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3296 AC_DEFUN([OCTAVE_PROG_SED], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3297 AC_MSG_CHECKING([for a usable sed]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3298 if test -z "$SED"; then |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3299 AC_CACHE_VAL([octave_cv_prog_sed], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3300 [# Loop through the user's path and search for sed and gsed. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3301 # Next, test potential sed programs in list for truncation. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3302 _AS_PATH_WALK([$PATH], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3303 [for ac_prog in sed gsed; do |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3304 for ac_exec_ext in '' $ac_executable_extensions; do |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3305 if AS_EXECUTABLE_P(["$as_dir/$ac_prog$ac_exec_ext"]); then |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3306 _sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3307 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3308 done |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3309 done |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3310 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3311 AS_TMPDIR(sed) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3312 _max=0 |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3313 _count=0 |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3314 # Add /usr/xpg4/bin/sed as it is typically found on Solaris |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3315 # along with /bin/sed that truncates output. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3316 for _sed in $_sed_list /usr/xpg4/bin/sed; do |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3317 test ! -f ${_sed} && break |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3318 cat /dev/null > "$tmp/sed.in" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3319 _count=0 |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3320 echo $ECHO_N "0123456789$ECHO_C" >"$tmp/sed.in" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3321 # Check for GNU sed and select it if it is found. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3322 if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3323 octave_cv_prog_sed=${_sed} |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3324 break; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3325 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3326 # Reject if RE alternation is not handled. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3327 if test "`echo 'this and that' | ${_sed} -n 's/\(this\|that\).*$/\1/p'`" != "this"; then |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3328 continue; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3329 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3330 while true; do |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3331 cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3332 mv "$tmp/sed.tmp" "$tmp/sed.in" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3333 cp "$tmp/sed.in" "$tmp/sed.nl" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3334 echo >>"$tmp/sed.nl" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3335 ${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3336 cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3337 # 10000 chars as input seems more than enough |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3338 test $_count -gt 10 && break |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3339 _count=`expr $_count + 1` |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3340 if test $_count -gt $_max; then |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3341 _max=$_count |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3342 octave_cv_prog_sed=$_sed |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3343 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3344 done |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3345 done |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3346 rm -rf "$tmp" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3347 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3348 SED=$octave_cv_prog_sed |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3349 if test -z "$SED"; then |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3350 AC_MSG_ERROR([no usable version of sed found]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3351 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3352 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3353 AC_SUBST(SED) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3354 AC_MSG_RESULT([$SED]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3355 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3356 dnl |
24077
e483dcb5777d
build the source distribution archives reproducibly
Mike Miller <mtmiller@octave.org>
parents:
24022
diff
changeset
|
3357 dnl Check for options that can be passed to tar to make archives reproducible. |
e483dcb5777d
build the source distribution archives reproducibly
Mike Miller <mtmiller@octave.org>
parents:
24022
diff
changeset
|
3358 dnl |
e483dcb5777d
build the source distribution archives reproducibly
Mike Miller <mtmiller@octave.org>
parents:
24022
diff
changeset
|
3359 AC_DEFUN([OCTAVE_PROG_TAR_REPRODUCIBLE], [ |
e483dcb5777d
build the source distribution archives reproducibly
Mike Miller <mtmiller@octave.org>
parents:
24022
diff
changeset
|
3360 AC_MSG_CHECKING([for options to make reproducible archives with GNU tar]) |
e483dcb5777d
build the source distribution archives reproducibly
Mike Miller <mtmiller@octave.org>
parents:
24022
diff
changeset
|
3361 dnl This uses Automake's logic for finding GNU tar under various names |
e483dcb5777d
build the source distribution archives reproducibly
Mike Miller <mtmiller@octave.org>
parents:
24022
diff
changeset
|
3362 for octave_tar in tar gnutar gtar :; do |
e483dcb5777d
build the source distribution archives reproducibly
Mike Miller <mtmiller@octave.org>
parents:
24022
diff
changeset
|
3363 $octave_tar --version >/dev/null 2>&1 && break |
e483dcb5777d
build the source distribution archives reproducibly
Mike Miller <mtmiller@octave.org>
parents:
24022
diff
changeset
|
3364 done |
e483dcb5777d
build the source distribution archives reproducibly
Mike Miller <mtmiller@octave.org>
parents:
24022
diff
changeset
|
3365 dnl If we have a valid GNU tar program, see if it supports sets of options |
e483dcb5777d
build the source distribution archives reproducibly
Mike Miller <mtmiller@octave.org>
parents:
24022
diff
changeset
|
3366 if test x"$octave_tar" != x:; then |
e483dcb5777d
build the source distribution archives reproducibly
Mike Miller <mtmiller@octave.org>
parents:
24022
diff
changeset
|
3367 octave_tar_flags= |
e483dcb5777d
build the source distribution archives reproducibly
Mike Miller <mtmiller@octave.org>
parents:
24022
diff
changeset
|
3368 echo > conftest.txt |
e483dcb5777d
build the source distribution archives reproducibly
Mike Miller <mtmiller@octave.org>
parents:
24022
diff
changeset
|
3369 for octave_tar_flag in --owner=0 --group=0 --numeric-owner --sort=name; do |
e483dcb5777d
build the source distribution archives reproducibly
Mike Miller <mtmiller@octave.org>
parents:
24022
diff
changeset
|
3370 $octave_tar -cf conftest.tar $octave_tar_flags $octave_tar_flag conftest.txt 2>/dev/null |
e483dcb5777d
build the source distribution archives reproducibly
Mike Miller <mtmiller@octave.org>
parents:
24022
diff
changeset
|
3371 if test $? -eq 0; then |
e483dcb5777d
build the source distribution archives reproducibly
Mike Miller <mtmiller@octave.org>
parents:
24022
diff
changeset
|
3372 octave_tar_flags="${octave_tar_flags:+$octave_tar_flags }$octave_tar_flag" |
e483dcb5777d
build the source distribution archives reproducibly
Mike Miller <mtmiller@octave.org>
parents:
24022
diff
changeset
|
3373 fi |
e483dcb5777d
build the source distribution archives reproducibly
Mike Miller <mtmiller@octave.org>
parents:
24022
diff
changeset
|
3374 done |
e483dcb5777d
build the source distribution archives reproducibly
Mike Miller <mtmiller@octave.org>
parents:
24022
diff
changeset
|
3375 rm -f conftest.tar conftest.txt |
e483dcb5777d
build the source distribution archives reproducibly
Mike Miller <mtmiller@octave.org>
parents:
24022
diff
changeset
|
3376 REPRODUCIBLE_TAR_FLAGS="$octave_tar_flags" |
e483dcb5777d
build the source distribution archives reproducibly
Mike Miller <mtmiller@octave.org>
parents:
24022
diff
changeset
|
3377 fi |
e483dcb5777d
build the source distribution archives reproducibly
Mike Miller <mtmiller@octave.org>
parents:
24022
diff
changeset
|
3378 AC_SUBST(REPRODUCIBLE_TAR_FLAGS) |
e483dcb5777d
build the source distribution archives reproducibly
Mike Miller <mtmiller@octave.org>
parents:
24022
diff
changeset
|
3379 AC_MSG_RESULT([$REPRODUCIBLE_TAR_FLAGS]) |
e483dcb5777d
build the source distribution archives reproducibly
Mike Miller <mtmiller@octave.org>
parents:
24022
diff
changeset
|
3380 ]) |
e483dcb5777d
build the source distribution archives reproducibly
Mike Miller <mtmiller@octave.org>
parents:
24022
diff
changeset
|
3381 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3382 dnl Check for texi2dvi. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3383 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3384 AC_DEFUN([OCTAVE_PROG_TEXI2DVI], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3385 AC_CHECK_PROG(TEXI2DVI, texi2dvi, texi2dvi, []) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3386 if test -z "$TEXI2DVI"; then |
25310
0b253ba6eb91
avoid syntax errors in build-aux/subst scripts
John W. Eaton <jwe@octave.org>
parents:
25299
diff
changeset
|
3387 TEXI2DVI='${top_srcdir}/build-aux/missing texi2dvi' |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3388 warn_texi2dvi=" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3389 |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3390 I didn't find texi2dvi, but it's only a problem if you need to |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3391 reconstruct the DVI version of the manual |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3392 " |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3393 OCTAVE_CONFIGURE_WARNING([warn_texi2dvi]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3394 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3395 AC_SUBST(TEXI2DVI) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3396 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3397 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3398 dnl Check for texi2pdf. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3399 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3400 AC_DEFUN([OCTAVE_PROG_TEXI2PDF], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3401 AC_REQUIRE([OCTAVE_PROG_TEXI2DVI]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3402 AC_CHECK_PROG(TEXI2PDF, texi2pdf, texi2pdf, []) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3403 if test -z "$TEXI2PDF"; then |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16012
diff
changeset
|
3404 ac_octave_texi2pdf_missing=yes; |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3405 if test -n "$TEXI2DVI"; then |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3406 TEXI2PDF="$TEXI2DVI --pdf" |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16012
diff
changeset
|
3407 ac_octave_texi2pdf_missing=no; |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3408 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3409 else |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16012
diff
changeset
|
3410 ac_octave_texi2pdf_missing=no; |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3411 fi |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16012
diff
changeset
|
3412 if test $ac_octave_texi2pdf_missing = yes; then |
25310
0b253ba6eb91
avoid syntax errors in build-aux/subst scripts
John W. Eaton <jwe@octave.org>
parents:
25299
diff
changeset
|
3413 TEXI2PDF='${top_srcdir}/build-aux/missing texi2pdf' |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3414 warn_texi2pdf=" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3415 |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3416 I didn't find texi2pdf, but it's only a problem if you need to |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3417 reconstruct the PDF version of the manual |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3418 " |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3419 OCTAVE_CONFIGURE_WARNING([warn_texi2pdf]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3420 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3421 AC_SUBST(TEXI2PDF) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3422 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3423 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3424 dnl Set default value for a variable and substitute it. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3425 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3426 AC_DEFUN([OCTAVE_SET_DEFAULT], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3427 ifelse($#, 2, [: ${$1=$2} |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3428 ])dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3429 AC_MSG_RESULT([defining $1 to be $$1]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3430 AC_SUBST($1) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3431 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3432 dnl |
15144
9cc337ced51a
build: Update OCTAVE_UMFPACK_SEPARATE_SPLIT macro to look for SuiteSparse header file.
Rik <rik@octave.org>
parents:
15141
diff
changeset
|
3433 dnl Check for UMFPACK separately split complex matrix and RHS. |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3434 dnl |
15144
9cc337ced51a
build: Update OCTAVE_UMFPACK_SEPARATE_SPLIT macro to look for SuiteSparse header file.
Rik <rik@octave.org>
parents:
15141
diff
changeset
|
3435 dnl Macro assumes that the check for umfpack has already been performed. |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3436 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3437 AC_DEFUN([OCTAVE_UMFPACK_SEPARATE_SPLIT], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3438 AC_MSG_CHECKING([for UMFPACK separate complex matrix and rhs split]) |
15319
daf74ce2afdc
m4/acinclude.m4: Use more consistent m4 quoting of arguments to macros.
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
3439 AC_CACHE_VAL([octave_cv_umfpack_separate_split], |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3440 [AC_RUN_IFELSE([AC_LANG_SOURCE([[ |
16318
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
3441 #include <stdint.h> |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3442 #include <stdlib.h> |
15330
81cc4e5733b1
build: Silence compiler warning in config.log for OCTAVE_UMFPACK_SEPARATE_SPLIT.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
3443 #include <math.h> |
15144
9cc337ced51a
build: Update OCTAVE_UMFPACK_SEPARATE_SPLIT macro to look for SuiteSparse header file.
Rik <rik@octave.org>
parents:
15141
diff
changeset
|
3444 #if defined (HAVE_SUITESPARSE_UMFPACK_H) |
9cc337ced51a
build: Update OCTAVE_UMFPACK_SEPARATE_SPLIT macro to look for SuiteSparse header file.
Rik <rik@octave.org>
parents:
15141
diff
changeset
|
3445 # include <suitesparse/umfpack.h> |
9cc337ced51a
build: Update OCTAVE_UMFPACK_SEPARATE_SPLIT macro to look for SuiteSparse header file.
Rik <rik@octave.org>
parents:
15141
diff
changeset
|
3446 #elif defined (HAVE_UFSPARSE_UMFPACK_H) |
9cc337ced51a
build: Update OCTAVE_UMFPACK_SEPARATE_SPLIT macro to look for SuiteSparse header file.
Rik <rik@octave.org>
parents:
15141
diff
changeset
|
3447 # include <ufsparse/umfpack.h> |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3448 #elif defined (HAVE_UMFPACK_UMFPACK_H) |
15144
9cc337ced51a
build: Update OCTAVE_UMFPACK_SEPARATE_SPLIT macro to look for SuiteSparse header file.
Rik <rik@octave.org>
parents:
15141
diff
changeset
|
3449 # include <umfpack/umfpack.h> |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3450 #elif defined (HAVE_UMFPACK_H) |
15144
9cc337ced51a
build: Update OCTAVE_UMFPACK_SEPARATE_SPLIT macro to look for SuiteSparse header file.
Rik <rik@octave.org>
parents:
15141
diff
changeset
|
3451 # include <umfpack.h> |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3452 #endif |
21724
aba2e6293dd8
use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents:
21604
diff
changeset
|
3453 #if defined (OCTAVE_ENABLE_64) |
16318
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
3454 typedef uint64_t idx_type; |
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
3455 #define UMFPACK_NAME(name) umfpack_zl_ ## name |
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
3456 #else |
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
3457 typedef int idx_type; |
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
3458 #define UMFPACK_NAME(name) umfpack_zi_ ## name |
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
3459 #endif |
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
3460 idx_type n = 5; |
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
3461 idx_type Ap[] = {0, 2, 5, 9, 10, 12}; |
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
3462 idx_type Ai[] = {0, 1, 0, 2, 4, 1, 2, 3, 4, 2, 1, 4}; |
17034
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
3463 double Ax[] = {2., 0., 3., 0., 3., 0., -1., 0., 4., 0., 4., 0., |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3464 -3., 0., 1., 0., 2., 0., 2., 0., 6., 0., 1., 0.}; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3465 double br[] = {8., 45., -3., 3., 19.}; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3466 double bi[] = {0., 0., 0., 0., 0.}; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3467 int main (void) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3468 { |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3469 double *null = (double *) NULL ; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3470 double *x = (double *)malloc (2 * n * sizeof(double)); |
16318
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
3471 idx_type i ; |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3472 void *Symbolic, *Numeric ; |
16318
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
3473 (void) UMFPACK_NAME (symbolic) (n, n, Ap, Ai, Ax, null, &Symbolic, null, null) ; |
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
3474 (void) UMFPACK_NAME (numeric) (Ap, Ai, Ax, null, Symbolic, &Numeric, null, null) ; |
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
3475 UMFPACK_NAME (free_symbolic) (&Symbolic) ; |
17034
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
3476 (void) UMFPACK_NAME (solve) (0, Ap, Ai, Ax, null, x, null, br, bi, |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3477 Numeric, null, null) ; |
16318
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
3478 UMFPACK_NAME (free_numeric) (&Numeric) ; |
17034
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
3479 for (i = 0; i < n; i++, x+=2) |
15330
81cc4e5733b1
build: Silence compiler warning in config.log for OCTAVE_UMFPACK_SEPARATE_SPLIT.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
3480 if (fabs (*x - i - 1.) > 1.e-13) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3481 return (1); |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3482 return (0) ; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3483 } |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3484 ]])], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3485 octave_cv_umfpack_separate_split=yes, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3486 octave_cv_umfpack_separate_split=no, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3487 octave_cv_umfpack_separate_split=yes) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3488 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3489 if test "$cross_compiling" = yes; then |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3490 AC_MSG_RESULT([$octave_cv_umfpack_separate_split assumed for cross compilation]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3491 else |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3492 AC_MSG_RESULT([$octave_cv_umfpack_separate_split]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3493 fi |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
3494 if test $octave_cv_umfpack_separate_split = yes; then |
17034
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
3495 AC_DEFINE(UMFPACK_SEPARATE_SPLIT, 1, |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3496 [Define to 1 if the UMFPACK Complex solver allows matrix and RHS to be split independently.]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3497 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
3498 ]) |