Mercurial > octave
annotate m4/acinclude.m4 @ 24289:f52d91f6ef80 stable
Check ARPACK library for buggy behavior in configure (bug #52425)
* configure.ac: Call both OCTAVE_CHECK_LIB_ARPACK_OK_1 and new
OCTAVE_CHECK_LIB_ARPACK_OK_2 to determine if ARPACK library is okay.
* m4/acinclude.m4 (OCTAVE_CHECK_LIB_ARPACK_OK_1): Macro renamed from
OCTAVE_CHECK_LIB_ARPACK_OK. Minor whitespace and punctuation changes.
* m4/acinclude.m4 (OCTAVE_CHECK_LIB_ARPACK_OK_2): New macro with test
Fortran code to check whether ARPACK library is buggy.
author | Rik <rik@octave.org> |
---|---|
date | Tue, 21 Nov 2017 17:49:18 -0800 |
parents | 6ae0292aaa5c |
children | 8612ab9fc564 0771ce2d30ef |
rev | line source |
---|---|
1232 | 1 dnl aclocal.m4 -- extra macros for configuring Octave |
2 dnl | |
23219
3ac9f9ecfae5
maint: Update copyright dates.
John W. Eaton <jwe@octave.org>
parents:
23174
diff
changeset
|
3 dnl Copyright (C) 1995-2017 John W. Eaton |
17034
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
4 dnl |
1232 | 5 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
|
6 dnl |
1232 | 7 dnl Octave is free software; you can redistribute it and/or modify it |
8 dnl under the terms of the GNU General Public License as published by the | |
7016 | 9 dnl Free Software Foundation; either version 3 of the License, or (at |
10 dnl 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
|
11 dnl |
1232 | 12 dnl Octave is distributed in the hope that it will be useful, but WITHOUT |
13 dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
14 dnl FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
15 dnl for more details. | |
17034
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
16 dnl |
1232 | 17 dnl You should have received a copy of the GNU General Public License |
7016 | 18 dnl along with Octave; see the file COPYING. If not, see |
19 dnl <http://www.gnu.org/licenses/>. | |
2548 | 20 dnl |
9525
691545147aca
compatibility for earlier autoconfs
Jaroslav Hajek <highegg@gmail.com>
parents:
9523
diff
changeset
|
21 dnl |
9577
b03062e16c6f
copyirght & FIXME in aclocal.m4
Jaroslav Hajek <highegg@gmail.com>
parents:
9568
diff
changeset
|
22 dnl Copyright (C) 2008 - 2009 Free Software Foundation, Inc. |
b03062e16c6f
copyirght & FIXME in aclocal.m4
Jaroslav Hajek <highegg@gmail.com>
parents:
9568
diff
changeset
|
23 dnl |
9525
691545147aca
compatibility for earlier autoconfs
Jaroslav Hajek <highegg@gmail.com>
parents:
9523
diff
changeset
|
24 dnl If needed, define the m4_ifblank and m4_ifnblank macros from autoconf 2.64 |
691545147aca
compatibility for earlier autoconfs
Jaroslav Hajek <highegg@gmail.com>
parents:
9523
diff
changeset
|
25 dnl This allows us to run with earlier Autoconfs as well. |
9577
b03062e16c6f
copyirght & FIXME in aclocal.m4
Jaroslav Hajek <highegg@gmail.com>
parents:
9568
diff
changeset
|
26 dnl FIXME: these should go away once Autoconf 2.64 is required or ubiquitous. |
b03062e16c6f
copyirght & FIXME in aclocal.m4
Jaroslav Hajek <highegg@gmail.com>
parents:
9568
diff
changeset
|
27 dnl |
9525
691545147aca
compatibility for earlier autoconfs
Jaroslav Hajek <highegg@gmail.com>
parents:
9523
diff
changeset
|
28 ifdef([m4_ifblank],[],[ |
691545147aca
compatibility for earlier autoconfs
Jaroslav Hajek <highegg@gmail.com>
parents:
9523
diff
changeset
|
29 m4_define([m4_ifblank], |
691545147aca
compatibility for earlier autoconfs
Jaroslav Hajek <highegg@gmail.com>
parents:
9523
diff
changeset
|
30 [m4_if(m4_translit([[$1]], [ ][ ][ |
691545147aca
compatibility for earlier autoconfs
Jaroslav Hajek <highegg@gmail.com>
parents:
9523
diff
changeset
|
31 ]), [], [$2], [$3])])]) |
691545147aca
compatibility for earlier autoconfs
Jaroslav Hajek <highegg@gmail.com>
parents:
9523
diff
changeset
|
32 dnl |
691545147aca
compatibility for earlier autoconfs
Jaroslav Hajek <highegg@gmail.com>
parents:
9523
diff
changeset
|
33 ifdef([m4_ifnblank],[],[ |
691545147aca
compatibility for earlier autoconfs
Jaroslav Hajek <highegg@gmail.com>
parents:
9523
diff
changeset
|
34 m4_define([m4_ifnblank], |
691545147aca
compatibility for earlier autoconfs
Jaroslav Hajek <highegg@gmail.com>
parents:
9523
diff
changeset
|
35 [m4_if(m4_translit([[$1]], [ ][ ][ |
691545147aca
compatibility for earlier autoconfs
Jaroslav Hajek <highegg@gmail.com>
parents:
9523
diff
changeset
|
36 ]), [], [$3], [$2])])]) |
691545147aca
compatibility for earlier autoconfs
Jaroslav Hajek <highegg@gmail.com>
parents:
9523
diff
changeset
|
37 dnl |
2813 | 38 dnl ---------------------------------------------------------------------- |
39 dnl | |
3130 | 40 |
2813 | 41 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
42 dnl Alphabetical list of macros in the OCTAVE_ namespace |
4360 | 43 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
44 |
4366 | 45 dnl |
15133
f91eac1bc66d
m4/acinclude.m4: Correct typos, use consistent style for describing macros.
Rik <rik@octave.org>
parents:
15126
diff
changeset
|
46 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
|
47 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
48 AC_DEFUN([OCTAVE_CARBON_CGDISPLAYBITSPERPIXEL], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
49 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
|
50 [octave_cv_func_carbon_cgdisplaybitsperpixel], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
51 [AC_LANG_PUSH(C++) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
52 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
53 #include <Carbon/Carbon.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
54 ]], [[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
55 CGDirectDisplayID display = CGMainDisplayID (); |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
56 size_t depth = CGDisplayBitsPerPixel (display); |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
57 ]])], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
58 octave_cv_func_carbon_cgdisplaybitsperpixel=yes, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
59 octave_cv_func_carbon_cgdisplaybitsperpixel=no) |
3888 | 60 AC_LANG_POP(C++) |
3107 | 61 ]) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
62 if test $octave_cv_func_carbon_cgdisplaybitsperpixel = yes; then |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
63 AC_DEFINE(HAVE_CARBON_CGDISPLAYBITSPERPIXEL, 1, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
64 [Define to 1 if Carbon Framework has CGDisplayBitsPerPixel.]) |
3107 | 65 fi |
66 ]) | |
3126 | 67 dnl |
15133
f91eac1bc66d
m4/acinclude.m4: Correct typos, use consistent style for describing macros.
Rik <rik@octave.org>
parents:
15126
diff
changeset
|
68 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
|
69 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
|
70 dnl Otherwise, add FLAG to CFLAGS if the compiler accepts the flag. |
3126 | 71 dnl |
9654
a307a6f77fb3
aclocal.m4: consistently quote first arg to AC_DEFUN
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
72 AC_DEFUN([OCTAVE_CC_FLAG], [ |
17661
1978a6c76aa9
Use user-specified SED during build process (bug #40273).
Rik <rik@octave.org>
parents:
17615
diff
changeset
|
73 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
|
74 AC_MSG_CHECKING([whether ${CC-cc} accepts $1]) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
75 AC_CACHE_VAL([octave_cv_cc_flag_$ac_safe], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
76 [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
|
77 ac_octave_save_CFLAGS="$CFLAGS" |
3126 | 78 CFLAGS="$CFLAGS $1" |
5177 | 79 AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
80 [eval "octave_cv_cc_flag_$ac_safe=yes"], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
81 [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
|
82 CFLAGS="$ac_octave_save_CFLAGS" |
3888 | 83 AC_LANG_POP(C) |
3126 | 84 ]) |
85 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
|
86 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
|
87 ifelse([$2], , |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
88 [CFLAGS="$CFLAGS $1" |
3131 | 89 AC_MSG_RESULT([adding $1 to CFLAGS])], [$2]) |
3126 | 90 else |
15319
daf74ce2afdc
m4/acinclude.m4: Use more consistent m4 quoting of arguments to macros.
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
91 AC_MSG_RESULT([no]) |
3126 | 92 ifelse([$3], , , [$3]) |
93 fi | |
94 ]) | |
95 dnl | |
17965
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
96 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
|
97 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
|
98 dnl |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
99 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
|
100 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
|
101 [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
|
102 [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
|
103 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
|
104 // 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
|
105 |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
106 // 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
|
107 // |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
108 // 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
|
109 // 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
|
110 // 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
|
111 // 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
|
112 // 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
|
113 |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
114 // 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
|
115 // 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
|
116 // 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
|
117 // 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
|
118 |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
119 // 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
|
120 // with this library; see the file COPYING3. If not see |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
121 // <http://www.gnu.org/licenses/>. |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
122 |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
123 // 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
|
124 |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
125 // { 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
|
126 |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
127 #include <algorithm> |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
128 #include <vector> |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
129 ]], [[ |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
130 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
|
131 |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
132 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
|
133 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
|
134 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
|
135 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
|
136 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
|
137 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
|
138 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
|
139 |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
140 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
|
141 |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
142 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
|
143 ]])], |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
144 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
|
145 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
|
146 [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
|
147 *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
|
148 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
|
149 ;; |
303157af491f
acinclude.m4: Fix undefined value in macro CHECK_BROKEN_STL_ALGO_H when cross-compiling.
Rik <rik@octave.org>
parents:
17965
diff
changeset
|
150 *) |
303157af491f
acinclude.m4: Fix undefined value in macro CHECK_BROKEN_STL_ALGO_H when cross-compiling.
Rik <rik@octave.org>
parents:
17965
diff
changeset
|
151 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
|
152 ;; |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
153 esac |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
154 ]) |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
155 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
|
156 ]) |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
157 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
|
158 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
|
159 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
|
160 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
|
161 ;; |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
162 *) |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
163 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
|
164 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
|
165 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
|
166 ;; |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
167 esac |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
168 else |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
169 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
|
170 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
|
171 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
|
172 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
|
173 ;; |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
174 esac |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
175 fi |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
176 else |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
177 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
|
178 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
|
179 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
|
180 fi |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
181 ]) |
1d58abc740c0
acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering.
Rik <rik@octave.org>
parents:
17888
diff
changeset
|
182 dnl |
21160
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
183 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
|
184 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
|
185 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
|
186 dnl |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
187 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
|
188 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
|
189 [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
|
190 [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
|
191 CPPFLAGS="$CXSPARSE_CPPFLAGS $CPPFLAGS" |
21160
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
192 AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[ |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
193 #if defined (HAVE_SUITESPARSE_CS_H) |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
194 #include <suitesparse/cs.h> |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
195 #elif defined (HAVE_UFSPARSE_CS_H) |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
196 #include <ufsparse/cs.h> |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
197 #elif defined (HAVE_CXSPARSE_CS_H) |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
198 #include <cxsparse/cs.h> |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
199 #elif defined (HAVE_CS_H) |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
200 #include <cs.h> |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
201 #endif |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
202 ]], [[ |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
203 #if (defined (HAVE_CXSPARSE) \ |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
204 && (! defined (CS_VER) \ |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
205 || CS_VER < 2 \ |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
206 || (CS_VER == 2 && CS_SUBVER < 2))) |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
207 #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
|
208 #endif |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
209 ]])], |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
210 octave_cv_cxsparse_version_ok=yes, |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
211 octave_cv_cxsparse_version_ok=no) |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
212 CPPFLAGS="$ac_octave_save_CPPFLAGS" |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
213 ]) |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
214 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
|
215 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
|
216 [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
|
217 fi |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
218 ]) |
b5b531ba93ce
build: Use configure-time test to check CXSparse version.
Rik <rik@octave.org>
parents:
21150
diff
changeset
|
219 dnl |
15969
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
220 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
|
221 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
|
222 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
|
223 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
|
224 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
|
225 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
|
226 dnl ahead of the main FFTW library. |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
227 dnl |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
228 AC_DEFUN([OCTAVE_CHECK_FFTW_THREADS], [ |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
229 ac_octave_save_CPPFLAGS="$CPPFLAGS" |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
230 ac_octave_save_LDFLAGS="$LDFLAGS" |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
231 ac_octave_save_LIBS="$LIBS" |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
232 CPPFLAGS="$m4_toupper([$1])_CPPFLAGS $CPPFLAGS" |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
233 LDFLAGS="$m4_toupper([$1])_LDFLAGS $LDFLAGS" |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
234 LIBS="$m4_toupper([$1])_LIBS $LIBS" |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
235 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
|
236 [octave_cv_[$1]_threads_lib], |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
237 [AC_LINK_IFELSE([AC_LANG_PROGRAM([[ |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
238 #include <fftw3.h> |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
239 ]], [[ |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
240 $2 (2); |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
241 ]])], |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
242 [octave_cv_[$1]_threads_lib=yes], |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
243 [LIBS="-l[$1]_threads $LIBS" |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
244 AC_LINK_IFELSE([AC_LANG_PROGRAM([[ |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
245 #include <fftw3.h> |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
246 ]], [[ |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
247 $2 (2); |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
248 ]])], |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
249 [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
|
250 [octave_cv_[$1]_threads_lib=no]) |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
251 ]) |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
252 ]) |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
253 case $octave_cv_[$1]_threads_lib in |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
254 -l*) |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
255 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
|
256 ;; |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
257 no) |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
258 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
|
259 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
|
260 ;; |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
261 esac |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
262 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
|
263 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
|
264 [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
|
265 fi |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
266 CPPFLAGS="$ac_octave_save_CPPFLAGS" |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
267 LDFLAGS="$ac_octave_save_LDFLAGS" |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
268 LIBS="$ac_octave_save_LIBS" |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
269 ]) |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15863
diff
changeset
|
270 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
271 dnl Check whether a math mapper function is available in <cmath>. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
272 dnl Will define HAVE_CMATH_FUNC if there is a double variant and |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
273 dnl HAVE_CMATH_FUNCF if there is a float variant. |
17034
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
274 dnl Currently capable of checking for functions with single |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
275 dnl argument and returning bool/int/real. |
3126 | 276 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
277 AC_DEFUN([OCTAVE_CHECK_FUNC_CMATH], [ |
17661
1978a6c76aa9
Use user-specified SED during build process (bug #40273).
Rik <rik@octave.org>
parents:
17615
diff
changeset
|
278 ac_safe=`echo "$1" | $SED 'y% ./+-:=%___p___%'` |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
279 |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
280 AC_CACHE_CHECK([for std::$1 in <cmath>], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
281 [octave_cv_func_cmath_$ac_safe], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
282 [AC_LANG_PUSH(C++) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
283 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
284 #include <cmath> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
285 void take_func (bool (*func) (double x)); |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
286 void take_func (int (*func) (double x)); |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
287 void take_func (double (*func) (double x)); |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
288 ]], [[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
289 take_func(std::$1); |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
290 ]])], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
291 [eval "octave_cv_func_cmath_$ac_safe=yes"], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
292 [eval "octave_cv_func_cmath_$ac_safe=no"]) |
3888 | 293 AC_LANG_POP(C++) |
3126 | 294 ]) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
295 if eval "test \"`echo '$octave_cv_func_cmath_'$ac_safe`\" = yes"; then |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
296 AC_DEFINE(AS_TR_CPP([[HAVE_CMATH_][$1]]), 1, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
297 [Define to 1 if <cmath> provides $1.]) |
3126 | 298 fi |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
299 |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
300 AC_CACHE_CHECK([for std::$1 (float variant) in <cmath>], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
301 [octave_cv_func_cmath_f$ac_safe], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
302 [AC_LANG_PUSH(C++) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
303 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
304 #include <cmath> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
305 void take_func (bool (*func) (float x)); |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
306 void take_func (int (*func) (float x)); |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
307 void take_func (float (*func) (float x)); |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
308 ]], [[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
309 take_func(std::$1); |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
310 ]])], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
311 [eval "octave_cv_func_cmath_f$ac_safe=yes"], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
312 [eval "octave_cv_func_cmath_f$ac_safe=no"]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
313 AC_LANG_POP(C++) |
5076 | 314 ]) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
315 if eval "test \"`echo '$octave_cv_func_cmath_f'$ac_safe`\" = yes"; then |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
316 AC_DEFINE(AS_TR_CPP([[HAVE_CMATH_][$1][F]]), 1, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
317 [Define to 1 if <cmath> provides float variant of $1.]) |
3126 | 318 fi |
319 ]) | |
3130 | 320 dnl |
21945
e9765b62d4e8
Use C++11 standard complex trig functions when available (bug #44310, bug #45507)
Mike Miller <mtmiller@octave.org>
parents:
21724
diff
changeset
|
321 dnl Check whether a complex-valued function is available in <complex>. |
e9765b62d4e8
Use C++11 standard complex trig functions when available (bug #44310, bug #45507)
Mike Miller <mtmiller@octave.org>
parents:
21724
diff
changeset
|
322 dnl Will define HAVE_COMPLEX_STD_FUNC if the function is available in the |
e9765b62d4e8
Use C++11 standard complex trig functions when available (bug #44310, bug #45507)
Mike Miller <mtmiller@octave.org>
parents:
21724
diff
changeset
|
323 dnl std namespace and is callable on both std::complex<double> and |
e9765b62d4e8
Use C++11 standard complex trig functions when available (bug #44310, bug #45507)
Mike Miller <mtmiller@octave.org>
parents:
21724
diff
changeset
|
324 dnl std::complex<float>. The return type of the function is expected to |
e9765b62d4e8
Use C++11 standard complex trig functions when available (bug #44310, bug #45507)
Mike Miller <mtmiller@octave.org>
parents:
21724
diff
changeset
|
325 dnl be of the same std::complex<T> type. |
e9765b62d4e8
Use C++11 standard complex trig functions when available (bug #44310, bug #45507)
Mike Miller <mtmiller@octave.org>
parents:
21724
diff
changeset
|
326 dnl |
e9765b62d4e8
Use C++11 standard complex trig functions when available (bug #44310, bug #45507)
Mike Miller <mtmiller@octave.org>
parents:
21724
diff
changeset
|
327 AC_DEFUN([OCTAVE_CHECK_FUNC_COMPLEX], [ |
e9765b62d4e8
Use C++11 standard complex trig functions when available (bug #44310, bug #45507)
Mike Miller <mtmiller@octave.org>
parents:
21724
diff
changeset
|
328 ac_safe=`echo "$1" | $SED 'y% ./+-:=%___p___%'` |
e9765b62d4e8
Use C++11 standard complex trig functions when available (bug #44310, bug #45507)
Mike Miller <mtmiller@octave.org>
parents:
21724
diff
changeset
|
329 |
e9765b62d4e8
Use C++11 standard complex trig functions when available (bug #44310, bug #45507)
Mike Miller <mtmiller@octave.org>
parents:
21724
diff
changeset
|
330 AC_CACHE_CHECK([for std::$1 in <complex>], |
e9765b62d4e8
Use C++11 standard complex trig functions when available (bug #44310, bug #45507)
Mike Miller <mtmiller@octave.org>
parents:
21724
diff
changeset
|
331 [octave_cv_func_complex_std_$ac_safe], |
e9765b62d4e8
Use C++11 standard complex trig functions when available (bug #44310, bug #45507)
Mike Miller <mtmiller@octave.org>
parents:
21724
diff
changeset
|
332 [AC_LANG_PUSH(C++) |
e9765b62d4e8
Use C++11 standard complex trig functions when available (bug #44310, bug #45507)
Mike Miller <mtmiller@octave.org>
parents:
21724
diff
changeset
|
333 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
e9765b62d4e8
Use C++11 standard complex trig functions when available (bug #44310, bug #45507)
Mike Miller <mtmiller@octave.org>
parents:
21724
diff
changeset
|
334 #include <complex> |
e9765b62d4e8
Use C++11 standard complex trig functions when available (bug #44310, bug #45507)
Mike Miller <mtmiller@octave.org>
parents:
21724
diff
changeset
|
335 ]], [[ |
e9765b62d4e8
Use C++11 standard complex trig functions when available (bug #44310, bug #45507)
Mike Miller <mtmiller@octave.org>
parents:
21724
diff
changeset
|
336 std::complex<double> z = std::$1 (std::complex<double> (1.0, 1.0)); |
e9765b62d4e8
Use C++11 standard complex trig functions when available (bug #44310, bug #45507)
Mike Miller <mtmiller@octave.org>
parents:
21724
diff
changeset
|
337 std::complex<float> c = std::$1 (std::complex<float> (1.0, 1.0)); |
e9765b62d4e8
Use C++11 standard complex trig functions when available (bug #44310, bug #45507)
Mike Miller <mtmiller@octave.org>
parents:
21724
diff
changeset
|
338 ]])], |
e9765b62d4e8
Use C++11 standard complex trig functions when available (bug #44310, bug #45507)
Mike Miller <mtmiller@octave.org>
parents:
21724
diff
changeset
|
339 [eval "octave_cv_func_complex_std_$ac_safe=yes"], |
e9765b62d4e8
Use C++11 standard complex trig functions when available (bug #44310, bug #45507)
Mike Miller <mtmiller@octave.org>
parents:
21724
diff
changeset
|
340 [eval "octave_cv_func_complex_std_$ac_safe=no"]) |
e9765b62d4e8
Use C++11 standard complex trig functions when available (bug #44310, bug #45507)
Mike Miller <mtmiller@octave.org>
parents:
21724
diff
changeset
|
341 AC_LANG_POP(C++) |
e9765b62d4e8
Use C++11 standard complex trig functions when available (bug #44310, bug #45507)
Mike Miller <mtmiller@octave.org>
parents:
21724
diff
changeset
|
342 ]) |
e9765b62d4e8
Use C++11 standard complex trig functions when available (bug #44310, bug #45507)
Mike Miller <mtmiller@octave.org>
parents:
21724
diff
changeset
|
343 if eval "test \"`echo '$octave_cv_func_complex_std_'$ac_safe`\" = yes"; then |
e9765b62d4e8
Use C++11 standard complex trig functions when available (bug #44310, bug #45507)
Mike Miller <mtmiller@octave.org>
parents:
21724
diff
changeset
|
344 AC_DEFINE(AS_TR_CPP([[HAVE_COMPLEX_STD_][$1]]), 1, |
e9765b62d4e8
Use C++11 standard complex trig functions when available (bug #44310, bug #45507)
Mike Miller <mtmiller@octave.org>
parents:
21724
diff
changeset
|
345 [Define to 1 if <complex> provides std::$1(std::complex<T>).]) |
e9765b62d4e8
Use C++11 standard complex trig functions when available (bug #44310, bug #45507)
Mike Miller <mtmiller@octave.org>
parents:
21724
diff
changeset
|
346 fi |
e9765b62d4e8
Use C++11 standard complex trig functions when available (bug #44310, bug #45507)
Mike Miller <mtmiller@octave.org>
parents:
21724
diff
changeset
|
347 ]) |
e9765b62d4e8
Use C++11 standard complex trig functions when available (bug #44310, bug #45507)
Mike Miller <mtmiller@octave.org>
parents:
21724
diff
changeset
|
348 dnl |
22286
f394436a4025
build: improve QScintilla detection to work with distro naming schemes (bug #48773)
Mike Miller <mtmiller@octave.org>
parents:
22257
diff
changeset
|
349 dnl Check whether QScintilla has version 2.6.0 or later |
15291
7ae14907ae43
build: Add tests for specific Qt functions to configure.ac
Rik <rik@octave.org>
parents:
15250
diff
changeset
|
350 dnl FIXME: This test uses a version number. It potentially could |
7ae14907ae43
build: Add tests for specific Qt functions to configure.ac
Rik <rik@octave.org>
parents:
15250
diff
changeset
|
351 dnl be re-written to actually call the function, but is it worth it? |
5076 | 352 dnl |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
353 AC_DEFUN([OCTAVE_CHECK_QSCINTILLA_VERSION], [ |
22286
f394436a4025
build: improve QScintilla detection to work with distro naming schemes (bug #48773)
Mike Miller <mtmiller@octave.org>
parents:
22257
diff
changeset
|
354 AC_CACHE_CHECK([whether QScintilla has version 2.6.0 or later], |
16733
2723d1144f11
added test for qscintilla version 2.6.0
Torsten <ttl@justmail.de>
parents:
16663
diff
changeset
|
355 [octave_cv_version_2_6_0], |
15291
7ae14907ae43
build: Add tests for specific Qt functions to configure.ac
Rik <rik@octave.org>
parents:
15250
diff
changeset
|
356 [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
|
357 ac_octave_save_CPPFLAGS="$CPPFLAGS" |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
358 ac_octave_save_CXXFLAGS="$CXXFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
359 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
360 CXXFLAGS="$CXXPICFLAG $CXXFLAGS" |
20149
0afc06948ba7
acinclude.m4: Use simpler AC_PREPROC_IFELSE test for checking Qscintilla version.
Rik <rik@octave.org>
parents:
19816
diff
changeset
|
361 AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[ |
15291
7ae14907ae43
build: Add tests for specific Qt functions to configure.ac
Rik <rik@octave.org>
parents:
15250
diff
changeset
|
362 #include <Qsci/qsciglobal.h> |
7ae14907ae43
build: Add tests for specific Qt functions to configure.ac
Rik <rik@octave.org>
parents:
15250
diff
changeset
|
363 ]], [[ |
7ae14907ae43
build: Add tests for specific Qt functions to configure.ac
Rik <rik@octave.org>
parents:
15250
diff
changeset
|
364 #if QSCINTILLA_VERSION < 0x020600 |
15295
43e484fa7e42
build: Clean up configure macros for building GUI.
Rik <rik@octave.org>
parents:
15294
diff
changeset
|
365 #error Old FindFirst function found. |
15291
7ae14907ae43
build: Add tests for specific Qt functions to configure.ac
Rik <rik@octave.org>
parents:
15250
diff
changeset
|
366 #endif |
7ae14907ae43
build: Add tests for specific Qt functions to configure.ac
Rik <rik@octave.org>
parents:
15250
diff
changeset
|
367 ]])], |
16733
2723d1144f11
added test for qscintilla version 2.6.0
Torsten <ttl@justmail.de>
parents:
16663
diff
changeset
|
368 octave_cv_version_2_6_0=yes, |
2723d1144f11
added test for qscintilla version 2.6.0
Torsten <ttl@justmail.de>
parents:
16663
diff
changeset
|
369 octave_cv_version_2_6_0=no) |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
370 CPPFLAGS="$ac_octave_save_CPPFLAGS" |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
371 CXXFLAGS="$ac_octave_save_CXXFLAGS" |
15291
7ae14907ae43
build: Add tests for specific Qt functions to configure.ac
Rik <rik@octave.org>
parents:
15250
diff
changeset
|
372 AC_LANG_POP(C++) |
5076 | 373 ]) |
16733
2723d1144f11
added test for qscintilla version 2.6.0
Torsten <ttl@justmail.de>
parents:
16663
diff
changeset
|
374 if test $octave_cv_version_2_6_0 = yes; then |
2723d1144f11
added test for qscintilla version 2.6.0
Torsten <ttl@justmail.de>
parents:
16663
diff
changeset
|
375 AC_DEFINE(HAVE_QSCI_VERSION_2_6_0, 1, |
22286
f394436a4025
build: improve QScintilla detection to work with distro naming schemes (bug #48773)
Mike Miller <mtmiller@octave.org>
parents:
22257
diff
changeset
|
376 [Define to 1 if QScintilla is of Version 2.6.0 or later.]) |
5076 | 377 fi |
378 ]) | |
379 dnl | |
15133
f91eac1bc66d
m4/acinclude.m4: Correct typos, use consistent style for describing macros.
Rik <rik@octave.org>
parents:
15126
diff
changeset
|
380 dnl Check if Fortran compiler has the intrinsic function ISNAN. |
14550
bc4c574ab3b6
Add configure check for isnan in fortran.
Carlo de Falco <cdf@users.sourceforge.net>
parents:
14419
diff
changeset
|
381 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
382 AC_DEFUN([OCTAVE_CHECK_FUNC_FORTRAN_ISNAN], [ |
14550
bc4c574ab3b6
Add configure check for isnan in fortran.
Carlo de Falco <cdf@users.sourceforge.net>
parents:
14419
diff
changeset
|
383 AC_CACHE_CHECK([whether $F77 has the intrinsic function ISNAN], |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
384 [octave_cv_func_fortran_isnan], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
385 [AC_LANG_PUSH(Fortran 77) |
17978
86846ce0371a
acinclude.m4: Clean up indentation of Fortran code tests.
Rik <rik@octave.org>
parents:
17967
diff
changeset
|
386 AC_COMPILE_IFELSE([[ |
86846ce0371a
acinclude.m4: Clean up indentation of Fortran code tests.
Rik <rik@octave.org>
parents:
17967
diff
changeset
|
387 program foo |
14550
bc4c574ab3b6
Add configure check for isnan in fortran.
Carlo de Falco <cdf@users.sourceforge.net>
parents:
14419
diff
changeset
|
388 implicit none |
bc4c574ab3b6
Add configure check for isnan in fortran.
Carlo de Falco <cdf@users.sourceforge.net>
parents:
14419
diff
changeset
|
389 real x |
bc4c574ab3b6
Add configure check for isnan in fortran.
Carlo de Falco <cdf@users.sourceforge.net>
parents:
14419
diff
changeset
|
390 double precision y |
bc4c574ab3b6
Add configure check for isnan in fortran.
Carlo de Falco <cdf@users.sourceforge.net>
parents:
14419
diff
changeset
|
391 if (isnan(x)) then |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
392 print *, 'x is NaN' |
14550
bc4c574ab3b6
Add configure check for isnan in fortran.
Carlo de Falco <cdf@users.sourceforge.net>
parents:
14419
diff
changeset
|
393 end if |
bc4c574ab3b6
Add configure check for isnan in fortran.
Carlo de Falco <cdf@users.sourceforge.net>
parents:
14419
diff
changeset
|
394 if (isnan(y)) then |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
395 print *, 'y is NaN' |
14550
bc4c574ab3b6
Add configure check for isnan in fortran.
Carlo de Falco <cdf@users.sourceforge.net>
parents:
14419
diff
changeset
|
396 end if |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
397 end program |
17978
86846ce0371a
acinclude.m4: Clean up indentation of Fortran code tests.
Rik <rik@octave.org>
parents:
17967
diff
changeset
|
398 ]], |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
399 octave_cv_func_fortran_isnan=yes, octave_cv_func_fortran_isnan=no) |
17034
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
400 AC_LANG_POP(Fortran 77) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
401 ]) |
14550
bc4c574ab3b6
Add configure check for isnan in fortran.
Carlo de Falco <cdf@users.sourceforge.net>
parents:
14419
diff
changeset
|
402 ]) |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9577
diff
changeset
|
403 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
404 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
|
405 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
406 AC_DEFUN([OCTAVE_CHECK_FUNC_GLUTESSCALLBACK_THREEDOTS], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
407 AC_CACHE_CHECK([whether gluTessCallback is called with "(...)"], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
408 [octave_cv_func_glutesscallback_threedots], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
409 [AC_LANG_PUSH(C++) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
410 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
|
411 #if defined (HAVE_GL_GLU_H) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
412 # include <GL/glu.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
413 #elif defined HAVE_OPENGL_GLU_H || defined HAVE_FRAMEWORK_OPENGL |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
414 # include <OpenGL/glu.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
415 #endif |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
416 ]], [[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
417 GLvoid (*func)(...); |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
418 gluTessCallback(0, 0, func); |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
419 ]])], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
420 octave_cv_func_glutesscallback_threedots=yes, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
421 octave_cv_func_glutesscallback_threedots=no) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
422 AC_LANG_POP(C++) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
423 ]) |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
424 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
|
425 AC_DEFINE(HAVE_GLUTESSCALLBACK_THREEDOTS, 1, |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
426 [Define to 1 if gluTessCallback is called with (...).]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
427 fi |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9577
diff
changeset
|
428 ]) |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9577
diff
changeset
|
429 dnl |
18036
c97ee13f1027
fix build for systems without QFont::Monospace
John W. Eaton <jwe@octave.org>
parents:
17978
diff
changeset
|
430 dnl Check whether Qt provides QFont::Monospace |
c97ee13f1027
fix build for systems without QFont::Monospace
John W. Eaton <jwe@octave.org>
parents:
17978
diff
changeset
|
431 dnl |
c97ee13f1027
fix build for systems without QFont::Monospace
John W. Eaton <jwe@octave.org>
parents:
17978
diff
changeset
|
432 AC_DEFUN([OCTAVE_CHECK_QFONT_MONOSPACE], [ |
c97ee13f1027
fix build for systems without QFont::Monospace
John W. Eaton <jwe@octave.org>
parents:
17978
diff
changeset
|
433 AC_CACHE_CHECK([whether Qt provides QFont::Monospace], |
c97ee13f1027
fix build for systems without QFont::Monospace
John W. Eaton <jwe@octave.org>
parents:
17978
diff
changeset
|
434 [octave_cv_decl_qfont_monospace], |
c97ee13f1027
fix build for systems without QFont::Monospace
John W. Eaton <jwe@octave.org>
parents:
17978
diff
changeset
|
435 [AC_LANG_PUSH(C++) |
c97ee13f1027
fix build for systems without QFont::Monospace
John W. Eaton <jwe@octave.org>
parents:
17978
diff
changeset
|
436 ac_octave_save_CPPFLAGS="$CPPFLAGS" |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
437 ac_octave_save_CXXFLAGS="$CXXFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
438 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
439 CXXFLAGS="$CXXPICFLAG $CXXFLAGS" |
18036
c97ee13f1027
fix build for systems without QFont::Monospace
John W. Eaton <jwe@octave.org>
parents:
17978
diff
changeset
|
440 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
c97ee13f1027
fix build for systems without QFont::Monospace
John W. Eaton <jwe@octave.org>
parents:
17978
diff
changeset
|
441 #include <QFont> |
c97ee13f1027
fix build for systems without QFont::Monospace
John W. Eaton <jwe@octave.org>
parents:
17978
diff
changeset
|
442 ]], [[ |
c97ee13f1027
fix build for systems without QFont::Monospace
John W. Eaton <jwe@octave.org>
parents:
17978
diff
changeset
|
443 QFont::StyleHint hint = QFont::Monospace; |
c97ee13f1027
fix build for systems without QFont::Monospace
John W. Eaton <jwe@octave.org>
parents:
17978
diff
changeset
|
444 ]])], |
c97ee13f1027
fix build for systems without QFont::Monospace
John W. Eaton <jwe@octave.org>
parents:
17978
diff
changeset
|
445 octave_cv_decl_qfont_monospace=yes, |
c97ee13f1027
fix build for systems without QFont::Monospace
John W. Eaton <jwe@octave.org>
parents:
17978
diff
changeset
|
446 octave_cv_decl_qfont_monospace=no) |
c97ee13f1027
fix build for systems without QFont::Monospace
John W. Eaton <jwe@octave.org>
parents:
17978
diff
changeset
|
447 CPPFLAGS="$ac_octave_save_CPPFLAGS" |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
448 CXXFLAGS="$ac_octave_save_CXXFLAGS" |
18036
c97ee13f1027
fix build for systems without QFont::Monospace
John W. Eaton <jwe@octave.org>
parents:
17978
diff
changeset
|
449 AC_LANG_POP(C++) |
c97ee13f1027
fix build for systems without QFont::Monospace
John W. Eaton <jwe@octave.org>
parents:
17978
diff
changeset
|
450 ]) |
c97ee13f1027
fix build for systems without QFont::Monospace
John W. Eaton <jwe@octave.org>
parents:
17978
diff
changeset
|
451 if test $octave_cv_decl_qfont_monospace = yes; then |
c97ee13f1027
fix build for systems without QFont::Monospace
John W. Eaton <jwe@octave.org>
parents:
17978
diff
changeset
|
452 AC_DEFINE(HAVE_QFONT_MONOSPACE, 1, |
c97ee13f1027
fix build for systems without QFont::Monospace
John W. Eaton <jwe@octave.org>
parents:
17978
diff
changeset
|
453 [Define to 1 if Qt provides QFont::Monospace.]) |
c97ee13f1027
fix build for systems without QFont::Monospace
John W. Eaton <jwe@octave.org>
parents:
17978
diff
changeset
|
454 fi |
c97ee13f1027
fix build for systems without QFont::Monospace
John W. Eaton <jwe@octave.org>
parents:
17978
diff
changeset
|
455 ]) |
c97ee13f1027
fix build for systems without QFont::Monospace
John W. Eaton <jwe@octave.org>
parents:
17978
diff
changeset
|
456 dnl |
18973
625e3bb65885
don't require Qt 4.7 (bug #42657)
John W. Eaton <jwe@octave.org>
parents:
18141
diff
changeset
|
457 dnl Check whether Qt provides QFont::ForceIntegerMetrics |
625e3bb65885
don't require Qt 4.7 (bug #42657)
John W. Eaton <jwe@octave.org>
parents:
18141
diff
changeset
|
458 dnl |
625e3bb65885
don't require Qt 4.7 (bug #42657)
John W. Eaton <jwe@octave.org>
parents:
18141
diff
changeset
|
459 AC_DEFUN([OCTAVE_CHECK_QFONT_FORCE_INTEGER_METRICS], [ |
625e3bb65885
don't require Qt 4.7 (bug #42657)
John W. Eaton <jwe@octave.org>
parents:
18141
diff
changeset
|
460 AC_CACHE_CHECK([whether Qt provides QFont::ForceIntegerMetrics], |
625e3bb65885
don't require Qt 4.7 (bug #42657)
John W. Eaton <jwe@octave.org>
parents:
18141
diff
changeset
|
461 [octave_cv_decl_qfont_force_integer_metrics], |
625e3bb65885
don't require Qt 4.7 (bug #42657)
John W. Eaton <jwe@octave.org>
parents:
18141
diff
changeset
|
462 [AC_LANG_PUSH(C++) |
625e3bb65885
don't require Qt 4.7 (bug #42657)
John W. Eaton <jwe@octave.org>
parents:
18141
diff
changeset
|
463 ac_octave_save_CPPFLAGS="$CPPFLAGS" |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
464 ac_octave_save_CXXFLAGS="$CXXFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
465 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
466 CXXFLAGS="$CXXPICFLAG $CXXFLAGS" |
18973
625e3bb65885
don't require Qt 4.7 (bug #42657)
John W. Eaton <jwe@octave.org>
parents:
18141
diff
changeset
|
467 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
625e3bb65885
don't require Qt 4.7 (bug #42657)
John W. Eaton <jwe@octave.org>
parents:
18141
diff
changeset
|
468 #include <QFont> |
625e3bb65885
don't require Qt 4.7 (bug #42657)
John W. Eaton <jwe@octave.org>
parents:
18141
diff
changeset
|
469 ]], [[ |
625e3bb65885
don't require Qt 4.7 (bug #42657)
John W. Eaton <jwe@octave.org>
parents:
18141
diff
changeset
|
470 QFont::StyleStrategy strategy = QFont::ForceIntegerMetrics; |
625e3bb65885
don't require Qt 4.7 (bug #42657)
John W. Eaton <jwe@octave.org>
parents:
18141
diff
changeset
|
471 ]])], |
625e3bb65885
don't require Qt 4.7 (bug #42657)
John W. Eaton <jwe@octave.org>
parents:
18141
diff
changeset
|
472 octave_cv_decl_qfont_force_integer_metrics=yes, |
625e3bb65885
don't require Qt 4.7 (bug #42657)
John W. Eaton <jwe@octave.org>
parents:
18141
diff
changeset
|
473 octave_cv_decl_qfont_force_integer_metrics=no) |
625e3bb65885
don't require Qt 4.7 (bug #42657)
John W. Eaton <jwe@octave.org>
parents:
18141
diff
changeset
|
474 CPPFLAGS="$ac_octave_save_CPPFLAGS" |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
475 CXXFLAGS="$ac_octave_save_CXXFLAGS" |
18973
625e3bb65885
don't require Qt 4.7 (bug #42657)
John W. Eaton <jwe@octave.org>
parents:
18141
diff
changeset
|
476 AC_LANG_POP(C++) |
625e3bb65885
don't require Qt 4.7 (bug #42657)
John W. Eaton <jwe@octave.org>
parents:
18141
diff
changeset
|
477 ]) |
625e3bb65885
don't require Qt 4.7 (bug #42657)
John W. Eaton <jwe@octave.org>
parents:
18141
diff
changeset
|
478 if test $octave_cv_decl_qfont_force_integer_metrics = yes; then |
625e3bb65885
don't require Qt 4.7 (bug #42657)
John W. Eaton <jwe@octave.org>
parents:
18141
diff
changeset
|
479 AC_DEFINE(HAVE_QFONT_FORCE_INTEGER_METRICS, 1, |
625e3bb65885
don't require Qt 4.7 (bug #42657)
John W. Eaton <jwe@octave.org>
parents:
18141
diff
changeset
|
480 [Define to 1 if Qt provides QFont::ForceIntegerMetrics.]) |
625e3bb65885
don't require Qt 4.7 (bug #42657)
John W. Eaton <jwe@octave.org>
parents:
18141
diff
changeset
|
481 fi |
625e3bb65885
don't require Qt 4.7 (bug #42657)
John W. Eaton <jwe@octave.org>
parents:
18141
diff
changeset
|
482 ]) |
625e3bb65885
don't require Qt 4.7 (bug #42657)
John W. Eaton <jwe@octave.org>
parents:
18141
diff
changeset
|
483 dnl |
22286
f394436a4025
build: improve QScintilla detection to work with distro naming schemes (bug #48773)
Mike Miller <mtmiller@octave.org>
parents:
22257
diff
changeset
|
484 dnl Check whether QScintilla SetPlaceholderText function exists. |
15291
7ae14907ae43
build: Add tests for specific Qt functions to configure.ac
Rik <rik@octave.org>
parents:
15250
diff
changeset
|
485 dnl FIXME: This test uses a version number. It potentially could |
7ae14907ae43
build: Add tests for specific Qt functions to configure.ac
Rik <rik@octave.org>
parents:
15250
diff
changeset
|
486 dnl be re-written to actually call the function, but is it worth it? |
9519
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
487 dnl |
15291
7ae14907ae43
build: Add tests for specific Qt functions to configure.ac
Rik <rik@octave.org>
parents:
15250
diff
changeset
|
488 AC_DEFUN([OCTAVE_CHECK_FUNC_SETPLACEHOLDERTEXT], [ |
7ae14907ae43
build: Add tests for specific Qt functions to configure.ac
Rik <rik@octave.org>
parents:
15250
diff
changeset
|
489 AC_CACHE_CHECK([whether Qt has SetPlaceholderText function], |
7ae14907ae43
build: Add tests for specific Qt functions to configure.ac
Rik <rik@octave.org>
parents:
15250
diff
changeset
|
490 [octave_cv_func_setplaceholdertext], |
7ae14907ae43
build: Add tests for specific Qt functions to configure.ac
Rik <rik@octave.org>
parents:
15250
diff
changeset
|
491 [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
|
492 ac_octave_save_CPPFLAGS="$CPPFLAGS" |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
493 ac_octave_save_CXXFLAGS="$CXXFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
494 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
495 CXXFLAGS="$CXXPICFLAG $CXXFLAGS" |
20151
88c0f8f56a4f
acinclude.m4: Use simpler AC_PREPROC_IFELSE test for checking SETPLACEHOLDERTEXT.
Rik <rik@octave.org>
parents:
20149
diff
changeset
|
496 AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[ |
23174
039dfdc2d2ad
acinclude.m4: Correct test for SetPlaceHolderText.
Rik <rik@octave.org>
parents:
23172
diff
changeset
|
497 #include <qglobal.h> |
15291
7ae14907ae43
build: Add tests for specific Qt functions to configure.ac
Rik <rik@octave.org>
parents:
15250
diff
changeset
|
498 ]], [[ |
7ae14907ae43
build: Add tests for specific Qt functions to configure.ac
Rik <rik@octave.org>
parents:
15250
diff
changeset
|
499 #if QT_VERSION < 0x040700 |
15295
43e484fa7e42
build: Clean up configure macros for building GUI.
Rik <rik@octave.org>
parents:
15294
diff
changeset
|
500 #error No SetPlacholderText function available. |
15291
7ae14907ae43
build: Add tests for specific Qt functions to configure.ac
Rik <rik@octave.org>
parents:
15250
diff
changeset
|
501 #endif |
7ae14907ae43
build: Add tests for specific Qt functions to configure.ac
Rik <rik@octave.org>
parents:
15250
diff
changeset
|
502 ]])], |
7ae14907ae43
build: Add tests for specific Qt functions to configure.ac
Rik <rik@octave.org>
parents:
15250
diff
changeset
|
503 octave_cv_func_setplaceholdertext=yes, |
7ae14907ae43
build: Add tests for specific Qt functions to configure.ac
Rik <rik@octave.org>
parents:
15250
diff
changeset
|
504 octave_cv_func_setplaceholdertext=no) |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
505 CPPFLAGS="$ac_octave_save_CPPFLAGS" |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
506 CXXFLAGS="$ac_octave_save_CXXFLAGS" |
15291
7ae14907ae43
build: Add tests for specific Qt functions to configure.ac
Rik <rik@octave.org>
parents:
15250
diff
changeset
|
507 AC_LANG_POP(C++) |
7ae14907ae43
build: Add tests for specific Qt functions to configure.ac
Rik <rik@octave.org>
parents:
15250
diff
changeset
|
508 ]) |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
509 if test $octave_cv_func_setplaceholdertext = yes; then |
17034
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
510 AC_DEFINE(HAVE_SETPLACEHOLDERTEXT, 1, |
15291
7ae14907ae43
build: Add tests for specific Qt functions to configure.ac
Rik <rik@octave.org>
parents:
15250
diff
changeset
|
511 [Define to 1 if you have the Qt SetPlaceholderText function.]) |
7ae14907ae43
build: Add tests for specific Qt functions to configure.ac
Rik <rik@octave.org>
parents:
15250
diff
changeset
|
512 fi |
7ae14907ae43
build: Add tests for specific Qt functions to configure.ac
Rik <rik@octave.org>
parents:
15250
diff
changeset
|
513 ]) |
7ae14907ae43
build: Add tests for specific Qt functions to configure.ac
Rik <rik@octave.org>
parents:
15250
diff
changeset
|
514 dnl |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
515 dnl Check whether the Qt QAbstractItemModel::beginResetModel function exists. |
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
516 dnl Also checks for QAbstractItemModel::endResetModel. These are two of the |
17111
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
517 dnl newest Qt functions that the Octave GUI depends on, added in Qt 4.6. |
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
518 dnl |
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
519 AC_DEFUN([OCTAVE_CHECK_FUNC_QABSTRACTITEMMODEL_BEGINRESETMODEL], [ |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
520 AC_CACHE_CHECK([whether Qt has the QAbstractItemModel::beginResetModel function], |
17111
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
521 [octave_cv_func_qabstractitemmodel_beginresetmodel], |
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
522 [AC_LANG_PUSH(C++) |
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
523 ac_octave_save_CPPFLAGS="$CPPFLAGS" |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
524 ac_octave_save_CXXFLAGS="$CXXFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
525 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
526 CXXFLAGS="$CXXPICFLAG $CXXFLAGS" |
17111
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
527 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
528 #include <QAbstractItemModel> |
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
529 class item_model : public QAbstractItemModel |
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
530 { |
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
531 public: |
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
532 item_model (QObject *parent = 0) : QAbstractItemModel (parent) {} |
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
533 ~item_model () {} |
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
534 QModelIndex index (int, int, const QModelIndex& m) const { return m; } |
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
535 QModelIndex parent (const QModelIndex& m) const { return m; } |
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
536 int columnCount (const QModelIndex&) const { return 0; } |
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
537 int rowCount (const QModelIndex&) const { return 0; } |
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
538 QVariant data (const QModelIndex&, int) const { return QVariant(); } |
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
539 void update_model () |
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
540 { |
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
541 this->beginResetModel (); |
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
542 this->endResetModel (); |
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
543 } |
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
544 }; |
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
545 ]], [[ |
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
546 item_model model; |
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
547 model.update_model (); |
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
548 ]])], |
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
549 octave_cv_func_qabstractitemmodel_beginresetmodel=yes, |
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
550 octave_cv_func_qabstractitemmodel_beginresetmodel=no) |
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
551 CPPFLAGS="$ac_octave_save_CPPFLAGS" |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
552 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
|
553 AC_LANG_POP(C++) |
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
554 ]) |
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
555 if test $octave_cv_func_qabstractitemmodel_beginresetmodel = yes; then |
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
556 AC_DEFINE(HAVE_QABSTRACTITEMMODEL_BEGINRESETMODEL, 1, |
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
557 [Define to 1 if Qt has the QAbstractItemModel::beginResetModel() function.]) |
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
558 fi |
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
559 ]) |
bb713af2e1d9
build: detect Qt functions required for building the gui
Mike Miller <mtmiller@ieee.org>
parents:
17034
diff
changeset
|
560 dnl |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
561 dnl Check whether the Qt QTabWidget::setMovable function exists. |
18216
e54cfaae830b
Make editor tabs draggable if feature is available
Richard Crozier richard dot crozier(at)yahoo.co.uk
parents:
18141
diff
changeset
|
562 dnl This function was added in Qt 4.5. |
e54cfaae830b
Make editor tabs draggable if feature is available
Richard Crozier richard dot crozier(at)yahoo.co.uk
parents:
18141
diff
changeset
|
563 dnl |
e54cfaae830b
Make editor tabs draggable if feature is available
Richard Crozier richard dot crozier(at)yahoo.co.uk
parents:
18141
diff
changeset
|
564 AC_DEFUN([OCTAVE_CHECK_FUNC_QTABWIDGET_SETMOVABLE], [ |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
565 AC_CACHE_CHECK([whether Qt has the QTabWidget::setMovable function], |
18216
e54cfaae830b
Make editor tabs draggable if feature is available
Richard Crozier richard dot crozier(at)yahoo.co.uk
parents:
18141
diff
changeset
|
566 [octave_cv_func_qtabwidget_setmovable], |
e54cfaae830b
Make editor tabs draggable if feature is available
Richard Crozier richard dot crozier(at)yahoo.co.uk
parents:
18141
diff
changeset
|
567 [AC_LANG_PUSH(C++) |
e54cfaae830b
Make editor tabs draggable if feature is available
Richard Crozier richard dot crozier(at)yahoo.co.uk
parents:
18141
diff
changeset
|
568 ac_octave_save_CPPFLAGS="$CPPFLAGS" |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
569 ac_octave_save_CXXFLAGS="$CXXFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
570 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
571 CXXFLAGS="$CXXPICFLAG $CXXFLAGS" |
18216
e54cfaae830b
Make editor tabs draggable if feature is available
Richard Crozier richard dot crozier(at)yahoo.co.uk
parents:
18141
diff
changeset
|
572 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
e54cfaae830b
Make editor tabs draggable if feature is available
Richard Crozier richard dot crozier(at)yahoo.co.uk
parents:
18141
diff
changeset
|
573 #include <QTabWidget> |
e54cfaae830b
Make editor tabs draggable if feature is available
Richard Crozier richard dot crozier(at)yahoo.co.uk
parents:
18141
diff
changeset
|
574 class tab_widget : public QTabWidget |
e54cfaae830b
Make editor tabs draggable if feature is available
Richard Crozier richard dot crozier(at)yahoo.co.uk
parents:
18141
diff
changeset
|
575 { |
e54cfaae830b
Make editor tabs draggable if feature is available
Richard Crozier richard dot crozier(at)yahoo.co.uk
parents:
18141
diff
changeset
|
576 public: |
e54cfaae830b
Make editor tabs draggable if feature is available
Richard Crozier richard dot crozier(at)yahoo.co.uk
parents:
18141
diff
changeset
|
577 tab_widget (QWidget *parent = 0) : QTabWidget (parent) { this->setMovable (true); } |
e54cfaae830b
Make editor tabs draggable if feature is available
Richard Crozier richard dot crozier(at)yahoo.co.uk
parents:
18141
diff
changeset
|
578 ~tab_widget () {} |
e54cfaae830b
Make editor tabs draggable if feature is available
Richard Crozier richard dot crozier(at)yahoo.co.uk
parents:
18141
diff
changeset
|
579 }; |
e54cfaae830b
Make editor tabs draggable if feature is available
Richard Crozier richard dot crozier(at)yahoo.co.uk
parents:
18141
diff
changeset
|
580 ]], [[ |
e54cfaae830b
Make editor tabs draggable if feature is available
Richard Crozier richard dot crozier(at)yahoo.co.uk
parents:
18141
diff
changeset
|
581 tab_widget tw; |
e54cfaae830b
Make editor tabs draggable if feature is available
Richard Crozier richard dot crozier(at)yahoo.co.uk
parents:
18141
diff
changeset
|
582 ]])], |
e54cfaae830b
Make editor tabs draggable if feature is available
Richard Crozier richard dot crozier(at)yahoo.co.uk
parents:
18141
diff
changeset
|
583 octave_cv_func_qtabwidget_setmovable=yes, |
e54cfaae830b
Make editor tabs draggable if feature is available
Richard Crozier richard dot crozier(at)yahoo.co.uk
parents:
18141
diff
changeset
|
584 octave_cv_func_qtabwidget_setmovable=no) |
e54cfaae830b
Make editor tabs draggable if feature is available
Richard Crozier richard dot crozier(at)yahoo.co.uk
parents:
18141
diff
changeset
|
585 CPPFLAGS="$ac_octave_save_CPPFLAGS" |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
586 CXXFLAGS="$ac_octave_save_CXXFLAGS" |
18216
e54cfaae830b
Make editor tabs draggable if feature is available
Richard Crozier richard dot crozier(at)yahoo.co.uk
parents:
18141
diff
changeset
|
587 AC_LANG_POP(C++) |
e54cfaae830b
Make editor tabs draggable if feature is available
Richard Crozier richard dot crozier(at)yahoo.co.uk
parents:
18141
diff
changeset
|
588 ]) |
e54cfaae830b
Make editor tabs draggable if feature is available
Richard Crozier richard dot crozier(at)yahoo.co.uk
parents:
18141
diff
changeset
|
589 if test $octave_cv_func_qtabwidget_setmovable = yes; then |
e54cfaae830b
Make editor tabs draggable if feature is available
Richard Crozier richard dot crozier(at)yahoo.co.uk
parents:
18141
diff
changeset
|
590 AC_DEFINE(HAVE_QTABWIDGET_SETMOVABLE, 1, |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
591 [Define to 1 if Qt has the QTabWidget::setMovable function.]) |
18216
e54cfaae830b
Make editor tabs draggable if feature is available
Richard Crozier richard dot crozier(at)yahoo.co.uk
parents:
18141
diff
changeset
|
592 fi |
e54cfaae830b
Make editor tabs draggable if feature is available
Richard Crozier richard dot crozier(at)yahoo.co.uk
parents:
18141
diff
changeset
|
593 ]) |
e54cfaae830b
Make editor tabs draggable if feature is available
Richard Crozier richard dot crozier(at)yahoo.co.uk
parents:
18141
diff
changeset
|
594 dnl |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
595 dnl Check whether the QsciScintilla::findFirstInSelection function exists. |
18854
0a66861d8069
implementation of search in selection in gui editor (bbug #41196)
Torsten <ttl@justmail.de>
parents:
18216
diff
changeset
|
596 dnl This function was added in QScintilla 2.7. |
0a66861d8069
implementation of search in selection in gui editor (bbug #41196)
Torsten <ttl@justmail.de>
parents:
18216
diff
changeset
|
597 dnl |
0a66861d8069
implementation of search in selection in gui editor (bbug #41196)
Torsten <ttl@justmail.de>
parents:
18216
diff
changeset
|
598 AC_DEFUN([OCTAVE_CHECK_FUNC_QSCI_FINDSELECTION], [ |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
599 AC_CACHE_CHECK([whether QSci has the QsciScintilla::findFirstInSelection function], |
18854
0a66861d8069
implementation of search in selection in gui editor (bbug #41196)
Torsten <ttl@justmail.de>
parents:
18216
diff
changeset
|
600 [octave_cv_func_qsci_findfirstinselection], |
0a66861d8069
implementation of search in selection in gui editor (bbug #41196)
Torsten <ttl@justmail.de>
parents:
18216
diff
changeset
|
601 [AC_LANG_PUSH(C++) |
0a66861d8069
implementation of search in selection in gui editor (bbug #41196)
Torsten <ttl@justmail.de>
parents:
18216
diff
changeset
|
602 ac_octave_save_CPPFLAGS="$CPPFLAGS" |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
603 ac_octave_save_CXXFLAGS="$CXXFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
604 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
605 CXXFLAGS="$CXXPICFLAG $CXXFLAGS" |
18854
0a66861d8069
implementation of search in selection in gui editor (bbug #41196)
Torsten <ttl@justmail.de>
parents:
18216
diff
changeset
|
606 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
0a66861d8069
implementation of search in selection in gui editor (bbug #41196)
Torsten <ttl@justmail.de>
parents:
18216
diff
changeset
|
607 #include <Qsci/qsciscintilla.h> |
0a66861d8069
implementation of search in selection in gui editor (bbug #41196)
Torsten <ttl@justmail.de>
parents:
18216
diff
changeset
|
608 class qsci : public QsciScintilla |
0a66861d8069
implementation of search in selection in gui editor (bbug #41196)
Torsten <ttl@justmail.de>
parents:
18216
diff
changeset
|
609 { |
0a66861d8069
implementation of search in selection in gui editor (bbug #41196)
Torsten <ttl@justmail.de>
parents:
18216
diff
changeset
|
610 public: |
0a66861d8069
implementation of search in selection in gui editor (bbug #41196)
Torsten <ttl@justmail.de>
parents:
18216
diff
changeset
|
611 qsci (QWidget *parent = 0) : QsciScintilla (parent) |
0a66861d8069
implementation of search in selection in gui editor (bbug #41196)
Torsten <ttl@justmail.de>
parents:
18216
diff
changeset
|
612 { this->findFirstInSelection (QString ("x"),true,true,true,true,true); } |
0a66861d8069
implementation of search in selection in gui editor (bbug #41196)
Torsten <ttl@justmail.de>
parents:
18216
diff
changeset
|
613 ~qsci () {} |
0a66861d8069
implementation of search in selection in gui editor (bbug #41196)
Torsten <ttl@justmail.de>
parents:
18216
diff
changeset
|
614 }; |
0a66861d8069
implementation of search in selection in gui editor (bbug #41196)
Torsten <ttl@justmail.de>
parents:
18216
diff
changeset
|
615 ]], [[ |
0a66861d8069
implementation of search in selection in gui editor (bbug #41196)
Torsten <ttl@justmail.de>
parents:
18216
diff
changeset
|
616 qsci edit; |
0a66861d8069
implementation of search in selection in gui editor (bbug #41196)
Torsten <ttl@justmail.de>
parents:
18216
diff
changeset
|
617 ]])], |
0a66861d8069
implementation of search in selection in gui editor (bbug #41196)
Torsten <ttl@justmail.de>
parents:
18216
diff
changeset
|
618 octave_cv_func_qsci_findfirstinselection=yes, |
0a66861d8069
implementation of search in selection in gui editor (bbug #41196)
Torsten <ttl@justmail.de>
parents:
18216
diff
changeset
|
619 octave_cv_func_qsci_findfirstinselection=no) |
0a66861d8069
implementation of search in selection in gui editor (bbug #41196)
Torsten <ttl@justmail.de>
parents:
18216
diff
changeset
|
620 CPPFLAGS="$ac_octave_save_CPPFLAGS" |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
621 CXXFLAGS="$ac_octave_save_CXXFLAGS" |
18854
0a66861d8069
implementation of search in selection in gui editor (bbug #41196)
Torsten <ttl@justmail.de>
parents:
18216
diff
changeset
|
622 AC_LANG_POP(C++) |
0a66861d8069
implementation of search in selection in gui editor (bbug #41196)
Torsten <ttl@justmail.de>
parents:
18216
diff
changeset
|
623 ]) |
0a66861d8069
implementation of search in selection in gui editor (bbug #41196)
Torsten <ttl@justmail.de>
parents:
18216
diff
changeset
|
624 if test $octave_cv_func_qsci_findfirstinselection = yes; then |
0a66861d8069
implementation of search in selection in gui editor (bbug #41196)
Torsten <ttl@justmail.de>
parents:
18216
diff
changeset
|
625 AC_DEFINE(HAVE_QSCI_FINDSELECTION, 1, |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
626 [Define to 1 if Qsci has the QsciScintilla::findFirstInSelection function.]) |
18854
0a66861d8069
implementation of search in selection in gui editor (bbug #41196)
Torsten <ttl@justmail.de>
parents:
18216
diff
changeset
|
627 fi |
0a66861d8069
implementation of search in selection in gui editor (bbug #41196)
Torsten <ttl@justmail.de>
parents:
18216
diff
changeset
|
628 ]) |
0a66861d8069
implementation of search in selection in gui editor (bbug #41196)
Torsten <ttl@justmail.de>
parents:
18216
diff
changeset
|
629 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
630 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
|
631 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
632 AC_DEFUN([OCTAVE_CHECK_HDF5_HAS_VER_16_API], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
633 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
|
634 [octave_cv_hdf5_has_ver_16_api], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
635 [AC_LINK_IFELSE([AC_LANG_PROGRAM([[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
636 #include <hdf5.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
637 ]], [[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
638 H5Eset_auto (0, 0); |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
639 ]])], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
640 octave_cv_hdf5_has_ver_16_api=yes, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
641 octave_cv_hdf5_has_ver_16_api=no) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
642 ]) |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
643 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
|
644 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
|
645 fi |
14605
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14550
diff
changeset
|
646 ]) |
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14550
diff
changeset
|
647 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
648 dnl Usage: |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
649 dnl OCTAVE_CHECK_LIB(LIBRARY, DOC-NAME, WARN-MSG, HEADER, FUNC, |
22103
9811e7875d52
build: allow pkg-config name to differ from library name
Mike Miller <mtmiller@octave.org>
parents:
22039
diff
changeset
|
650 dnl LANG, DOC-STRING, EXTRA-CHECK, PKG-CONFIG-NAME) |
14605
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14550
diff
changeset
|
651 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
652 AC_DEFUN([OCTAVE_CHECK_LIB], [ |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9520
diff
changeset
|
653 AC_ARG_WITH([$1-includedir], |
9519
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
654 [AS_HELP_STRING([--with-$1-includedir=DIR], |
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
655 [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
|
656 [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
|
657 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
|
658 |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9520
diff
changeset
|
659 AC_ARG_WITH([$1-libdir], |
9519
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
660 [AS_HELP_STRING([--with-$1-libdir=DIR], |
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
661 [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
|
662 [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
|
663 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
|
664 |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9520
diff
changeset
|
665 AC_ARG_WITH([$1], |
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9520
diff
changeset
|
666 [m4_ifblank([$7], |
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9520
diff
changeset
|
667 [AS_HELP_STRING([--without-$1], [don't use $2 library])], |
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9520
diff
changeset
|
668 [AS_HELP_STRING([--without-$1], [$7])])], |
9519
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
669 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
|
670 |
22039
0a528a6dac95
build: use pkg-config in OCTAVE_CHECK_LIB without overriding user options
Mike Miller <mtmiller@octave.org>
parents:
22036
diff
changeset
|
671 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
|
672 m4_toupper([$1])_LIBS= |
21381 | 673 warn_$1="$3" |
9519
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
674 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
|
675 no) |
21381 | 676 warn_$1="--without-$1 specified. Functions or features that depend on $2 will be disabled." |
9539
41a74dcd14df
Clear QHULL_LIBS etc on errors. Interpret --without-qhull etc correctly.
David Grundberg <individ@acc.umu.se>
parents:
9531
diff
changeset
|
677 m4_toupper([$1])_LIBS= |
41a74dcd14df
Clear QHULL_LIBS etc on errors. Interpret --without-qhull etc correctly.
David Grundberg <individ@acc.umu.se>
parents:
9531
diff
changeset
|
678 ;; |
9519
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
679 yes | "") |
22039
0a528a6dac95
build: use pkg-config in OCTAVE_CHECK_LIB without overriding user options
Mike Miller <mtmiller@octave.org>
parents:
22036
diff
changeset
|
680 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
|
681 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
|
682 ;; |
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
683 -* | */* | *.a | *.so | *.so.* | *.o) |
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
684 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
|
685 ;; |
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
686 *) |
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
687 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
|
688 ;; |
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
689 esac |
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
690 |
22039
0a528a6dac95
build: use pkg-config in OCTAVE_CHECK_LIB without overriding user options
Mike Miller <mtmiller@octave.org>
parents:
22036
diff
changeset
|
691 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
|
692 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
|
693 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
|
694 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
|
695 fi |
0a528a6dac95
build: use pkg-config in OCTAVE_CHECK_LIB without overriding user options
Mike Miller <mtmiller@octave.org>
parents:
22036
diff
changeset
|
696 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
|
697 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
|
698 fi |
23835
6ae0292aaa5c
configure: ensure empty pkg-config results are actually empty (bug #51680)
Mike Miller <mtmiller@octave.org>
parents:
23414
diff
changeset
|
699 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
|
700 ]) |
0a528a6dac95
build: use pkg-config in OCTAVE_CHECK_LIB without overriding user options
Mike Miller <mtmiller@octave.org>
parents:
22036
diff
changeset
|
701 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
|
702 |
9519
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
703 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
|
704 ac_octave_save_CPPFLAGS="$CPPFLAGS" |
15350
6a0c0d3d60b6
build: Implement some caching for OCTAVE_CHECK_LIB macro.
Rik <rik@octave.org>
parents:
15338
diff
changeset
|
705 ac_octave_save_LDFLAGS="$LDFLAGS" |
6a0c0d3d60b6
build: Implement some caching for OCTAVE_CHECK_LIB macro.
Rik <rik@octave.org>
parents:
15338
diff
changeset
|
706 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
|
707 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
|
708 LDFLAGS="$m4_toupper([$1])_LDFLAGS $LDFLAGS" |
6a0c0d3d60b6
build: Implement some caching for OCTAVE_CHECK_LIB macro.
Rik <rik@octave.org>
parents:
15338
diff
changeset
|
709 LIBS="$m4_toupper([$1])_LIBS $LIBS" |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9520
diff
changeset
|
710 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
|
711 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
|
712 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
|
713 [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
|
714 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
|
715 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
|
716 [octave_cv_lib_$1], |
6a0c0d3d60b6
build: Implement some caching for OCTAVE_CHECK_LIB macro.
Rik <rik@octave.org>
parents:
15338
diff
changeset
|
717 [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
|
718 [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
|
719 ]) |
6a0c0d3d60b6
build: Implement some caching for OCTAVE_CHECK_LIB macro.
Rik <rik@octave.org>
parents:
15338
diff
changeset
|
720 if test "$octave_cv_lib_$1" = yes; then |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
721 m4_ifblank([$8], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
722 warn_$1= |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
723 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
|
724 [Define to 1 if $2 is available.])], [$8]) |
9519
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
725 fi |
9568
d3fccc4c4b9e
use OCTAVE_CHECK_LIBRARY to check for ARPACK
John W. Eaton <jwe@octave.org>
parents:
9543
diff
changeset
|
726 fi |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9520
diff
changeset
|
727 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
|
728 CPPFLAGS="$ac_octave_save_CPPFLAGS" |
15350
6a0c0d3d60b6
build: Implement some caching for OCTAVE_CHECK_LIB macro.
Rik <rik@octave.org>
parents:
15338
diff
changeset
|
729 LDFLAGS="$ac_octave_save_LDFLAGS" |
6a0c0d3d60b6
build: Implement some caching for OCTAVE_CHECK_LIB macro.
Rik <rik@octave.org>
parents:
15338
diff
changeset
|
730 LIBS="$ac_octave_save_LIBS" |
21381 | 731 else |
732 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
|
733 fi |
15350
6a0c0d3d60b6
build: Implement some caching for OCTAVE_CHECK_LIB macro.
Rik <rik@octave.org>
parents:
15338
diff
changeset
|
734 |
9519
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
735 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
|
736 if test -n "$warn_$1"; then |
21381 | 737 OCTAVE_CONFIGURE_WARNING([warn_$1]) |
9539
41a74dcd14df
Clear QHULL_LIBS etc on errors. Interpret --without-qhull etc correctly.
David Grundberg <individ@acc.umu.se>
parents:
9531
diff
changeset
|
738 m4_toupper([$1])_LIBS= |
9519
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
739 fi |
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
740 ]) |
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
741 dnl |
15133
f91eac1bc66d
m4/acinclude.m4: Correct typos, use consistent style for describing macros.
Rik <rik@octave.org>
parents:
15126
diff
changeset
|
742 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
|
743 dnl |
14147
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
744 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
|
745 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
|
746 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
|
747 dnl allocated arrays in Fortran does not? |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
748 dnl |
18058
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
749 dnl FIXME: it would be nice to avoid the duplication of F77 macros |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
750 dnl and typedefs here and in the f77-fcn.h header file. |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
751 dnl |
24289
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
752 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
|
753 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
|
754 [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
|
755 [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
|
756 AC_RUN_IFELSE([AC_LANG_PROGRAM([[ |
14147
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
757 |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
758 #include <cfloat> |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
759 |
18058
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
760 #include <stdint.h> |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
761 |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
762 typedef OCTAVE_IDX_TYPE octave_idx_type; |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
763 typedef int F77_RET_T; |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
764 |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
765 #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
|
766 #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
|
767 |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
768 #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
|
769 |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
770 #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
|
771 #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
|
772 |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
773 extern "C" |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
774 { |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
775 F77_RET_T |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
776 F77_FUNC (dnaupd, DNAUPD) (octave_idx_type&, |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
777 F77_CONST_CHAR_ARG_DECL, |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
778 const octave_idx_type&, |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
779 F77_CONST_CHAR_ARG_DECL, |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
780 octave_idx_type&, const double&, |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
781 double*, const octave_idx_type&, double*, |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
782 const octave_idx_type&, octave_idx_type*, |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
783 octave_idx_type*, double*, double*, |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
784 const octave_idx_type&, octave_idx_type& |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
785 F77_CHAR_ARG_LEN_DECL |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
786 F77_CHAR_ARG_LEN_DECL); |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
787 |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
788 F77_RET_T |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
789 F77_FUNC (dneupd, DNEUPD) (const octave_idx_type&, |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
790 F77_CONST_CHAR_ARG_DECL, |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
791 octave_idx_type*, double*, double*, |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
792 double*, const octave_idx_type&, const double&, |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
793 const double&, double*, |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
794 F77_CONST_CHAR_ARG_DECL, |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
795 const octave_idx_type&, |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
796 F77_CONST_CHAR_ARG_DECL, |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
797 octave_idx_type&, const double&, double*, |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
798 const octave_idx_type&, double*, |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
799 const octave_idx_type&, octave_idx_type*, |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
800 octave_idx_type*, double*, double*, |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
801 const octave_idx_type&, octave_idx_type& |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
802 F77_CHAR_ARG_LEN_DECL |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
803 F77_CHAR_ARG_LEN_DECL |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
804 F77_CHAR_ARG_LEN_DECL); |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
805 |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
806 F77_RET_T |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
807 F77_FUNC (dgemv, DGEMV) (F77_CONST_CHAR_ARG_DECL, |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
808 const octave_idx_type&, const octave_idx_type&, |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
809 const double&, const double*, |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
810 const octave_idx_type&, const double*, |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
811 const octave_idx_type&, const double&, double*, |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
812 const octave_idx_type& |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
813 F77_CHAR_ARG_LEN_DECL); |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
814 } |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
815 |
14147
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
816 void |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
817 doit (void) |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
818 { |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
819 // 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
|
820 |
24289
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
821 // Problem matrix. See bug #31479. |
18058
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
822 octave_idx_type n = 4; |
14147
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
823 double *m = new double [n * n]; |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
824 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
|
825 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
|
826 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
|
827 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
|
828 |
14147
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
829 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
|
830 |
14147
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
831 resid[0] = 0.960966; |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
832 resid[1] = 0.741195; |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
833 resid[2] = 0.150143; |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
834 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
|
835 |
18058
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
836 octave_idx_type *ip = new octave_idx_type [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
|
837 |
14147
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
838 ip[0] = 1; // ishift |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
839 ip[1] = 0; // ip[1] not referenced |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
840 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
|
841 ip[3] = 1; // NB blocksize in recurrence |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
842 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
|
843 ip[5] = 0; // ip[5] not referenced |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
844 ip[6] = 1; // mode |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
845 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
|
846 ip[8] = 0; |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
847 ip[9] = 0; |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
848 ip[10] = 0; |
17034
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
849 |
18058
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
850 octave_idx_type *ipntr = new octave_idx_type [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
|
851 |
18058
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
852 octave_idx_type k = 1; |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
853 octave_idx_type p = 3; |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
854 octave_idx_type lwork = 3 * p * (p + 2); |
14147
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
855 |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
856 double *v = new double [n * (p + 1)]; |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
857 double *workl = new double [lwork + 1]; |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
858 double *workd = new double [3 * n + 1]; |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
859 |
18058
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
860 octave_idx_type ido = 0; |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
861 octave_idx_type 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
|
862 |
14147
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
863 double tol = DBL_EPSILON; |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
864 |
17034
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
865 do |
14147
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
866 { |
18058
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
867 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
|
868 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
|
869 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
|
870 workd, workl, lwork, info |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
871 F77_CHAR_ARG_LEN (1) |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
872 F77_CHAR_ARG_LEN (2)); |
14147
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
873 |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
874 if (ido == -1 || ido == 1 || ido == 2) |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
875 { |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
876 double *x = workd + ipntr[0] - 1; |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
877 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
|
878 |
18058
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
879 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
|
880 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
|
881 F77_CHAR_ARG_LEN (1)); |
14147
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
882 } |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
883 else |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
884 { |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
885 if (info < 0) |
24289
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
886 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
|
887 |
14147
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
888 break; |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
889 } |
17034
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
890 } |
14147
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
891 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
|
892 |
18058
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
893 octave_idx_type *sel = new octave_idx_type [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
|
894 |
14147
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
895 // 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
|
896 double *dr = new double [k + 1]; |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
897 double *di = new double [k + 1]; |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
898 double *workev = new double [3 * p]; |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
899 |
18058
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
900 for (octave_idx_type 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
|
901 dr[i] = di[i] = 0.0; |
14147
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
902 |
18058
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
903 octave_idx_type 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
|
904 |
14147
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
905 double sigmar = 0.0; |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
906 double sigmai = 0.0; |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
907 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
908 // 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
|
909 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
|
910 |
18058
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
911 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
|
912 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
|
913 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
|
914 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
|
915 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
|
916 workl, lwork, info |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
917 F77_CHAR_ARG_LEN (1) |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
918 F77_CHAR_ARG_LEN (1) |
46ca76f194cb
make arpack check work with --enable-64
John W. Eaton <jwe@octave.org>
parents:
18036
diff
changeset
|
919 F77_CHAR_ARG_LEN (2)); |
14147
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
920 } |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
921 |
14147
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
922 ]], [[ |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
923 |
14147
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
924 for (int i = 0; i < 10; i++) |
71e28fda7be9
use C++ program to test ARPACK
John W. Eaton <jwe@octave.org>
parents:
14144
diff
changeset
|
925 doit (); |
24289
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
926 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
927 ]])], |
24289
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
928 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
|
929 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
|
930 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
|
931 AC_LANG_POP(C++) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
932 ]) |
24289
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
933 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
|
934 $1 |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
935 : |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
936 else |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
937 $2 |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
938 : |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
939 fi |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
940 ]) |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
941 dnl |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
942 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
|
943 dnl |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
944 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
|
945 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
|
946 dnl See bug #52425. |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
947 dnl |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
948 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
|
949 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
|
950 [octave_cv_lib_arpack_ok_2], |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
951 [AC_LANG_PUSH(Fortran 77) |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
952 AC_RUN_IFELSE([[ |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
953 program bug_52425 |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
954 c |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
955 integer maxn, maxnev, maxncv, ldv |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
956 parameter (maxn=256, maxnev=10, maxncv=25, |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
957 $ ldv=maxn ) |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
958 c |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
959 Double precision |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
960 & 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
|
961 & 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
|
962 & ax(maxn) |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
963 logical select(maxncv) |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
964 integer iparam(11), ipntr(11) |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
965 c |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
966 character bmat*1, which*2 |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
967 integer ido, n, nev, ncv, lworkl, info, ierr, j, |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
968 & nx, nconv, maxitr, mode, ishfts |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
969 logical rvec |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
970 Double precision |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
971 & tol, sigma |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
972 c |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
973 Double precision |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
974 & zero |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
975 parameter (zero = 0.0D+0) |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
976 c |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
977 Double precision |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
978 & dnrm2 |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
979 external dnrm2, daxpy |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
980 c |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
981 intrinsic abs |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
982 c |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
983 n = 20 |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
984 nev = 4 |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
985 ncv = 20 |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
986 bmat = 'I' |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
987 which = 'BE' |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
988 c |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
989 lworkl = ncv*(ncv+8) |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
990 tol = zero |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
991 info = 1 |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
992 do j = 1,n |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
993 resid (j) = 1.0d0 |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
994 end do |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
995 ido = 0 |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
996 c |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
997 ishfts = 1 |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
998 maxitr = 300 |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
999 mode = 1 |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1000 c |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1001 iparam(1) = ishfts |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1002 iparam(3) = maxitr |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1003 iparam(7) = mode |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1004 c |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1005 10 continue |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1006 c |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1007 call dsaupd ( ido, bmat, n, which, nev, tol, resid, |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1008 & 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
|
1009 & lworkl, info ) |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1010 c |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1011 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
|
1012 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
|
1013 go to 10 |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1014 end if |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1015 c |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1016 if ( info .lt. 0 ) then |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1017 stop 1 |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1018 else |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1019 rvec = .false. |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1020 c |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1021 call dseupd ( rvec, 'All', select, d, v, ldv, sigma, |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1022 & bmat, n, which, nev, tol, resid, ncv, v, ldv, |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1023 & 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
|
1024 c |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1025 if ( ierr .ne. 0) then |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1026 stop 1 |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1027 else |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1028 nconv = iparam(5) |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1029 do 20 j=1, nconv |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1030 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
|
1031 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
|
1032 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
|
1033 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
|
1034 c |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1035 20 continue |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1036 c |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1037 c | Litmus test: return 1 or 0 based on returned eigenvalue |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1038 c |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1039 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
|
1040 stop 1 |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1041 else |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1042 stop 0 |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1043 end if |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1044 end if |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1045 end if |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1046 c |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1047 end |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1048 c |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1049 subroutine av (n, v, w) |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1050 integer n, j |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1051 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
|
1052 c |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1053 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
|
1054 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
|
1055 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
|
1056 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
|
1057 10 continue |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1058 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
|
1059 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
|
1060 return |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1061 end |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1062 ]], |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1063 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
|
1064 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
|
1065 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
|
1066 AC_LANG_POP(Fortran 77) |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1067 ]) |
f52d91f6ef80
Check ARPACK library for buggy behavior in configure (bug #52425)
Rik <rik@octave.org>
parents:
23835
diff
changeset
|
1068 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
|
1069 $1 |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
1070 : |
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
|
1071 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
|
1072 $2 |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
1073 : |
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
|
1074 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
|
1075 ]) |
834df9f10963
remove ARPACK files from sources and restore configure checks for external ARPACK library
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
1076 dnl |
17241
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1077 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
|
1078 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
|
1079 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
|
1080 dnl |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1081 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
|
1082 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
|
1083 [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
|
1084 [AC_LANG_PUSH(C++) |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1085 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
|
1086 extern "C" |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1087 { |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1088 #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
|
1089 #include <glpk/glpk.h> |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1090 #else |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1091 #include <glpk.h> |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1092 #endif |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1093 } |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1094 ]], [[ |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1095 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
|
1096 glp_iptcp iptcp; |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1097 glp_init_iptcp (&iptcp); |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1098 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
|
1099 ]])], |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1100 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
|
1101 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
|
1102 AC_LANG_POP(C++) |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1103 ]) |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1104 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
|
1105 $1 |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1106 : |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1107 else |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1108 $2 |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1109 : |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1110 fi |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1111 ]) |
03a666018e0f
build: Detect new GLPK API features required since changeset 54e251e699bb
Mike Miller <mtmiller@ieee.org>
parents:
17197
diff
changeset
|
1112 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1113 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
|
1114 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
|
1115 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
|
1116 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1117 AC_DEFUN([OCTAVE_CHECK_LIB_HDF5_DLL], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1118 AC_CACHE_CHECK([if _HDF5USEDLL_ needs to be defined], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1119 [octave_cv_lib_hdf5_dll], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1120 [AC_LINK_IFELSE([AC_LANG_PROGRAM([[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1121 #include <hdf5.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1122 ]], [[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1123 hid_t x = H5T_NATIVE_DOUBLE; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1124 return x |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1125 ]])], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1126 [octave_cv_lib_hdf5_dll=no], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1127 [save_CFLAGS="$CFLAGS" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1128 CFLAGS="$CFLAGS -DWIN32 -D_HDF5USEDLL_" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1129 save_LIBS="$LIBS" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1130 LIBS="$HDF5_LIBS $LIBS" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1131 AC_LINK_IFELSE([AC_LANG_PROGRAM([[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1132 #include <hdf5.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1133 ]], [[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1134 hid_t x = H5T_NATIVE_DOUBLE; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1135 return x |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1136 ]])], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1137 octave_cv_lib_hdf5_dll=yes, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1138 octave_cv_lib_hdf5_dll=no) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1139 CFLAGS="$save_CFLAGS" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1140 LIBS="$save_LIBS" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1141 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1142 ]) |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
1143 if test $octave_cv_lib_hdf5_dll = yes; then |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1144 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
|
1145 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1146 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1147 dnl |
15133
f91eac1bc66d
m4/acinclude.m4: Correct typos, use consistent style for describing macros.
Rik <rik@octave.org>
parents:
15126
diff
changeset
|
1148 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
|
1149 dnl |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15013
diff
changeset
|
1150 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
|
1151 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
|
1152 dnl |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15013
diff
changeset
|
1153 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
|
1154 dnl libraries and header files? |
7825
13871b7de124
Import sources for OpenGL-based renderer.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7361
diff
changeset
|
1155 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1156 AC_DEFUN([OCTAVE_CHECK_LIB_OPENGL], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1157 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
|
1158 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1159 ## On MacOSX systems the OpenGL framework can be used |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1160 OCTAVE_HAVE_FRAMEWORK(OpenGL, [[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1161 #include <OpenGL/gl.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1162 #include <OpenGL/glu.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1163 ]], [[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1164 GLint par; glGetIntegerv (GL_VIEWPORT, &par); |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1165 ]], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1166 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
|
1167 |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
1168 if test $have_framework_opengl = yes; then |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1169 AC_DEFINE(HAVE_FRAMEWORK_OPENGL, 1, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1170 [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
|
1171 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
|
1172 AC_MSG_NOTICE([adding -framework OpenGL to OPENGL_LIBS]) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1173 OCTAVE_CHECK_FUNC_GLUTESSCALLBACK_THREEDOTS |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1174 else |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1175 case $canonical_host_type in |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1176 *-*-mingw32* | *-*-msdosmsvc) |
15319
daf74ce2afdc
m4/acinclude.m4: Use more consistent m4 quoting of arguments to macros.
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
1177 AC_CHECK_HEADERS([windows.h]) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1178 ;; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1179 esac |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1180 have_opengl_incs=no |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1181 AC_CHECK_HEADERS([GL/gl.h OpenGL/gl.h], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1182 [AC_CHECK_HEADERS([GL/glu.h OpenGL/glu.h], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1183 [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
|
1184 #if defined (HAVE_WINDOWS_H) |
7954 | 1185 #include <windows.h> |
1186 #endif | |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1187 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1188 break |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1189 ], [], [ |
21724
aba2e6293dd8
use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents:
21604
diff
changeset
|
1190 #if defined (HAVE_WINDOWS_H) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1191 # include <windows.h> |
7954 | 1192 #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
|
1193 ]) |
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
|
1194 |
17197
fbee0d312af5
acinclude.m4: Remove some unnecessary double quotes around variables.
Rik <rik@octave.org>
parents:
17196
diff
changeset
|
1195 if test $have_opengl_incs = yes; then |
18866 | 1196 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
|
1197 #if defined (HAVE_WINDOWS_H) |
18866 | 1198 # include <windows.h> |
1199 #endif | |
1200 #if defined (HAVE_GL_GL_H) | |
1201 # include <GL/gl.h> | |
1202 #elif defined (HAVE_OPENGL_GL_H) | |
1203 # include <OpenGL/gl.h> | |
1204 #endif | |
1205 ]) | |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1206 case $canonical_host_type in |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1207 *-*-mingw32* | *-*-msdosmsvc) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1208 save_LIBS="$LIBS" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1209 LIBS="$LIBS -lopengl32" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1210 AC_MSG_CHECKING([for glEnable in -lopengl32]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1211 AC_LINK_IFELSE([AC_LANG_PROGRAM([[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1212 #if HAVE_WINDOWS_H |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1213 # include <windows.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1214 #endif |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1215 #if defined (HAVE_GL_GL_H) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1216 # include <GL/gl.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1217 #elif defined (HAVE_OPENGL_GL_H) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1218 # include <OpenGL/gl.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1219 #endif |
17034
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
1220 ]], [[ |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1221 glEnable(GL_SMOOTH); |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1222 ]])], [OPENGL_LIBS="-lopengl32 -lglu32"]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1223 |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1224 LIBS="$save_LIBS" |
21374
1487a68a496a
untangle configuration of OpenGL, FLTK, and Qt (bug #47263)
John W. Eaton <jwe@octave.org>
parents:
21354
diff
changeset
|
1225 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
|
1226 AC_MSG_RESULT([yes]) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1227 else |
15319
daf74ce2afdc
m4/acinclude.m4: Use more consistent m4 quoting of arguments to macros.
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
1228 AC_MSG_RESULT([no]) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1229 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1230 ;; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1231 *) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1232 ## 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
|
1233 AC_CHECK_LIB([GL], [glEnable], [OPENGL_LIBS="-lGL -lGLU"]) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1234 ;; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1235 esac |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1236 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
|
1237 fi |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1238 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
|
1239 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
|
1240 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
|
1241 fi |
7825
13871b7de124
Import sources for OpenGL-based renderer.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7361
diff
changeset
|
1242 ]) |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1243 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1244 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
|
1245 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1246 AC_DEFUN([OCTAVE_CHECK_LIB_QHULL_OK], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1247 AC_CACHE_CHECK([whether the qhull library works], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1248 [octave_cv_lib_qhull_ok], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1249 [AC_RUN_IFELSE([AC_LANG_PROGRAM([[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1250 #include <stdio.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1251 #if defined (HAVE_LIBQHULL_LIBQHULL_H) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1252 # include <libqhull/libqhull.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1253 # include <libqhull/qset.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1254 # include <libqhull/geom.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1255 # include <libqhull/poly.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1256 # include <libqhull/io.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1257 #elif defined (HAVE_QHULL_LIBQHULL_H) || defined (HAVE_QHULL_QHULL_H) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1258 # if defined (HAVE_QHULL_LIBQHULL_H) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1259 # include <qhull/libqhull.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1260 # else |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1261 # include <qhull/qhull.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1262 # endif |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1263 # include <qhull/qset.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1264 # include <qhull/geom.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1265 # include <qhull/poly.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1266 # include <qhull/io.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1267 #elif defined (HAVE_LIBQHULL_H) || defined (HAVE_QHULL_H) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1268 # if defined (HAVE_LIBQHULL_H) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1269 # include <libqhull.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1270 # else |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1271 # include <qhull.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1272 # endif |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1273 # include <qset.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1274 # include <geom.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1275 # include <poly.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1276 # include <io.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1277 #endif |
21724
aba2e6293dd8
use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents:
21604
diff
changeset
|
1278 #if defined (NEED_QHULL_VERSION) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1279 char *qh_version = "version"; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1280 #endif |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1281 ]], [[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1282 int dim = 2; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1283 int n = 4; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1284 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
|
1285 boolT ismalloc = 0; |
17034
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
1286 return qh_new_qhull (dim, n, points, ismalloc, "qhull ", 0, stderr); |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1287 ]])], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1288 octave_cv_lib_qhull_ok=yes, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1289 octave_cv_lib_qhull_ok=no, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1290 octave_cv_lib_qhull_ok=yes) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1291 ]) |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
1292 if test $octave_cv_lib_qhull_ok = yes; then |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1293 $1 |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
1294 : |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1295 else |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1296 $2 |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
1297 : |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1298 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
|
1299 ]) |
20715
5b7643257978
Remove trailing whitespace at end of lines.
Rik <rik@octave.org>
parents:
20420
diff
changeset
|
1300 dnl |
20153
3b3579ad7e46
Check for a modern version of sndfile in configure scripts (bug #44976).
Rik <rik@octave.org>
parents:
19816
diff
changeset
|
1301 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
|
1302 dnl |
3b3579ad7e46
Check for a modern version of sndfile in configure scripts (bug #44976).
Rik <rik@octave.org>
parents:
19816
diff
changeset
|
1303 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
|
1304 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
|
1305 [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
|
1306 [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
|
1307 #include <sndfile.h> |
3b3579ad7e46
Check for a modern version of sndfile in configure scripts (bug #44976).
Rik <rik@octave.org>
parents:
19816
diff
changeset
|
1308 ]], [[ |
3b3579ad7e46
Check for a modern version of sndfile in configure scripts (bug #44976).
Rik <rik@octave.org>
parents:
19816
diff
changeset
|
1309 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
|
1310 ]])], |
3b3579ad7e46
Check for a modern version of sndfile in configure scripts (bug #44976).
Rik <rik@octave.org>
parents:
19816
diff
changeset
|
1311 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
|
1312 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
|
1313 ]) |
3b3579ad7e46
Check for a modern version of sndfile in configure scripts (bug #44976).
Rik <rik@octave.org>
parents:
19816
diff
changeset
|
1314 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
|
1315 $1 |
3b3579ad7e46
Check for a modern version of sndfile in configure scripts (bug #44976).
Rik <rik@octave.org>
parents:
19816
diff
changeset
|
1316 : |
3b3579ad7e46
Check for a modern version of sndfile in configure scripts (bug #44976).
Rik <rik@octave.org>
parents:
19816
diff
changeset
|
1317 else |
3b3579ad7e46
Check for a modern version of sndfile in configure scripts (bug #44976).
Rik <rik@octave.org>
parents:
19816
diff
changeset
|
1318 $2 |
3b3579ad7e46
Check for a modern version of sndfile in configure scripts (bug #44976).
Rik <rik@octave.org>
parents:
19816
diff
changeset
|
1319 : |
3b3579ad7e46
Check for a modern version of sndfile in configure scripts (bug #44976).
Rik <rik@octave.org>
parents:
19816
diff
changeset
|
1320 fi |
3b3579ad7e46
Check for a modern version of sndfile in configure scripts (bug #44976).
Rik <rik@octave.org>
parents:
19816
diff
changeset
|
1321 ]) |
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
|
1322 dnl |
15302
a8cfbc1911e4
build: Set TERM_LIBS before checking for READLINE.
Rik <rik@octave.org>
parents:
15295
diff
changeset
|
1323 dnl Find a suitable termlib to use. |
a8cfbc1911e4
build: Set TERM_LIBS before checking for READLINE.
Rik <rik@octave.org>
parents:
15295
diff
changeset
|
1324 dnl |
a8cfbc1911e4
build: Set TERM_LIBS before checking for READLINE.
Rik <rik@octave.org>
parents:
15295
diff
changeset
|
1325 AC_DEFUN([OCTAVE_CHECK_LIB_TERMLIB], [ |
a8cfbc1911e4
build: Set TERM_LIBS before checking for READLINE.
Rik <rik@octave.org>
parents:
15295
diff
changeset
|
1326 TERM_LIBS= |
15338
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15336
diff
changeset
|
1327 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
|
1328 AC_SEARCH_LIBS([tputs], |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15336
diff
changeset
|
1329 [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
|
1330 [], []) |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15336
diff
changeset
|
1331 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
|
1332 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
|
1333 -l*) |
15338
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15336
diff
changeset
|
1334 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
|
1335 ;; |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15336
diff
changeset
|
1336 no) |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15336
diff
changeset
|
1337 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
|
1338 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
|
1339 ;; |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15336
diff
changeset
|
1340 esac |
15302
a8cfbc1911e4
build: Set TERM_LIBS before checking for READLINE.
Rik <rik@octave.org>
parents:
15295
diff
changeset
|
1341 |
15338
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15336
diff
changeset
|
1342 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
|
1343 dnl |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15336
diff
changeset
|
1344 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
|
1345 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
|
1346 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
|
1347 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
|
1348 dnl break]) |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15336
diff
changeset
|
1349 dnl done |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15336
diff
changeset
|
1350 |
15302
a8cfbc1911e4
build: Set TERM_LIBS before checking for READLINE.
Rik <rik@octave.org>
parents:
15295
diff
changeset
|
1351 AC_SUBST(TERM_LIBS) |
7825
13871b7de124
Import sources for OpenGL-based renderer.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7361
diff
changeset
|
1352 ]) |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1353 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1354 dnl Check for the Qhull version. |
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
|
1355 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1356 AC_DEFUN([OCTAVE_CHECK_QHULL_VERSION], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1357 AC_CACHE_CHECK([for qh_version in $QHULL_LIBS], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1358 [octave_cv_lib_qhull_version], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1359 [AC_LINK_IFELSE([AC_LANG_PROGRAM([[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1360 #include <stdio.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1361 #if defined (HAVE_LIBQHULL_LIBQHULL_H) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1362 # include <libqhull/libqhull.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1363 # include <libqhull/qset.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1364 # include <libqhull/geom.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1365 # include <libqhull/poly.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1366 # include <libqhull/io.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1367 #elif defined (HAVE_QHULL_LIBQHULL_H) || defined (HAVE_QHULL_QHULL_H) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1368 # if defined (HAVE_QHULL_LIBQHULL_H) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1369 # include <qhull/libqhull.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1370 # else |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1371 # include <qhull/qhull.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 # include <qhull/qset.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1374 # include <qhull/geom.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1375 # include <qhull/poly.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1376 # include <qhull/io.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1377 #elif defined (HAVE_LIBQHULL_H) || defined (HAVE_QHULL_H) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1378 # if defined (HAVE_LIBQHULL_H) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1379 # include <libqhull.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1380 # else |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1381 # include <qhull.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1382 # endif |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1383 # include <qset.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1384 # include <geom.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1385 # include <poly.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1386 # include <io.h> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1387 #endif |
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 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
|
1390 ]])], |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1391 octave_cv_lib_qhull_version=yes, octave_cv_lib_qhull_version=no) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1392 ]) |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
1393 if test $octave_cv_lib_qhull_version = no; then |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1394 AC_DEFINE(NEED_QHULL_VERSION, 1, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1395 [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
|
1396 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1397 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1398 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
|
1399 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
|
1400 dnl |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1401 AC_DEFUN([OCTAVE_CHECK_QT_OPENGL_OK], [ |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1402 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
|
1403 [octave_cv_qt_opengl_ok], |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1404 [AC_LANG_PUSH(C++) |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1405 ac_octave_save_CPPFLAGS="$CPPFLAGS" |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1406 ac_octave_save_CXXFLAGS="$CXXFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1407 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1408 CXXFLAGS="$CXXPICFLAG $CXXFLAGS" |
20420
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1409 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1410 #if HAVE_WINDOWS_H |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1411 # include <windows.h> |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1412 #endif |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1413 #if defined (HAVE_GL_GL_H) |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1414 # include <GL/gl.h> |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1415 #elif defined (HAVE_OPENGL_GL_H) |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1416 # include <OpenGL/gl.h> |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1417 #endif |
21724
aba2e6293dd8
use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents:
21604
diff
changeset
|
1418 #if defined (HAVE_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
|
1419 # include <GL/glu.h> |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1420 #elif defined HAVE_OPENGL_GLU_H || defined HAVE_FRAMEWORK_OPENGL |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1421 # include <OpenGL/glu.h> |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1422 #endif |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1423 #include <QGLWidget> |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1424 class gl_widget : public QGLWidget |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1425 { |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1426 public: |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1427 gl_widget (QWidget *parent = 0) : QGLWidget (parent) {} |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1428 ~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
|
1429 }; |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1430 ]], [[ |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1431 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
|
1432 ]])], |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1433 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
|
1434 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
|
1435 CPPFLAGS="$ac_octave_save_CPPFLAGS" |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1436 CXXFLAGS="$ac_octave_save_CXXFLAGS" |
20420
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1437 AC_LANG_POP(C++) |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1438 ]) |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1439 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
|
1440 $1 |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1441 : |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1442 else |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1443 $2 |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1444 : |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1445 fi |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1446 ]) |
6cfbf412a2c3
configure.ac: Test that Qt and OpenGL can be used together (bug #45672)
Mike Miller <mtmiller@octave.org>
parents:
20416
diff
changeset
|
1447 dnl |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1448 dnl Check whether Qt VERSION is present, supports QtOpenGL and |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1449 dnl QScintilla and will work for Octave. |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1450 dnl |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1451 dnl OCTAVE_CHECK_QT_VERSION(VERSION) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1452 dnl |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1453 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
|
1454 QT_CPPFLAGS= |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1455 QT_LDFLAGS= |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1456 QT_LIBS= |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1457 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1458 qt_version="$1"; |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1459 |
22255
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1460 build_qt_gui=yes |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1461 build_qt_graphics=no |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1462 use_qscintilla=no |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1463 win32_terminal=no |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1464 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1465 warn_qt_libraries="" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1466 warn_qt_version="" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1467 warn_qt_tools="" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1468 warn_qt_setlocale="" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1469 warn_qt_setvbuf="" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1470 warn_qt_lib_fcns="" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1471 warn_qt_abstract_item_model="" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1472 warn_qt_opengl="" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1473 warn_qscintilla="" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1474 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1475 ## Check for Qt libraries |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1476 case "$qt_version" in |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1477 4) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1478 QT_MODULES="QtCore QtGui QtNetwork QtOpenGL" |
22286
f394436a4025
build: improve QScintilla detection to work with distro naming schemes (bug #48773)
Mike Miller <mtmiller@octave.org>
parents:
22257
diff
changeset
|
1479 octave_qscintilla_libnames=qscintilla2 |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1480 ;; |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1481 5) |
22250
2fd4f1a3f4a8
allow building with Qt5 (bug #40252)
John W. Eaton <jwe@octave.org>
parents:
22234
diff
changeset
|
1482 QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport" |
23414
a759896c2b53
acinclude.m4: Look for "qscintilla_qt5" as another name for Qt5 scintilla library.
Rik <rik@octave.org>
parents:
23219
diff
changeset
|
1483 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
|
1484 ;; |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1485 *) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1486 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
|
1487 ;; |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1488 esac |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1489 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1490 PKG_CHECK_MODULES(QT, [$QT_MODULES], |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1491 [], |
22255
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1492 [build_qt_gui=no |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1493 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
|
1494 |
22255
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1495 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
|
1496 ## 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
|
1497 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
|
1498 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
|
1499 QT_LIBS="$($PKG_CONFIG --libs-only-l $QT_MODULES | $SED -e 's/^ *$//')" |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1500 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1501 case $host_os in |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1502 *darwin*) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1503 ## Qt might be installed in framework |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1504 if test -z "$QT_LIBS"; then |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1505 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
|
1506 QT_LIBS="`$PKG_CONFIG --libs-only-other $QT_MODULES | tr ' ' '\n' | $GREP -v -e '-F' | uniq | tr '\n' ' '`" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1507 ## 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
|
1508 ## of the -F flag |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1509 AM_CONDITIONAL([AMCOND_LINK_ALL_DEPS], |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1510 [test $link_all_deps = yes || test -n "$QT_LDFLAGS"]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1511 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1512 ;; |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1513 esac |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1514 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1515 if test $qt_version = 4; then |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1516 ## Check for Qt4 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1517 if ! `$PKG_CONFIG --atleast-version=4.0.0 QtCore`; then |
22255
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1518 build_qt_gui=no |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1519 warn_qt_version="Qt >= 4.0.0 not found; disabling Qt GUI" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1520 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1521 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1522 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1523 |
22255
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1524 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
|
1525 AC_CHECK_TOOLS(MOC, [moc-qt$qt_version]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1526 AC_CHECK_TOOLS(UIC, [uic-qt$qt_version]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1527 AC_CHECK_TOOLS(RCC, [rcc-qt$qt_version]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1528 AC_CHECK_TOOLS(LRELEASE, [lrelease-qt$qt_version]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1529 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1530 if test -z "$MOC" || test -z "$UIC" || test -z "$RCC" || test -z "$LRELEASE"; then |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1531 AC_CHECK_TOOLS(QTCHOOSER, [qtchooser]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1532 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1533 if test -z "$MOC"; then |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1534 AC_CHECK_TOOLS(MOC, [moc]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1535 if test -n "$QTCHOOSER"; then |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1536 MOCFLAGS="-qt$qt_version" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1537 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1538 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1539 if test -z "$UIC"; then |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1540 AC_CHECK_TOOLS(UIC, [uic]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1541 if test -n "$QTCHOOSER"; then |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1542 UICFLAGS="-qt$qt_version" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1543 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1544 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1545 if test -z "$RCC"; then |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1546 AC_CHECK_TOOLS(RCC, [rcc]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1547 if test -n "$QTCHOOSER"; then |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1548 RCCFLAGS="-qt$qt_version" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1549 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1550 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1551 if test -z "$LRELEASE"; then |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1552 AC_CHECK_TOOLS(LRELEASE, [lrelease]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1553 if test -n "$QTCHOOSER"; then |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1554 LRELEASEFLAGS="-qt$qt_version" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1555 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1556 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1557 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1558 |
22255
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1559 if test -z "$MOC" || test -z "$UIC" || test -z "$RCC" || test -z "$LRELEASE"; then |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1560 warn_qt_tools="one or more of the Qt utility programs moc, uic, rcc, and lrelease 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
|
1561 build_qt_gui=no |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1562 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1563 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1564 |
22255
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1565 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
|
1566 AC_CHECK_FUNCS([setlocale], [], |
22255
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1567 [build_qt_gui=no |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1568 warn_qt_setlocale="setlocale not found; disabling Qt GUI"]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1569 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1570 |
22255
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1571 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
|
1572 case $host_os in |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1573 mingw* | msdosmsvc*) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1574 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
|
1575 [build_qt_gui=no |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1576 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
|
1577 ;; |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1578 *) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1579 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
|
1580 AC_SEARCH_LIBS([openpty], [util], |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1581 [AC_DEFINE(HAVE_OPENPTY, [], [Define whether openpty exists])]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1582 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
|
1583 [build_qt_gui=no |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1584 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
|
1585 ;; |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1586 esac |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1587 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1588 |
22255
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1589 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
|
1590 OCTAVE_CHECK_FUNC_QABSTRACTITEMMODEL_BEGINRESETMODEL |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1591 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1592 if test $octave_cv_func_qabstractitemmodel_beginresetmodel = no; then |
22255
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1593 build_qt_gui=no |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1594 warn_qt_abstract_item_model="QAbstractItemModel::beginResetModel 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
|
1595 ## Invalidate cache so that this test will be done again if we |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1596 ## perform the test with a different Qt version. |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1597 $as_unset octave_cv_func_qabstractitemmodel_beginresetmodel |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1598 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1599 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1600 |
22255
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1601 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
|
1602 ## 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
|
1603 ## 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
|
1604 |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1605 AC_DEFINE(HAVE_QT, 1, |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1606 [Define to 1 if Qt is available, with all required functions, libraries, developer header files, and utility programs (moc, uic, rcc, and lrelease).]) |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1607 |
22255
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1608 ## 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
|
1609 ## 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
|
1610 ## 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
|
1611 |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1612 OCTAVE_CHECK_QFONT_MONOSPACE |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1613 OCTAVE_CHECK_QFONT_FORCE_INTEGER_METRICS |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1614 OCTAVE_CHECK_FUNC_QTABWIDGET_SETMOVABLE |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1615 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1616 if test -n "$OPENGL_LIBS"; then |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1617 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
|
1618 [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
|
1619 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1620 if test $build_qt_graphics = yes; then |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1621 AC_DEFINE(HAVE_QT_GRAPHICS, 1, [Define to 1 if Qt works with OpenGL libs (GL and GLU)]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1622 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1623 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1624 |
22286
f394436a4025
build: improve QScintilla detection to work with distro naming schemes (bug #48773)
Mike Miller <mtmiller@octave.org>
parents:
22257
diff
changeset
|
1625 ## 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
|
1626 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
|
1627 [octave_cv_lib_qscintilla], |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1628 [save_CPPFLAGS="$CPPFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1629 save_CXXFLAGS="$CXXFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1630 save_LDFLAGS="$LDFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1631 save_LIBS="$LIBS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1632 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1633 CXXFLAGS="$CXXPICFLAG $CXXFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1634 LDFLAGS="$QT_LDFLAGS $LDFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1635 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
|
1636 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
|
1637 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
|
1638 AC_LINK_IFELSE([AC_LANG_PROGRAM([[ |
22456
8924139b4f21
fix test for qscintilla (bug #49018)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
1639 #include <Qsci/qsciapis.h> |
8924139b4f21
fix test for qscintilla (bug #49018)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
1640 #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
|
1641 ]], [[ |
22456
8924139b4f21
fix test for qscintilla (bug #49018)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
1642 QsciLexer *lexer = new QsciLexerCPP (); |
8924139b4f21
fix test for qscintilla (bug #49018)
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
1643 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
|
1644 ]])], |
f394436a4025
build: improve QScintilla detection to work with distro naming schemes (bug #48773)
Mike Miller <mtmiller@octave.org>
parents:
22257
diff
changeset
|
1645 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
|
1646 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
|
1647 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
|
1648 break |
f394436a4025
build: improve QScintilla detection to work with distro naming schemes (bug #48773)
Mike Miller <mtmiller@octave.org>
parents:
22257
diff
changeset
|
1649 fi |
f394436a4025
build: improve QScintilla detection to work with distro naming schemes (bug #48773)
Mike Miller <mtmiller@octave.org>
parents:
22257
diff
changeset
|
1650 done |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1651 CPPFLAGS="$save_CPPFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1652 CXXFLAGS="$save_CXXFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1653 LDFLAGS="$save_LDFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1654 LIBS="$save_LIBS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1655 AC_LANG_POP([C++]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1656 ]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1657 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1658 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
|
1659 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
|
1660 else |
22286
f394436a4025
build: improve QScintilla detection to work with distro naming schemes (bug #48773)
Mike Miller <mtmiller@octave.org>
parents:
22257
diff
changeset
|
1661 ## 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
|
1662 ## 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
|
1663 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
|
1664 OCTAVE_CHECK_QSCINTILLA_VERSION |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1665 AC_DEFINE(HAVE_QSCINTILLA, 1, |
22250
2fd4f1a3f4a8
allow building with Qt5 (bug #40252)
John W. Eaton <jwe@octave.org>
parents:
22234
diff
changeset
|
1666 [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
|
1667 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1668 save_CPPFLAGS="$CPPFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1669 save_CXXFLAGS="$CXXFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1670 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1671 CXXFLAGS="$CXXPICFLAG $CXXFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1672 AC_LANG_PUSH(C++) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1673 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
|
1674 AC_LANG_POP(C++) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1675 CPPFLAGS="$save_CPPFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1676 CXXFLAGS="$save_CXXFLAGS" |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1677 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1678 OCTAVE_CHECK_FUNC_SETPLACEHOLDERTEXT |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1679 OCTAVE_CHECK_FUNC_QSCI_FINDSELECTION |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1680 use_qscintilla=yes |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1681 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1682 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1683 AC_SUBST(MOCFLAGS) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1684 AC_SUBST(UICFLAGS) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1685 AC_SUBST(RCCFLAGS) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1686 AC_SUBST(LRELEASEFLAGS) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1687 AC_SUBST(QT_CPPFLAGS) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1688 AC_SUBST(QT_LDFLAGS) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1689 AC_SUBST(QT_LIBS) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1690 ]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1691 dnl |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1692 dnl OCTAVE_CHECK_QT |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1693 dnl |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1694 AC_DEFUN([OCTAVE_CHECK_QT], [ |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1695 octave_qt_versions="$1" |
22257
945e7f9c11ff
build: fix configure --without-qt or --with-qt
Mike Miller <mtmiller@octave.org>
parents:
22255
diff
changeset
|
1696 |
945e7f9c11ff
build: fix configure --without-qt or --with-qt
Mike Miller <mtmiller@octave.org>
parents:
22255
diff
changeset
|
1697 build_qt_gui=no |
945e7f9c11ff
build: fix configure --without-qt or --with-qt
Mike Miller <mtmiller@octave.org>
parents:
22255
diff
changeset
|
1698 build_qt_graphics=no |
945e7f9c11ff
build: fix configure --without-qt or --with-qt
Mike Miller <mtmiller@octave.org>
parents:
22255
diff
changeset
|
1699 use_qscintilla=no |
945e7f9c11ff
build: fix configure --without-qt or --with-qt
Mike Miller <mtmiller@octave.org>
parents:
22255
diff
changeset
|
1700 win32_terminal=no |
945e7f9c11ff
build: fix configure --without-qt or --with-qt
Mike Miller <mtmiller@octave.org>
parents:
22255
diff
changeset
|
1701 |
22255
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1702 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
|
1703 OCTAVE_CHECK_QT_VERSION([$ver]) |
22250
2fd4f1a3f4a8
allow building with Qt5 (bug #40252)
John W. Eaton <jwe@octave.org>
parents:
22234
diff
changeset
|
1704 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
|
1705 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
|
1706 break |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1707 fi |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1708 done |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1709 |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1710 if test $build_qt_gui = yes; then |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1711 if test x"$have_qt_version" = x4; then |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1712 AC_DEFINE(HAVE_QT4, 1, [Define if you are using Qt version 4.]) |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1713 fi |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1714 if test x"$have_qt_version" = x5; then |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1715 AC_DEFINE(HAVE_QT5, 1, [Define if you are using Qt version 5.]) |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1716 fi |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1717 else |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1718 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
|
1719 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
|
1720 fi |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1721 if test -n "$warn_qt_version"; then |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1722 OCTAVE_CONFIGURE_WARNING([warn_qt_version]) |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1723 fi |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1724 if test -n "$warn_qt_tools"; then |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1725 OCTAVE_CONFIGURE_WARNING([warn_qt_tools]) |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1726 fi |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1727 if test -n "$warn_qt_setlocale"; then |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1728 OCTAVE_CONFIGURE_WARNING([warn_qt_setlocale]) |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1729 fi |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1730 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
|
1731 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
|
1732 fi |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1733 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
|
1734 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
|
1735 fi |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1736 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
|
1737 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
|
1738 fi |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1739 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
|
1740 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
|
1741 fi |
8e18e364a686
improve checks for Qt when Qt 5 is not installed
John W. Eaton <jwe@octave.org>
parents:
22250
diff
changeset
|
1742 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
|
1743 OCTAVE_CONFIGURE_WARNING([warn_qscintilla]) |
22234
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1744 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1745 fi |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1746 |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1747 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
|
1748 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
|
1749 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
|
1750 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
|
1751 ]) |
66dd260512a4
allow configure to select Qt version
John W. Eaton <jwe@octave.org>
parents:
22208
diff
changeset
|
1752 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1753 dnl Check if the default Fortran INTEGER is 64 bits wide. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1754 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1755 AC_DEFUN([OCTAVE_CHECK_SIZEOF_FORTRAN_INTEGER], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1756 AC_CACHE_CHECK([whether $F77 generates correct size integers], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1757 [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
|
1758 [ac_octave_save_FFLAGS="$FFLAGS" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1759 FFLAGS="$FFLAGS $F77_INTEGER_8_FLAG" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1760 AC_LANG_PUSH(Fortran 77) |
17978
86846ce0371a
acinclude.m4: Clean up indentation of Fortran code tests.
Rik <rik@octave.org>
parents:
17967
diff
changeset
|
1761 AC_COMPILE_IFELSE([[ |
86846ce0371a
acinclude.m4: Clean up indentation of Fortran code tests.
Rik <rik@octave.org>
parents:
17967
diff
changeset
|
1762 subroutine foo(n, in, out) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1763 integer n, in(n), out(n) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1764 integer i |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1765 do 10 i = 1, n |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1766 out(i) = in(i) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1767 10 continue |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1768 return |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1769 end |
17978
86846ce0371a
acinclude.m4: Clean up indentation of Fortran code tests.
Rik <rik@octave.org>
parents:
17967
diff
changeset
|
1770 ]], |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1771 [mv conftest.$ac_objext fintsize.$ac_objext |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
1772 ac_octave_save_LIBS="$LIBS" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1773 LIBS="fintsize.$ac_objext $[]_AC_LANG_PREFIX[]LIBS" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1774 AC_LANG_PUSH(C) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1775 AC_RUN_IFELSE([AC_LANG_PROGRAM([[ |
16313
6aafe87a3144
use int64_t for idx type if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16202
diff
changeset
|
1776 #include <assert.h> |
17978
86846ce0371a
acinclude.m4: Clean up indentation of Fortran code tests.
Rik <rik@octave.org>
parents:
17967
diff
changeset
|
1777 #include <stdint.h> |
21724
aba2e6293dd8
use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents:
21604
diff
changeset
|
1778 #if defined (OCTAVE_ENABLE_64) |
16313
6aafe87a3144
use int64_t for idx type if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16202
diff
changeset
|
1779 typedef int64_t octave_idx_type; |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1780 #else |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1781 typedef int octave_idx_type; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1782 #endif |
22888
e3fde9f1d47e
allow configure test to succeed without implicit fcn decls (bug #49782)
John W. Eaton <jwe@octave.org>
parents:
22509
diff
changeset
|
1783 void F77_FUNC(foo,FOO) (octave_idx_type*, octave_idx_type**, octave_idx_type**); |
e3fde9f1d47e
allow configure test to succeed without implicit fcn decls (bug #49782)
John W. Eaton <jwe@octave.org>
parents:
22509
diff
changeset
|
1784 ]], [[ |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1785 octave_idx_type n = 2; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1786 octave_idx_type in[2]; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1787 octave_idx_type out[2]; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1788 in[0] = 13; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1789 in[0] = 42; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1790 F77_FUNC(foo,FOO) (&n, &in, &out); |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1791 assert (in[0] == out[0] && in[1] == out[1]); |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1792 ]])], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1793 octave_cv_sizeof_fortran_integer=yes, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1794 octave_cv_sizeof_fortran_integer=no, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1795 octave_cv_sizeof_fortran_integer=yes) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1796 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
|
1797 LIBS="$ac_octave_save_LIBS" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1798 rm -f conftest.$ac_objext fintsize.$ac_objext], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1799 [rm -f conftest.$ac_objext |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1800 AC_MSG_FAILURE([cannot compile a simple Fortran program]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1801 octave_cv_sizeof_fortran_integer=no]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1802 AC_LANG_POP(Fortran 77) |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
1803 FFLAGS="$ac_octave_save_FFLAGS" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1804 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1805 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1806 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1807 dnl Add warning to final summary. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1808 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1809 AC_DEFUN([OCTAVE_CONFIGURE_WARNING], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1810 AC_MSG_WARN([$][$1]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1811 m4_set_add([summary_warning_list], [$1]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1812 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1813 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1814 dnl Print final summary. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1815 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1816 AC_DEFUN([OCTAVE_CONFIGURE_WARNING_SUMMARY], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1817 m4_set_foreach([summary_warning_list], [elt], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1818 if test -n "[$]elt"; then |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1819 AC_MSG_WARN([$]elt) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1820 warn_msg_printed=true |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1821 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
|
1822 ]) |
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
|
1823 dnl |
21397
df859661e31e
generate default-qt-settings at configure time
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
1824 dnl Like AC_CONFIG_FILES, but don't touch the output file if it already |
df859661e31e
generate default-qt-settings at configure time
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
1825 dnl exists and hasn't changed. |
df859661e31e
generate default-qt-settings at configure time
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
1826 dnl |
df859661e31e
generate default-qt-settings at configure time
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
1827 AC_DEFUN([OCTAVE_CONFIG_MOVE_IF_CHANGE_FILES], [ |
df859661e31e
generate default-qt-settings at configure time
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
1828 m4_foreach_w([elt], [$1], [ |
21398
7e8a410e6124
break generated file dependence on Makefile (bug #46063)
John W. Eaton <jwe@octave.org>
parents:
21397
diff
changeset
|
1829 AC_CONFIG_FILES(elt[-tmp:]patsubst(elt, [.sh$], [.in.sh])) |
21397
df859661e31e
generate default-qt-settings at configure time
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
1830 AC_CONFIG_COMMANDS(elt, |
df859661e31e
generate default-qt-settings at configure time
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
1831 [$SHELL $srcdir/build-aux/move-if-change ]elt[-tmp ]elt)])]) |
df859661e31e
generate default-qt-settings at configure time
John W. Eaton <jwe@octave.org>
parents:
21381
diff
changeset
|
1832 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1833 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
|
1834 dnl templates defined. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1835 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1836 AC_DEFUN([OCTAVE_CXX_BITWISE_OP_TEMPLATES], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1837 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
|
1838 [octave_cv_cxx_bitwise_op_templates], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1839 [AC_LANG_PUSH(C++) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1840 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1841 #include <functional> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1842 ]], [[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1843 int x = 0; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1844 int y = 1; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1845 int z1 = std::bit_and<int>() (x, y); |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1846 int z2 = std::bit_or<int>() (x, y); |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1847 int z3 = std::bit_xor<int>() (x, y); |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1848 ]])], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1849 octave_cv_cxx_bitwise_op_templates=yes, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1850 octave_cv_cxx_bitwise_op_templates=no) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1851 AC_LANG_POP(C++) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1852 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1853 if test $octave_cv_cxx_bitwise_op_templates = yes; then |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1854 AC_DEFINE(HAVE_CXX_BITWISE_OP_TEMPLATES, 1, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1855 [Define to 1 if C++ library has templated bitwise operators.]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1856 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1857 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1858 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1859 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
|
1860 dnl parts of complex numbers independently via references. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1861 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1862 AC_DEFUN([OCTAVE_CXX_COMPLEX_REFERENCE_ACCESSORS], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1863 AC_CACHE_CHECK([whether complex class can reference components independently], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1864 [octave_cv_cxx_complex_reference_accessors], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1865 [AC_LANG_PUSH(C++) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1866 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1867 #include <complex> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1868 ]], [[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1869 std::complex<double> x; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1870 x.real () = 1.0; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1871 x.imag () = 1.0; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1872 ]])], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1873 octave_cv_cxx_complex_reference_accessors=yes, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1874 octave_cv_cxx_complex_reference_accessors=no) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1875 AC_LANG_POP(C++) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1876 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1877 if test $octave_cv_cxx_complex_reference_accessors = yes; then |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1878 AC_DEFINE(HAVE_CXX_COMPLEX_REFERENCE_ACCESSORS, 1, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1879 [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
|
1880 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1881 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1882 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1883 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
|
1884 dnl parts of complex numbers independently. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1885 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1886 AC_DEFUN([OCTAVE_CXX_COMPLEX_SETTERS], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1887 AC_CACHE_CHECK([whether complex class can set components independently], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1888 [octave_cv_cxx_complex_setters], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1889 [AC_LANG_PUSH(C++) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1890 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1891 #include <complex> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1892 ]], [[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1893 std::complex<double> x; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1894 x.real (1.0); |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1895 x.imag (2.0); |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1896 ]])], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1897 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
|
1898 AC_LANG_POP(C++) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1899 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1900 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
|
1901 AC_DEFINE(HAVE_CXX_COMPLEX_SETTERS, 1, |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1902 [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
|
1903 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1904 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1905 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1906 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
|
1907 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1908 AC_DEFUN([OCTAVE_CXX_DYNAMIC_AUTO_ARRAYS], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1909 AC_CACHE_CHECK([whether C++ supports dynamic auto arrays], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1910 [octave_cv_cxx_dynamic_auto_arrays], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1911 [AC_LANG_PUSH(C++) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1912 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1913 void test(char *); |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1914 int length(); |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1915 char x[length()]; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1916 test(x); |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1917 ]])], |
17034
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
1918 octave_cv_cxx_dynamic_auto_arrays=yes, |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1919 octave_cv_cxx_dynamic_auto_arrays=no) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1920 AC_LANG_POP(C++) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1921 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1922 if test $octave_cv_cxx_dynamic_auto_arrays = yes; then |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1923 AC_DEFINE(HAVE_DYNAMIC_AUTO_ARRAYS, 1, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1924 [Define to 1 if C++ supports dynamic auto arrays.]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1925 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1926 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1927 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1928 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
|
1929 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
|
1930 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
|
1931 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1932 AC_DEFUN([OCTAVE_CXX_FLAG], [ |
17661
1978a6c76aa9
Use user-specified SED during build process (bug #40273).
Rik <rik@octave.org>
parents:
17615
diff
changeset
|
1933 ac_safe=`echo "$1" | $SED 'y%./+-:=%__p___%'` |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1934 AC_MSG_CHECKING([whether ${CXX-g++} accepts $1]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1935 AC_CACHE_VAL([octave_cv_cxx_flag_$ac_safe], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1936 [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
|
1937 ac_octave_save_CXXFLAGS="$CXXFLAGS" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1938 CXXFLAGS="$CXXFLAGS $1" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1939 AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1940 eval "octave_cv_cxx_flag_$ac_safe=yes", |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1941 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
|
1942 CXXFLAGS="$ac_octave_save_CXXFLAGS" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1943 AC_LANG_POP(C++) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1944 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1945 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
|
1946 AC_MSG_RESULT([yes]) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1947 ifelse([$2], , |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1948 [CXXFLAGS="$CXXFLAGS $1" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1949 AC_MSG_RESULT([adding $1 to CXXFLAGS])], [$2]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1950 else |
15319
daf74ce2afdc
m4/acinclude.m4: Use more consistent m4 quoting of arguments to macros.
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
1951 AC_MSG_RESULT([no]) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1952 ifelse([$3], , , [$3]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1953 fi |
10471
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10380
diff
changeset
|
1954 ]) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1955 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1956 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
|
1957 dnl readline. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1958 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1959 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
|
1960 USE_READLINE=yes |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1961 READLINE_LIBS= |
15319
daf74ce2afdc
m4/acinclude.m4: Use more consistent m4 quoting of arguments to macros.
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
1962 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
|
1963 [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
|
1964 [do not use readline library])], |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1965 [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
|
1966 USE_READLINE=no |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1967 warn_readline="command editing and history features require GNU Readline" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1968 fi]) |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16012
diff
changeset
|
1969 if test $USE_READLINE = yes; then |
15302
a8cfbc1911e4
build: Set TERM_LIBS before checking for READLINE.
Rik <rik@octave.org>
parents:
15295
diff
changeset
|
1970 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
|
1971 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
|
1972 ac_octave_save_LIBS="$LIBS" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1973 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
|
1974 AC_CHECK_LIB([readline], [rl_set_keyboard_input_timeout], |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1975 [READLINE_LIBS="-lreadline" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1976 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
|
1977 ], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1978 [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
|
1979 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
|
1980 ]) |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
1981 LIBS="$ac_octave_save_LIBS" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1982 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1983 AC_SUBST(READLINE_LIBS) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1984 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1985 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1986 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
|
1987 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
|
1988 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
|
1989 dnl the flag. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1990 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1991 AC_DEFUN([OCTAVE_F77_FLAG], [ |
17661
1978a6c76aa9
Use user-specified SED during build process (bug #40273).
Rik <rik@octave.org>
parents:
17615
diff
changeset
|
1992 ac_safe=`echo "$1" | $SED 'y%./+-:=%__p___%'` |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1993 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
|
1994 AC_CACHE_VAL([octave_cv_f77_flag_$ac_safe], [ |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1995 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
|
1996 ac_octave_save_FFLAGS="$FFLAGS" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1997 FFLAGS="$FFLAGS $1" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1998 AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1999 eval "octave_cv_f77_flag_$ac_safe=yes", |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2000 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
|
2001 FFLAGS="$ac_octave_save_FFLAGS" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2002 AC_LANG_POP(Fortran 77) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2003 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2004 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
|
2005 AC_MSG_RESULT([yes]) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2006 ifelse([$2], , |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2007 [FFLAGS="$FFLAGS $1" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2008 AC_MSG_RESULT([adding $1 to FFLAGS])], [$2]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2009 else |
15319
daf74ce2afdc
m4/acinclude.m4: Use more consistent m4 quoting of arguments to macros.
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
2010 AC_MSG_RESULT([no]) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2011 ifelse([$3], , , [$3]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2012 fi |
10471
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10380
diff
changeset
|
2013 ]) |
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10380
diff
changeset
|
2014 dnl |
21302
8376de2eaf00
define OCTAVE_HAVE_FAST_INT_OPS in octave-config.h
John W. Eaton <jwe@octave.org>
parents:
21250
diff
changeset
|
2015 dnl Check whether fast signed integer arithmetic using bit tricks |
8376de2eaf00
define OCTAVE_HAVE_FAST_INT_OPS in octave-config.h
John W. Eaton <jwe@octave.org>
parents:
21250
diff
changeset
|
2016 dnl can be used in oct-inttypes.h. |
8376de2eaf00
define OCTAVE_HAVE_FAST_INT_OPS in octave-config.h
John W. Eaton <jwe@octave.org>
parents:
21250
diff
changeset
|
2017 dnl |
8376de2eaf00
define OCTAVE_HAVE_FAST_INT_OPS in octave-config.h
John W. Eaton <jwe@octave.org>
parents:
21250
diff
changeset
|
2018 dnl Defines OCTAVE_HAVE_FAST_INT_OPS if the following conditions hold: |
8376de2eaf00
define OCTAVE_HAVE_FAST_INT_OPS in octave-config.h
John W. Eaton <jwe@octave.org>
parents:
21250
diff
changeset
|
2019 dnl |
8376de2eaf00
define OCTAVE_HAVE_FAST_INT_OPS in octave-config.h
John W. Eaton <jwe@octave.org>
parents:
21250
diff
changeset
|
2020 dnl 1. Signed numbers are represented by twos complement (see |
8376de2eaf00
define OCTAVE_HAVE_FAST_INT_OPS in octave-config.h
John W. Eaton <jwe@octave.org>
parents:
21250
diff
changeset
|
2021 dnl <http://en.wikipedia.org/wiki/Two%27s_complement>) |
8376de2eaf00
define OCTAVE_HAVE_FAST_INT_OPS in octave-config.h
John W. Eaton <jwe@octave.org>
parents:
21250
diff
changeset
|
2022 dnl |
8376de2eaf00
define OCTAVE_HAVE_FAST_INT_OPS in octave-config.h
John W. Eaton <jwe@octave.org>
parents:
21250
diff
changeset
|
2023 dnl 2. static_cast to unsigned int counterpart works like |
8376de2eaf00
define OCTAVE_HAVE_FAST_INT_OPS in octave-config.h
John W. Eaton <jwe@octave.org>
parents:
21250
diff
changeset
|
2024 dnl interpreting the signed bit pattern as unsigned (and is thus |
21604
d7a268e68e69
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
21398
diff
changeset
|
2025 dnl zero-cost). |
21302
8376de2eaf00
define OCTAVE_HAVE_FAST_INT_OPS in octave-config.h
John W. Eaton <jwe@octave.org>
parents:
21250
diff
changeset
|
2026 dnl |
8376de2eaf00
define OCTAVE_HAVE_FAST_INT_OPS in octave-config.h
John W. Eaton <jwe@octave.org>
parents:
21250
diff
changeset
|
2027 dnl 3. Signed addition and subtraction yield the same bit results |
8376de2eaf00
define OCTAVE_HAVE_FAST_INT_OPS in octave-config.h
John W. Eaton <jwe@octave.org>
parents:
21250
diff
changeset
|
2028 dnl as unsigned. (We use casts to prevent optimization |
8376de2eaf00
define OCTAVE_HAVE_FAST_INT_OPS in octave-config.h
John W. Eaton <jwe@octave.org>
parents:
21250
diff
changeset
|
2029 dnl interference, so there is no need for things like -ftrapv). |
8376de2eaf00
define OCTAVE_HAVE_FAST_INT_OPS in octave-config.h
John W. Eaton <jwe@octave.org>
parents:
21250
diff
changeset
|
2030 dnl |
8376de2eaf00
define OCTAVE_HAVE_FAST_INT_OPS in octave-config.h
John W. Eaton <jwe@octave.org>
parents:
21250
diff
changeset
|
2031 dnl 4. Bit operations on signed integers work like on unsigned |
8376de2eaf00
define OCTAVE_HAVE_FAST_INT_OPS in octave-config.h
John W. Eaton <jwe@octave.org>
parents:
21250
diff
changeset
|
2032 dnl integers, except for the shifts. Shifts are arithmetic. |
8169
66bc6f9b4f72
rewrite integer arithmetics and conversions
Jaroslav Hajek <highegg@gmail.com>
parents:
8019
diff
changeset
|
2033 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2034 AC_DEFUN([OCTAVE_FAST_INT_OPS], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2035 AC_CACHE_CHECK([whether fast integer arithmetics is usable], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2036 [octave_cv_fast_int_ops], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2037 [AC_LANG_PUSH(C++) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2038 AC_RUN_IFELSE([AC_LANG_PROGRAM([[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2039 #include <limits> |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2040 template<class UT, class ST> |
17034
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2041 static bool |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2042 do_test (UT, ST) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2043 { |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2044 volatile ST s = std::numeric_limits<ST>::min () / 3; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2045 volatile UT u = static_cast<UT> (s); |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2046 if (*(reinterpret_cast<volatile ST *> (&u)) != s) return true; |
17034
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2047 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2048 u = 0; u = ~u; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2049 if (*(reinterpret_cast<volatile ST *> (&u)) != -1) return true; |
17034
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2050 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2051 ST sx, sy; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2052 sx = std::numeric_limits<ST>::max () / 2 + 1; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2053 sy = std::numeric_limits<ST>::max () / 2 + 2; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2054 if (static_cast<ST> (static_cast<UT> (sx) + static_cast<UT> (sy)) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2055 != std::numeric_limits<ST>::min () + 1) return true; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2056 if (static_cast<ST> (static_cast<UT> (sx) - static_cast<UT> (sy)) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2057 != -1) return true; |
17034
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2058 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2059 if ((sx & sy) != (static_cast<UT> (sx) & static_cast<UT> (sy))) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2060 return true; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2061 if ((sx | sy) != (static_cast<UT> (sx) | static_cast<UT> (sy))) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2062 return true; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2063 if ((sx ^ sy) != (static_cast<UT> (sx) ^ static_cast<UT> (sy))) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2064 return true; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2065 if ((-1 >> 1) != -1) return true; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2066 return false; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2067 } |
17034
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2068 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2069 #define DO_TEST(T) \ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2070 if (do_test (static_cast<unsigned T> (0), static_cast<signed T> (0)))\ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2071 return sizeof (T); |
8169
66bc6f9b4f72
rewrite integer arithmetics and conversions
Jaroslav Hajek <highegg@gmail.com>
parents:
8019
diff
changeset
|
2072 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2073 ]],[[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2074 |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2075 DO_TEST(char) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2076 DO_TEST(short) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2077 DO_TEST(int) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2078 DO_TEST(long) |
21354
06d15e4e611a
move public data type macros to octave-config.h
John W. Eaton <jwe@octave.org>
parents:
21302
diff
changeset
|
2079 #if (defined(OCTAVE_HAVE_LONG_LONG_INT) && defined(OCTAVE_HAVE_UNSIGNED_LONG_LONG_INT)) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2080 DO_TEST(long long) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2081 #endif |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2082 ]])], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2083 octave_cv_fast_int_ops=yes, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2084 octave_cv_fast_int_ops=no, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2085 octave_cv_fast_int_ops=yes) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2086 AC_LANG_POP(C++) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2087 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2088 if test $octave_cv_fast_int_ops = yes; then |
21302
8376de2eaf00
define OCTAVE_HAVE_FAST_INT_OPS in octave-config.h
John W. Eaton <jwe@octave.org>
parents:
21250
diff
changeset
|
2089 AC_DEFINE(OCTAVE_HAVE_FAST_INT_OPS, 1, |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2090 [Define to 1 if signed integers use two's complement.]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2091 fi |
13957
c510048901cc
set cross compile defaults for AC_RUN_IFELSE
John W. Eaton <jwe@octave.org>
parents:
13728
diff
changeset
|
2092 ]) |
8595
dee5d60257e4
Use Carbon framework to determine ScreenSize on Mac.
Thomas Treichl <Thomas.Treichl@gmx.net>
parents:
8169
diff
changeset
|
2093 dnl |
dee5d60257e4
Use Carbon framework to determine ScreenSize on Mac.
Thomas Treichl <Thomas.Treichl@gmx.net>
parents:
8169
diff
changeset
|
2094 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
|
2095 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
|
2096 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
|
2097 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
|
2098 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
|
2099 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
|
2100 dnl |
9654
a307a6f77fb3
aclocal.m4: consistently quote first arg to AC_DEFUN
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2101 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
|
2102 AC_MSG_CHECKING([whether ${LD-ld} accepts -framework $1]) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2103 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
|
2104 [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
|
2105 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
|
2106 AC_LANG_PUSH(C++) |
8595
dee5d60257e4
Use Carbon framework to determine ScreenSize on Mac.
Thomas Treichl <Thomas.Treichl@gmx.net>
parents:
8169
diff
changeset
|
2107 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
|
2108 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
|
2109 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
|
2110 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
|
2111 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
|
2112 ]) |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
2113 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
|
2114 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
|
2115 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
|
2116 [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
|
2117 [don't use framework $1])], |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2118 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
|
2119 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
|
2120 [$4] |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
2121 : |
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
|
2122 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
|
2123 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
|
2124 [$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
|
2125 fi |
8595
dee5d60257e4
Use Carbon framework to determine ScreenSize on Mac.
Thomas Treichl <Thomas.Treichl@gmx.net>
parents:
8169
diff
changeset
|
2126 else |
15319
daf74ce2afdc
m4/acinclude.m4: Use more consistent m4 quoting of arguments to macros.
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
2127 AC_MSG_RESULT([no]) |
8595
dee5d60257e4
Use Carbon framework to determine ScreenSize on Mac.
Thomas Treichl <Thomas.Treichl@gmx.net>
parents:
8169
diff
changeset
|
2128 [$5] |
dee5d60257e4
Use Carbon framework to determine ScreenSize on Mac.
Thomas Treichl <Thomas.Treichl@gmx.net>
parents:
8169
diff
changeset
|
2129 fi |
dee5d60257e4
Use Carbon framework to determine ScreenSize on Mac.
Thomas Treichl <Thomas.Treichl@gmx.net>
parents:
8169
diff
changeset
|
2130 ]) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2131 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2132 dnl Figure out the hardware-vendor-os info. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2133 dnl |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15834
diff
changeset
|
2134 AC_DEFUN([OCTAVE_CANONICAL_HOST], [ |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2135 AC_CANONICAL_HOST |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2136 if test -z "$host"; then |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15834
diff
changeset
|
2137 host=unknown-unknown-unknown |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15834
diff
changeset
|
2138 AC_MSG_WARN([configuring Octave for unknown system type]) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2139 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2140 canonical_host_type=$host |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15834
diff
changeset
|
2141 AC_SUBST(canonical_host_type) |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15834
diff
changeset
|
2142 if test -z "$host_cpu"; then |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15834
diff
changeset
|
2143 host_cpu=unknown |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2144 fi |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15834
diff
changeset
|
2145 if test -z "$host_vendor"; then |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15834
diff
changeset
|
2146 host_vendor=unknown |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15834
diff
changeset
|
2147 fi |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15834
diff
changeset
|
2148 if test -z "$host_os"; then |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15834
diff
changeset
|
2149 host_os=unknown |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15834
diff
changeset
|
2150 fi |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2151 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2152 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2153 dnl Check for IEEE 754 data format. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2154 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2155 AC_DEFUN([OCTAVE_IEEE754_DATA_FORMAT], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2156 AC_MSG_CHECKING([for IEEE 754 data format]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2157 AC_CACHE_VAL([octave_cv_ieee754_data_format], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2158 [AC_RUN_IFELSE([AC_LANG_SOURCE([[ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2159 int |
17034
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2160 main (void) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2161 { |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2162 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
|
2163 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2164 ieeebytes l = {0x1c, 0xbc, 0x6e, 0xf2, 0x54, 0x8b, 0x11, 0x43}; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2165 ieeebytes b = {0x43, 0x11, 0x8b, 0x54, 0xf2, 0x6e, 0xbc, 0x1c}; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2166 |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2167 return l.d != 1234567891234567.0 && b.d != 1234567891234567.0; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2168 } |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2169 ]])], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2170 octave_cv_ieee754_data_format=yes, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2171 octave_cv_ieee754_data_format=no, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2172 octave_cv_ieee754_data_format=yes) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2173 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2174 if test "$cross_compiling" = yes; then |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2175 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
|
2176 else |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2177 AC_MSG_RESULT([$octave_cv_ieee754_data_format]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2178 fi |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
2179 if test $octave_cv_ieee754_data_format = yes; then |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2180 AC_DEFINE(HAVE_IEEE754_DATA_FORMAT, 1, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2181 [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
|
2182 else |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2183 ## 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
|
2184 ## useful system, so we will abort here. Anyone wishing to |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2185 ## experiment with building Octave on a system without IEEE |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2186 ## floating point should be capable of removing this check and |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2187 ## 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
|
2188 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
|
2189 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2190 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2191 dnl |
17034
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2192 dnl Check for CallInst::addAttribute API |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2193 dnl |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2194 AC_DEFUN([OCTAVE_LLVM_CALLINST_ADDATTRIBUTE_API], [ |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2195 AC_CACHE_CHECK([check LLVM::CallInst::addAttribute arg type is llvm::Attributes], |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2196 [octave_cv_callinst_addattribute_arg_is_attributes], |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2197 [AC_LANG_PUSH(C++) |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2198 AC_COMPILE_IFELSE( |
17615
3a7d5d655749
Fix typos in configure tests for LLVM methods (bug #39973)
Mike Miller <mtmiller@ieee.org>
parents:
17241
diff
changeset
|
2199 [AC_LANG_PROGRAM([[ |
21724
aba2e6293dd8
use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents:
21604
diff
changeset
|
2200 #if defined (HAVE_LLVM_IR_FUNCTION_H) |
17164 | 2201 #include <llvm/IR/Instructions.h> |
2202 #include <llvm/IR/Attributes.h> | |
2203 #else | |
17034
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2204 #include <llvm/Instructions.h> |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2205 #include <llvm/Attributes.h> |
17164 | 2206 #endif |
17615
3a7d5d655749
Fix typos in configure tests for LLVM methods (bug #39973)
Mike Miller <mtmiller@ieee.org>
parents:
17241
diff
changeset
|
2207 ]], [[ |
17034
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2208 llvm::CallInst *callinst; |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2209 llvm::AttrBuilder attr_builder; |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2210 attr_builder.addAttribute(llvm::Attributes::StructRet); |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2211 llvm::Attributes attrs = llvm::Attributes::get(llvm::getGlobalContext(), attr_builder); |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2212 callinst->addAttribute (1, attrs); |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2213 ]])], |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2214 octave_cv_callinst_addattribute_arg_is_attributes=yes, |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2215 octave_cv_callinst_addattribute_arg_is_attributes=no) |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2216 AC_LANG_POP(C++) |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2217 ]) |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2218 if test $octave_cv_callinst_addattribute_arg_is_attributes = yes; then |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2219 AC_DEFINE(CALLINST_ADDATTRIBUTE_ARG_IS_ATTRIBUTES, 1, |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2220 [Define to 1 if llvm::CallInst:addAttribute arg type is llvm::Attributes.]) |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2221 fi |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2222 ]) |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2223 dnl |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2224 dnl Check for Function::addAttribute API |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2225 dnl |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2226 AC_DEFUN([OCTAVE_LLVM_FUNCTION_ADDATTRIBUTE_API], [ |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2227 AC_CACHE_CHECK([check llvm::Function::addAttribute arg type is llvm::Attributes], |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2228 [octave_cv_function_addattribute_arg_is_attributes], |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2229 [AC_LANG_PUSH(C++) |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2230 AC_COMPILE_IFELSE( |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2231 [AC_LANG_PROGRAM([[ |
21724
aba2e6293dd8
use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents:
21604
diff
changeset
|
2232 #if defined (HAVE_LLVM_IR_FUNCTION_H) |
17164 | 2233 #include <llvm/IR/Function.h> |
2234 #include <llvm/IR/Attributes.h> | |
2235 #include <llvm/IR/LLVMContext.h> | |
2236 #else | |
17034
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2237 #include <llvm/Function.h> |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2238 #include <llvm/Attributes.h> |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2239 #include <llvm/LLVMContext.h> |
17164 | 2240 #endif |
17034
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2241 ]], [[ |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2242 llvm::Function *llvm_function; |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2243 llvm::AttrBuilder attr_builder; |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2244 attr_builder.addAttribute(llvm::Attributes::StructRet); |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2245 llvm::Attributes attrs = llvm::Attributes::get(llvm::getGlobalContext(), attr_builder); |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2246 llvm_function->addAttribute (1, attrs); |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2247 ]])], |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2248 octave_cv_function_addattribute_arg_is_attributes=yes, |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2249 octave_cv_function_addattribute_arg_is_attributes=no) |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2250 AC_LANG_POP(C++) |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2251 ]) |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2252 if test $octave_cv_function_addattribute_arg_is_attributes = yes; then |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2253 AC_DEFINE(FUNCTION_ADDATTRIBUTE_ARG_IS_ATTRIBUTES, 1, |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2254 [Define to 1 if llvm::Function:addAttribute arg type is llvm::Attributes.]) |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2255 fi |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2256 ]) |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2257 dnl |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2258 dnl Check for Function::addFnAttr API |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2259 dnl |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2260 AC_DEFUN([OCTAVE_LLVM_FUNCTION_ADDFNATTR_API], [ |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2261 AC_CACHE_CHECK([check LLVM::Function::addFnAttr arg type is llvm::Attributes], |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2262 [octave_cv_function_addfnattr_arg_is_attributes], |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2263 [AC_LANG_PUSH(C++) |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2264 AC_COMPILE_IFELSE( |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2265 [AC_LANG_PROGRAM([[ |
21724
aba2e6293dd8
use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents:
21604
diff
changeset
|
2266 #if defined (HAVE_LLVM_IR_FUNCTION_H) |
17615
3a7d5d655749
Fix typos in configure tests for LLVM methods (bug #39973)
Mike Miller <mtmiller@ieee.org>
parents:
17241
diff
changeset
|
2267 #include <llvm/IR/Function.h> |
3a7d5d655749
Fix typos in configure tests for LLVM methods (bug #39973)
Mike Miller <mtmiller@ieee.org>
parents:
17241
diff
changeset
|
2268 #include <llvm/IR/Attributes.h> |
17164 | 2269 #else |
2270 #include <llvm/Function.h> | |
2271 #include <llvm/Attributes.h> | |
2272 #endif | |
17034
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2273 ]], [[ |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2274 llvm::Function *llvm_function; |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2275 llvm_function->addFnAttr (llvm::Attributes::AlwaysInline); |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2276 ]])], |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2277 octave_cv_function_addfnattr_arg_is_attributes=yes, |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2278 octave_cv_function_addfnattr_arg_is_attributes=no) |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2279 AC_LANG_POP(C++) |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2280 ]) |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2281 if test $octave_cv_function_addfnattr_arg_is_attributes = yes; then |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2282 AC_DEFINE(FUNCTION_ADDFNATTR_ARG_IS_ATTRIBUTES, 1, |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2283 [Define to 1 if llvm::Function:addFnAttr arg type is llvm::Attributes.]) |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2284 fi |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2285 ]) |
8d84dc5f5b5d
acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR.
Rik <rik@octave.org>
parents:
17031
diff
changeset
|
2286 dnl |
18831
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2287 dnl Check for raw_fd_ostream API |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2288 dnl |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2289 AC_DEFUN([OCTAVE_LLVM_RAW_FD_OSTREAM_API], [ |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2290 AC_CACHE_CHECK([check LLVM::raw_fd_ostream arg type is llvm::sys:fs], |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2291 [octave_cv_raw_fd_ostream_arg_is_llvm_sys_fs], |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2292 [AC_LANG_PUSH(C++) |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2293 AC_COMPILE_IFELSE( |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2294 [AC_LANG_PROGRAM([[ |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2295 #include <llvm/Support/raw_os_ostream.h> |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2296 ]], [[ |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2297 std::string str; |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2298 llvm::raw_fd_ostream fout ("", str, llvm::sys::fs::F_Binary); |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2299 ]])], |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2300 octave_cv_raw_fd_ostream_arg_is_llvm_sys_fs=yes, |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2301 octave_cv_raw_fd_ostream_arg_is_llvm_sys_fs=no) |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2302 AC_LANG_POP(C++) |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2303 ]) |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2304 if test $octave_cv_raw_fd_ostream_arg_is_llvm_sys_fs = yes; then |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2305 AC_DEFINE(RAW_FD_OSTREAM_ARG_IS_LLVM_SYS_FS, 1, |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2306 [Define to 1 if LLVM::raw_fd_ostream arg type is llvm::sys:fs.]) |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2307 fi |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2308 ]) |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2309 dnl |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2310 dnl Check for legacy::PassManager API |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2311 dnl |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2312 AC_DEFUN([OCTAVE_LLVM_LEGACY_PASSMANAGER_API], [ |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2313 AC_CACHE_CHECK([check for LLVM::legacy::PassManager], |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2314 [octave_cv_legacy_passmanager], |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2315 [AC_LANG_PUSH(C++) |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2316 save_LIBS="$LIBS" |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2317 LIBS="$LLVM_LIBS $LIBS" |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2318 AC_LINK_IFELSE( |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2319 [AC_LANG_PROGRAM([[ |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2320 #include <llvm/IR/LegacyPassManager.h> |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2321 ]], [[ |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2322 llvm::Module *module; |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2323 llvm::legacy::PassManager *module_pass_manager; |
19597
db92e7e28e1f
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19355
diff
changeset
|
2324 llvm::legacy::FunctionPassManager *pass_manager; |
18831
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2325 module_pass_manager = new llvm::legacy::PassManager (); |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2326 pass_manager = new llvm::legacy::FunctionPassManager (module); |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2327 ]])], |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2328 octave_cv_legacy_passmanager=yes, |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2329 octave_cv_legacy_passmanager=no) |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2330 LIBS="$save_LIBS" |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2331 AC_LANG_POP(C++) |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2332 ]) |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2333 if test $octave_cv_legacy_passmanager = yes; then |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2334 AC_DEFINE(LEGACY_PASSMANAGER, 1, |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2335 [Define to 1 if LLVM::legacy::PassManager exists.]) |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2336 fi |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2337 ]) |
4a4edf0f2077
fix LLVM 3.4 build (bug #41061)
Stefan Mahr <dac922@gmx.de>
parents:
18216
diff
changeset
|
2338 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2339 dnl Check for ar. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2340 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2341 AC_DEFUN([OCTAVE_PROG_AR], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2342 if test -z "$AR"; then |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2343 AR=ar |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2344 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2345 AC_SUBST(AR) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2346 |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2347 if test -z "$ARFLAGS"; then |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2348 ARFLAGS="rc" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2349 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2350 AC_SUBST(ARFLAGS) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2351 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2352 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2353 dnl Check for bison. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2354 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2355 AC_DEFUN([OCTAVE_PROG_BISON], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2356 AC_PROG_YACC |
16784
0fabe0f49f38
use better method to determine whether we are using flex and bison
John W. Eaton <jwe@octave.org>
parents:
16733
diff
changeset
|
2357 |
0fabe0f49f38
use better method to determine whether we are using flex and bison
John W. Eaton <jwe@octave.org>
parents:
16733
diff
changeset
|
2358 case "`$YACC --version`" in |
17197
fbee0d312af5
acinclude.m4: Remove some unnecessary double quotes around variables.
Rik <rik@octave.org>
parents:
17196
diff
changeset
|
2359 *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
|
2360 *) 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
|
2361 esac |
0fabe0f49f38
use better method to determine whether we are using flex and bison
John W. Eaton <jwe@octave.org>
parents:
16733
diff
changeset
|
2362 |
17197
fbee0d312af5
acinclude.m4: Remove some unnecessary double quotes around variables.
Rik <rik@octave.org>
parents:
17196
diff
changeset
|
2363 if test $tmp_have_bison = yes; then |
18974
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
2364 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
|
2365 [octave_cv_bison_api_prefix_decl_style], [ |
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
2366 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
|
2367 quote="quote brace" |
18974
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
2368 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
|
2369 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
|
2370 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
|
2371 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
|
2372 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
|
2373 else |
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
2374 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
|
2375 fi |
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
2376 else |
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
2377 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
|
2378 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
|
2379 else |
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
2380 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
|
2381 fi |
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
2382 fi |
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
2383 cat << EOF > conftest.yy |
18974
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
2384 $def |
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
2385 %start input |
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
2386 %% |
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
2387 input:; |
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
2388 %% |
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
2389 EOF |
19105
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
2390 ## Older versions of bison only warn and exit with success. |
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
2391 octave_bison_output=`$YACC conftest.yy 2>&1` |
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
2392 ac_status=$? |
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
2393 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
|
2394 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
|
2395 break |
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
2396 fi |
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
2397 done |
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
2398 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
|
2399 break |
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
2400 fi |
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
2401 done |
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
2402 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
|
2403 ]) |
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
2404 fi |
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
2405 |
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
2406 AC_SUBST(BISON_API_PREFIX_DECL_STYLE, $octave_cv_bison_api_prefix_decl_style) |
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
2407 |
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
2408 if test -z "$octave_cv_bison_api_prefix_decl_style"; then |
19105
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
2409 tmp_have_bison=no |
18974
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
2410 warn_bison_api_prefix_decl_style=" |
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
2411 |
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
2412 I wasn't able to find a suitable style for declaring the api prefix |
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
2413 in a bison input file so I'm disabling bison. |
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
2414 " |
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
2415 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
|
2416 fi |
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
2417 |
d8abf813c69f
handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents:
18973
diff
changeset
|
2418 if test $tmp_have_bison = yes; then |
16174
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2419 AC_CACHE_CHECK([syntax of bison push/pull declaration], |
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2420 [octave_cv_bison_push_pull_decl_style], [ |
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2421 style="dash underscore" |
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2422 quote="noquote quote" |
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2423 for s in $style; do |
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2424 for q in $quote; do |
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2425 if test $s = "dash"; then |
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2426 def="%define api.push-pull" |
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2427 else |
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2428 def="%define api.push_pull" |
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2429 fi |
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2430 if test $q = "quote"; then |
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2431 def="$def \"both\"" |
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2432 else |
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2433 def="$def both" |
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2434 fi |
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2435 cat << EOF > conftest.yy |
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2436 $def |
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2437 %start input |
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2438 %% |
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2439 input:; |
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2440 %% |
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2441 EOF |
19105
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
2442 octave_bison_output=`$YACC conftest.yy 2>&1` |
16174
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2443 ac_status=$? |
19105
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
2444 if test $ac_status -eq 0 && test -z "$octave_bison_output"; then |
16174
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2445 if test $q = noquote; then |
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2446 q= |
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2447 fi |
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2448 octave_cv_bison_push_pull_decl_style="$s $q" |
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2449 break |
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2450 fi |
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2451 done |
19105
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
2452 if test -n "$octave_cv_bison_push_pull_decl_style"; then |
16174
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2453 break |
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2454 fi |
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2455 done |
16202
7ce484126bb2
Remove temporary y.tab.c file used by configure script.
Rik <rik@octave.org>
parents:
16174
diff
changeset
|
2456 rm -f conftest.yy y.tab.h y.tab.c |
16174
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2457 ]) |
16784
0fabe0f49f38
use better method to determine whether we are using flex and bison
John W. Eaton <jwe@octave.org>
parents:
16733
diff
changeset
|
2458 fi |
16174
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2459 |
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2460 AC_SUBST(BISON_PUSH_PULL_DECL_STYLE, $octave_cv_bison_push_pull_decl_style) |
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2461 |
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2462 if test -z "$octave_cv_bison_push_pull_decl_style"; then |
19105
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
2463 tmp_have_bison=no |
16174
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2464 warn_bison_push_pull_decl_style=" |
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2465 |
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2466 I wasn't able to find a suitable style for declaring a push-pull |
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2467 parser in a bison input file so I'm disabling bison. |
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2468 " |
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2469 OCTAVE_CONFIGURE_WARNING([warn_bison_push_pull_decl_style]) |
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2470 fi |
39096b290a2f
check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents:
16068
diff
changeset
|
2471 |
17197
fbee0d312af5
acinclude.m4: Remove some unnecessary double quotes around variables.
Rik <rik@octave.org>
parents:
17196
diff
changeset
|
2472 if test $tmp_have_bison = no; then |
16784
0fabe0f49f38
use better method to determine whether we are using flex and bison
John W. Eaton <jwe@octave.org>
parents:
16733
diff
changeset
|
2473 YACC='$(top_srcdir)/build-aux/missing bison' |
0fabe0f49f38
use better method to determine whether we are using flex and bison
John W. Eaton <jwe@octave.org>
parents:
16733
diff
changeset
|
2474 warn_bison=" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2475 |
19105
6b4dfb1e5afb
allow building with old versions of bison again (bug #43023)
John W. Eaton <jwe@octave.org>
parents:
18974
diff
changeset
|
2476 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
|
2477 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
|
2478 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
|
2479 building from VCS sources. |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2480 " |
16784
0fabe0f49f38
use better method to determine whether we are using flex and bison
John W. Eaton <jwe@octave.org>
parents:
16733
diff
changeset
|
2481 OCTAVE_CONFIGURE_WARNING([warn_bison]) |
0fabe0f49f38
use better method to determine whether we are using flex and bison
John W. Eaton <jwe@octave.org>
parents:
16733
diff
changeset
|
2482 fi |
15141
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 Find desktop-file-install program. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2486 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2487 AC_DEFUN([OCTAVE_PROG_DESKTOP_FILE_INSTALL], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2488 AC_CHECK_PROG(DESKTOP_FILE_INSTALL, desktop-file-install, desktop-file-install, []) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2489 AC_SUBST(DESKTOP_FILE_INSTALL) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2490 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2491 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2492 dnl Find find program. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2493 dnl |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
2494 ## Prefer GNU find if found. |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2495 AN_MAKEVAR([FIND], [OCTAVE_PROG_FIND]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2496 AN_PROGRAM([gfind], [OCTAVE_PROG_FIND]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2497 AN_PROGRAM([find], [OCTAVE_PROG_FIND]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2498 AC_DEFUN([OCTAVE_PROG_FIND], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2499 AC_CHECK_PROGS(FIND, [gfind find]) |
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 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2502 dnl Check for flex. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2503 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2504 AC_DEFUN([OCTAVE_PROG_FLEX], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2505 ## 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
|
2506 ## it, and it might not be installed. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2507 ## |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2508 ## 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
|
2509 ## using flex. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2510 AC_PROG_LEX |
16784
0fabe0f49f38
use better method to determine whether we are using flex and bison
John W. Eaton <jwe@octave.org>
parents:
16733
diff
changeset
|
2511 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
|
2512 *flex*) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2513 LFLAGS="-I" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2514 AC_MSG_RESULT([defining LFLAGS to be $LFLAGS]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2515 LEXLIB= |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2516 ;; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2517 *) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2518 LEX='$(top_srcdir)/build-aux/missing flex' |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2519 warn_flex=" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2520 |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2521 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
|
2522 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
|
2523 " |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2524 OCTAVE_CONFIGURE_WARNING([warn_flex]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2525 ;; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2526 esac |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2527 AC_SUBST(LFLAGS) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2528 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2529 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2530 dnl Check for ghostscript. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2531 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2532 AC_DEFUN([OCTAVE_PROG_GHOSTSCRIPT], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2533 case "$canonical_host_type" in |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2534 *-*-mingw* | *-*-msdosmsvc) |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
2535 ac_octave_gs_names="gswin32c gs mgs" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2536 ;; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2537 *) |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
2538 ac_octave_gs_names="gs" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2539 ;; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2540 esac |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
2541 AC_CHECK_PROGS(GHOSTSCRIPT, [$ac_octave_gs_names]) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2542 if test -z "$GHOSTSCRIPT"; then |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2543 GHOSTSCRIPT='$(top_srcdir)/build-aux/missing gs' |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2544 warn_ghostscript=" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2545 |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2546 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
|
2547 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
|
2548 using Octave |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2549 " |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2550 OCTAVE_CONFIGURE_WARNING([warn_ghostscript]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2551 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2552 AC_SUBST(GHOSTSCRIPT) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2553 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2554 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2555 dnl Check for gnuplot. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2556 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2557 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
|
2558 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
|
2559 ac_octave_gp_default="gnuplot" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2560 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
|
2561 GNUPLOT="$ac_octave_gp_default" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2562 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
|
2563 else |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
2564 AC_CHECK_PROGS(GNUPLOT, [$ac_octave_gp_names]) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2565 if test -z "$GNUPLOT"; then |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2566 GNUPLOT="$gp_default" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2567 warn_gnuplot=" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2568 |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2569 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
|
2570 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
|
2571 Octave's plotting commands. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2572 " |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2573 OCTAVE_CONFIGURE_WARNING([warn_gnuplot]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2574 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2575 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2576 AC_SUBST(GNUPLOT) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2577 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2578 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2579 dnl Check for gperf. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2580 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2581 AC_DEFUN([OCTAVE_PROG_GPERF], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2582 AC_CHECK_PROG(GPERF, gperf, gperf, []) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2583 if test -z "$GPERF"; then |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2584 GPERF='$(top_srcdir)/build-aux/missing gperf' |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2585 warn_gperf=" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2586 |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2587 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
|
2588 reconstruct oct-gperf.h |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2589 " |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2590 OCTAVE_CONFIGURE_WARNING([warn_gperf]) |
16663
e380d1317c72
use missing script for gperf
John W. Eaton <jwe@octave.org>
parents:
16318
diff
changeset
|
2591 GPERF='$(top_srcdir)/build-aux/missing gperf' |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2592 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2593 AC_SUBST(GPERF) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2594 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2595 dnl |
19744
1687269e31e4
build: Generate Octave logo icons from SVG source (bug #37062)
Mike Miller <mtmiller@ieee.org>
parents:
19697
diff
changeset
|
2596 dnl Find icotool program. |
1687269e31e4
build: Generate Octave logo icons from SVG source (bug #37062)
Mike Miller <mtmiller@ieee.org>
parents:
19697
diff
changeset
|
2597 dnl |
1687269e31e4
build: Generate Octave logo icons from SVG source (bug #37062)
Mike Miller <mtmiller@ieee.org>
parents:
19697
diff
changeset
|
2598 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
|
2599 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
|
2600 if test -z "$ICOTOOL"; then |
bc2a8db22831
build: Use the missing script for icotool and rsvg-convert
Mike Miller <mtmiller@ieee.org>
parents:
19744
diff
changeset
|
2601 ICOTOOL='$(top_srcdir)/build-aux/missing icotool' |
bc2a8db22831
build: Use the missing script for icotool and rsvg-convert
Mike Miller <mtmiller@ieee.org>
parents:
19744
diff
changeset
|
2602 warn_icotool=" |
bc2a8db22831
build: Use the missing script for icotool and rsvg-convert
Mike Miller <mtmiller@ieee.org>
parents:
19744
diff
changeset
|
2603 |
bc2a8db22831
build: Use the missing script for icotool and rsvg-convert
Mike Miller <mtmiller@ieee.org>
parents:
19744
diff
changeset
|
2604 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
|
2605 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
|
2606 VCS sources. |
bc2a8db22831
build: Use the missing script for icotool and rsvg-convert
Mike Miller <mtmiller@ieee.org>
parents:
19744
diff
changeset
|
2607 " |
bc2a8db22831
build: Use the missing script for icotool and rsvg-convert
Mike Miller <mtmiller@ieee.org>
parents:
19744
diff
changeset
|
2608 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
|
2609 fi |
19744
1687269e31e4
build: Generate Octave logo icons from SVG source (bug #37062)
Mike Miller <mtmiller@ieee.org>
parents:
19697
diff
changeset
|
2610 AC_SUBST(ICOTOOL) |
1687269e31e4
build: Generate Octave logo icons from SVG source (bug #37062)
Mike Miller <mtmiller@ieee.org>
parents:
19697
diff
changeset
|
2611 ]) |
1687269e31e4
build: Generate Octave logo icons from SVG source (bug #37062)
Mike Miller <mtmiller@ieee.org>
parents:
19697
diff
changeset
|
2612 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2613 dnl Check for makeinfo. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2614 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2615 AC_DEFUN([OCTAVE_PROG_MAKEINFO], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2616 dnl use MKINFO, not MAKEINFO, for variable name because Automake |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2617 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
|
2618 dnl exist which will then fool the 'test -z' line. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2619 AC_CHECK_PROG(MKINFO, makeinfo, makeinfo, []) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2620 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
|
2621 warn_makeinfo=" |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15969
diff
changeset
|
2622 |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15969
diff
changeset
|
2623 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
|
2624 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
|
2625 " |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15969
diff
changeset
|
2626 OCTAVE_CONFIGURE_WARNING([warn_makeinfo]) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2627 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2628 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2629 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2630 dnl What pager should we use? |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2631 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2632 AC_DEFUN([OCTAVE_PROG_PAGER], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2633 if test "$cross_compiling" = yes; then |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2634 DEFAULT_PAGER=less |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2635 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
|
2636 AC_SUBST(DEFAULT_PAGER) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2637 else |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
2638 ac_octave_possible_pagers="less more page pg" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2639 case "$canonical_host_type" in |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2640 *-*-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
|
2641 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
|
2642 ;; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2643 esac |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2644 |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
2645 AC_CHECK_PROGS(DEFAULT_PAGER, [$ac_octave_possible_pagers], []) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2646 if test -z "$DEFAULT_PAGER"; then |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2647 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
|
2648 OCTAVE_CONFIGURE_WARNING([warn_less]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2649 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2650 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2651 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2652 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2653 dnl Find Perl program. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2654 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2655 AC_DEFUN([OCTAVE_PROG_PERL], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2656 AC_CHECK_PROG(PERL, perl, perl, []) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2657 AC_SUBST(PERL) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2658 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2659 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2660 dnl Find Python program. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2661 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2662 AC_DEFUN([OCTAVE_PROG_PYTHON], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2663 AC_CHECK_PROG(PYTHON, python, python, []) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2664 AC_SUBST(PYTHON) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2665 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2666 dnl |
19744
1687269e31e4
build: Generate Octave logo icons from SVG source (bug #37062)
Mike Miller <mtmiller@ieee.org>
parents:
19697
diff
changeset
|
2667 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
|
2668 dnl |
1687269e31e4
build: Generate Octave logo icons from SVG source (bug #37062)
Mike Miller <mtmiller@ieee.org>
parents:
19697
diff
changeset
|
2669 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
|
2670 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
|
2671 if test -z "$RSVG_CONVERT"; then |
bc2a8db22831
build: Use the missing script for icotool and rsvg-convert
Mike Miller <mtmiller@ieee.org>
parents:
19744
diff
changeset
|
2672 RSVG_CONVERT='$(top_srcdir)/build-aux/missing rsvg-convert' |
bc2a8db22831
build: Use the missing script for icotool and rsvg-convert
Mike Miller <mtmiller@ieee.org>
parents:
19744
diff
changeset
|
2673 warn_rsvg_convert=" |
bc2a8db22831
build: Use the missing script for icotool and rsvg-convert
Mike Miller <mtmiller@ieee.org>
parents:
19744
diff
changeset
|
2674 |
bc2a8db22831
build: Use the missing script for icotool and rsvg-convert
Mike Miller <mtmiller@ieee.org>
parents:
19744
diff
changeset
|
2675 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
|
2676 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
|
2677 from VCS sources. |
bc2a8db22831
build: Use the missing script for icotool and rsvg-convert
Mike Miller <mtmiller@ieee.org>
parents:
19744
diff
changeset
|
2678 " |
bc2a8db22831
build: Use the missing script for icotool and rsvg-convert
Mike Miller <mtmiller@ieee.org>
parents:
19744
diff
changeset
|
2679 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
|
2680 fi |
19744
1687269e31e4
build: Generate Octave logo icons from SVG source (bug #37062)
Mike Miller <mtmiller@ieee.org>
parents:
19697
diff
changeset
|
2681 AC_SUBST(RSVG_CONVERT) |
1687269e31e4
build: Generate Octave logo icons from SVG source (bug #37062)
Mike Miller <mtmiller@ieee.org>
parents:
19697
diff
changeset
|
2682 ]) |
1687269e31e4
build: Generate Octave logo icons from SVG source (bug #37062)
Mike Miller <mtmiller@ieee.org>
parents:
19697
diff
changeset
|
2683 dnl |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2684 dnl Find sed program. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2685 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2686 # Check for a fully-functional sed program, that truncates |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2687 # as few characters as possible and that supports "\(X\|Y\)" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2688 # style regular expression alternation. Prefer GNU sed if found. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2689 AC_DEFUN([OCTAVE_PROG_SED], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2690 AC_MSG_CHECKING([for a usable sed]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2691 if test -z "$SED"; then |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2692 AC_CACHE_VAL([octave_cv_prog_sed], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2693 [# 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
|
2694 # Next, test potential sed programs in list for truncation. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2695 _AS_PATH_WALK([$PATH], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2696 [for ac_prog in sed gsed; do |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2697 for ac_exec_ext in '' $ac_executable_extensions; do |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2698 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
|
2699 _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
|
2700 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2701 done |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2702 done |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2703 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2704 AS_TMPDIR(sed) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2705 _max=0 |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2706 _count=0 |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2707 # 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
|
2708 # along with /bin/sed that truncates output. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2709 for _sed in $_sed_list /usr/xpg4/bin/sed; do |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2710 test ! -f ${_sed} && break |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2711 cat /dev/null > "$tmp/sed.in" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2712 _count=0 |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2713 echo $ECHO_N "0123456789$ECHO_C" >"$tmp/sed.in" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2714 # 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
|
2715 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
|
2716 octave_cv_prog_sed=${_sed} |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2717 break; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2718 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2719 # Reject if RE alternation is not handled. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2720 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
|
2721 continue; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2722 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2723 while true; do |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2724 cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2725 mv "$tmp/sed.tmp" "$tmp/sed.in" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2726 cp "$tmp/sed.in" "$tmp/sed.nl" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2727 echo >>"$tmp/sed.nl" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2728 ${_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
|
2729 cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2730 # 10000 chars as input seems more than enough |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2731 test $_count -gt 10 && break |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2732 _count=`expr $_count + 1` |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2733 if test $_count -gt $_max; then |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2734 _max=$_count |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2735 octave_cv_prog_sed=$_sed |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2736 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2737 done |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2738 done |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2739 rm -rf "$tmp" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2740 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2741 SED=$octave_cv_prog_sed |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2742 if test -z "$SED"; then |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2743 AC_MSG_ERROR([no usable version of sed found]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2744 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2745 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2746 AC_SUBST(SED) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2747 AC_MSG_RESULT([$SED]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2748 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2749 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2750 dnl Check for texi2dvi. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2751 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2752 AC_DEFUN([OCTAVE_PROG_TEXI2DVI], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2753 AC_CHECK_PROG(TEXI2DVI, texi2dvi, texi2dvi, []) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2754 if test -z "$TEXI2DVI"; then |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2755 TEXI2DVI='$(top_srcdir)/build-aux/missing texi2dvi' |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2756 warn_texi2dvi=" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2757 |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2758 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
|
2759 reconstruct the DVI version of the manual |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2760 " |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2761 OCTAVE_CONFIGURE_WARNING([warn_texi2dvi]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2762 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2763 AC_SUBST(TEXI2DVI) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2764 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2765 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2766 dnl Check for texi2pdf. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2767 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2768 AC_DEFUN([OCTAVE_PROG_TEXI2PDF], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2769 AC_REQUIRE([OCTAVE_PROG_TEXI2DVI]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2770 AC_CHECK_PROG(TEXI2PDF, texi2pdf, texi2pdf, []) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2771 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
|
2772 ac_octave_texi2pdf_missing=yes; |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2773 if test -n "$TEXI2DVI"; then |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2774 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
|
2775 ac_octave_texi2pdf_missing=no; |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2776 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2777 else |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16012
diff
changeset
|
2778 ac_octave_texi2pdf_missing=no; |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2779 fi |
16068
b309a5da17f5
use yes/no instead of true/false in confgure scripts
John W. Eaton <jwe@octave.org>
parents:
16012
diff
changeset
|
2780 if test $ac_octave_texi2pdf_missing = yes; then |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2781 TEXI2PDF='$(top_srcdir)/build-aux/missing texi2pdf' |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2782 warn_texi2pdf=" |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2783 |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2784 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
|
2785 reconstruct the PDF version of the manual |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2786 " |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2787 OCTAVE_CONFIGURE_WARNING([warn_texi2pdf]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2788 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2789 AC_SUBST(TEXI2PDF) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2790 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2791 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2792 dnl Set default value for a variable and substitute it. |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2793 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2794 AC_DEFUN([OCTAVE_SET_DEFAULT], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2795 ifelse($#, 2, [: ${$1=$2} |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2796 ])dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2797 AC_MSG_RESULT([defining $1 to be $$1]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2798 AC_SUBST($1) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2799 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2800 dnl |
15144
9cc337ced51a
build: Update OCTAVE_UMFPACK_SEPARATE_SPLIT macro to look for SuiteSparse header file.
Rik <rik@octave.org>
parents:
15141
diff
changeset
|
2801 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
|
2802 dnl |
15144
9cc337ced51a
build: Update OCTAVE_UMFPACK_SEPARATE_SPLIT macro to look for SuiteSparse header file.
Rik <rik@octave.org>
parents:
15141
diff
changeset
|
2803 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
|
2804 dnl |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2805 AC_DEFUN([OCTAVE_UMFPACK_SEPARATE_SPLIT], [ |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2806 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
|
2807 AC_CACHE_VAL([octave_cv_umfpack_separate_split], |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2808 [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
|
2809 #include <stdint.h> |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2810 #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
|
2811 #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
|
2812 #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
|
2813 # 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
|
2814 #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
|
2815 # include <ufsparse/umfpack.h> |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2816 #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
|
2817 # include <umfpack/umfpack.h> |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2818 #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
|
2819 # include <umfpack.h> |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2820 #endif |
21724
aba2e6293dd8
use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents:
21604
diff
changeset
|
2821 #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
|
2822 typedef uint64_t idx_type; |
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
2823 #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
|
2824 #else |
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
2825 typedef int idx_type; |
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
2826 #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
|
2827 #endif |
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
2828 idx_type n = 5; |
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
2829 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
|
2830 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
|
2831 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
|
2832 -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
|
2833 double br[] = {8., 45., -3., 3., 19.}; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2834 double bi[] = {0., 0., 0., 0., 0.}; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2835 int main (void) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2836 { |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2837 double *null = (double *) NULL ; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2838 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
|
2839 idx_type i ; |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2840 void *Symbolic, *Numeric ; |
16318
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
2841 (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
|
2842 (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
|
2843 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
|
2844 (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
|
2845 Numeric, null, null) ; |
16318
eb572251b7c6
check for correct SuiteSparse functions if --enable-64
John W. Eaton <jwe@octave.org>
parents:
16313
diff
changeset
|
2846 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
|
2847 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
|
2848 if (fabs (*x - i - 1.) > 1.e-13) |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2849 return (1); |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2850 return (0) ; |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2851 } |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2852 ]])], |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2853 octave_cv_umfpack_separate_split=yes, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2854 octave_cv_umfpack_separate_split=no, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2855 octave_cv_umfpack_separate_split=yes) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2856 ]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2857 if test "$cross_compiling" = yes; then |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2858 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
|
2859 else |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2860 AC_MSG_RESULT([$octave_cv_umfpack_separate_split]) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2861 fi |
15336
5fff79162342
acinclude.m4: Put temporary shell variables in macros into ac_octave namespace.
Rik <rik@octave.org>
parents:
15330
diff
changeset
|
2862 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
|
2863 AC_DEFINE(UMFPACK_SEPARATE_SPLIT, 1, |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2864 [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
|
2865 fi |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2866 ]) |
9403
4af6e29449c1
[mq]: graphics_text_engine
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9231
diff
changeset
|
2867 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2868 dnl End of macros written by Octave developers |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2869 dnl ------------------------------------------------------------ |
9645 | 2870 dnl |