octave: m4/acinclude.m4 annotate

annotate m4/acinclude.m4 @ 33589:f07a7fe7bd51 default tip @

maint: merge stable to default

author	Rik <rik@octave.org>
date	Thu, 16 May 2024 08:32:01 -0700
parents	f57b492b5527
children

rev	line source
31133 1d61c36bb34a build: Uspdate Copyright notices for acinclude.m4, octave_blas.m4. Rik <rik@octave.org> parents: 31130 diff changeset	1 dnl acinclude.m4 -- extra macros for configuring Octave
1232 5f1bb459e99c [project @ 1995-04-10 05:20:52 by jwe] jwe parents: diff changeset	2 dnl
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	3 dnl --------------------------------------------------------------------
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	4 dnl
32632 2e484f9f1f18 maint: update Octave Project Developers copyright for the new year John W. Eaton <jwe@octave.org> parents: 32456 diff changeset	5 dnl Copyright (C) 1995-2024 The Octave Project Developers
27918 b442ec6dda5c use centralized file for copyright info for individual contributors John W. Eaton <jwe@octave.org> parents: 27842 diff changeset	6 dnl
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	7 dnl See the file COPYRIGHT.md in the top-level directory of this
31133 1d61c36bb34a build: Uspdate Copyright notices for acinclude.m4, octave_blas.m4. Rik <rik@octave.org> parents: 31130 diff changeset	8 dnl distribution or <https://octave.org/copyright/>.
17034 8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	9 dnl
1232 5f1bb459e99c [project @ 1995-04-10 05:20:52 by jwe] jwe parents: diff changeset	10 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	11 dnl
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24446 diff changeset	12 dnl Octave is free software: you can redistribute it and/or modify it
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22509 diff changeset	13 dnl under the terms of the GNU General Public License as published by
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24446 diff changeset	14 dnl the Free Software Foundation, either version 3 of the License, or
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22509 diff changeset	15 dnl (at your option) any later version.
17034 8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	16 dnl
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22509 diff changeset	17 dnl Octave is distributed in the hope that it will be useful, but
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22509 diff changeset	18 dnl WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22509 diff changeset	19 dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22509 diff changeset	20 dnl GNU General Public License for more details.
17034 8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	21 dnl
1232 5f1bb459e99c [project @ 1995-04-10 05:20:52 by jwe] jwe parents: diff changeset	22 dnl You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6955 diff changeset	23 dnl along with Octave; see the file COPYING. If not, see
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24446 diff changeset	24 dnl <https://www.gnu.org/licenses/>.
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	25 dnl
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	26 dnl --------------------------------------------------------------------
2813 d45d48b3dcde [project @ 1997-03-13 22:39:15 by jwe] jwe parents: 2641 diff changeset	27 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	28 dnl Alphabetical list of macros in the OCTAVE_ namespace
4360 1d7180ab9df1 [project @ 2003-02-24 02:57:24 by jwe] jwe parents: 4192 diff changeset	29 dnl
4366 ad851d04b396 [project @ 2003-03-05 09:49:18 by jwe] jwe parents: 4360 diff changeset	30 dnl
23510 b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	31 dnl Figure out the hardware-vendor-os info.
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	32 dnl
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	33 AC_DEFUN([OCTAVE_CANONICAL_HOST], [
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	34 AC_CANONICAL_HOST
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	35 if test -z "$host"; then
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	36 host=unknown-unknown-unknown
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	37 AC_MSG_WARN([configuring Octave for unknown system type])
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	38 fi
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	39 canonical_host_type=$host
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	40 AC_SUBST(canonical_host_type)
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	41 if test -z "$host_cpu"; then
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	42 host_cpu=unknown
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	43 fi
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	44 if test -z "$host_vendor"; then
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	45 host_vendor=unknown
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	46 fi
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	47 if test -z "$host_os"; then
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	48 host_os=unknown
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	49 fi
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	50 ])
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	51 dnl
15133 f91eac1bc66d m4/acinclude.m4: Correct typos, use consistent style for describing macros. Rik <rik@octave.org> parents: 15126 diff changeset	52 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	53 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	54 AC_DEFUN([OCTAVE_CARBON_CGDISPLAYBITSPERPIXEL], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	55 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	56 [octave_cv_func_carbon_cgdisplaybitsperpixel],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	57 [AC_LANG_PUSH(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	58 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	59 #include <Carbon/Carbon.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	60 ]], [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	61 CGDirectDisplayID display = CGMainDisplayID ();
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	62 size_t depth = CGDisplayBitsPerPixel (display);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	63 ]])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	64 octave_cv_func_carbon_cgdisplaybitsperpixel=yes,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	65 octave_cv_func_carbon_cgdisplaybitsperpixel=no)
3888 70ebd3d672a1 [project @ 2002-04-04 01:05:53 by jwe] jwe parents: 3887 diff changeset	66 AC_LANG_POP(C++)
3107 a8dcfbf87ea3 [project @ 1997-11-19 22:34:59 by jwe] jwe parents: 3089 diff changeset	67 ])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	68 if test $octave_cv_func_carbon_cgdisplaybitsperpixel = yes; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	69 AC_DEFINE(HAVE_CARBON_CGDISPLAYBITSPERPIXEL, 1,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	70 [Define to 1 if Carbon Framework has CGDisplayBitsPerPixel.])
3107 a8dcfbf87ea3 [project @ 1997-11-19 22:34:59 by jwe] jwe parents: 3089 diff changeset	71 fi
a8dcfbf87ea3 [project @ 1997-11-19 22:34:59 by jwe] jwe parents: 3089 diff changeset	72 ])
3126 0f6ec7b761a6 [project @ 1998-01-16 05:15:43 by jwe] jwe parents: 3107 diff changeset	73 dnl
15133 f91eac1bc66d m4/acinclude.m4: Correct typos, use consistent style for describing macros. Rik <rik@octave.org> parents: 15126 diff changeset	74 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	75 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	76 dnl Otherwise, add FLAG to CFLAGS if the compiler accepts the flag.
3126 0f6ec7b761a6 [project @ 1998-01-16 05:15:43 by jwe] jwe parents: 3107 diff changeset	77 dnl
9654 a307a6f77fb3 aclocal.m4: consistently quote first arg to AC_DEFUN John W. Eaton <jwe@octave.org> parents: 9645 diff changeset	78 AC_DEFUN([OCTAVE_CC_FLAG], [
17661 1978a6c76aa9 Use user-specified SED during build process (bug #40273). Rik <rik@octave.org> parents: 17615 diff changeset	79 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	80 AC_MSG_CHECKING([whether ${CC-cc} accepts $1])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	81 AC_CACHE_VAL([octave_cv_cc_flag_$ac_safe],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	82 [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	83 ac_octave_save_CFLAGS="$CFLAGS"
3126 0f6ec7b761a6 [project @ 1998-01-16 05:15:43 by jwe] jwe parents: 3107 diff changeset	84 CFLAGS="$CFLAGS $1"
5177 86fa011d6404 [project @ 2005-03-03 00:32:34 by jwe] jwe parents: 5094 diff changeset	85 AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	86 [eval "octave_cv_cc_flag_$ac_safe=yes"],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	87 [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	88 CFLAGS="$ac_octave_save_CFLAGS"
3888 70ebd3d672a1 [project @ 2002-04-04 01:05:53 by jwe] jwe parents: 3887 diff changeset	89 AC_LANG_POP(C)
3126 0f6ec7b761a6 [project @ 1998-01-16 05:15:43 by jwe] jwe parents: 3107 diff changeset	90 ])
0f6ec7b761a6 [project @ 1998-01-16 05:15:43 by jwe] jwe parents: 3107 diff changeset	91 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	92 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	93 ifelse([$2], ,
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	94 [CFLAGS="$CFLAGS $1"
3131 9c5160c83bd2 [project @ 1998-01-29 04:46:33 by jwe] jwe parents: 3130 diff changeset	95 AC_MSG_RESULT([adding $1 to CFLAGS])], [$2])
3126 0f6ec7b761a6 [project @ 1998-01-16 05:15:43 by jwe] jwe parents: 3107 diff changeset	96 else
15319 daf74ce2afdc m4/acinclude.m4: Use more consistent m4 quoting of arguments to macros. Rik <rik@octave.org> parents: 15302 diff changeset	97 AC_MSG_RESULT([no])
3126 0f6ec7b761a6 [project @ 1998-01-16 05:15:43 by jwe] jwe parents: 3107 diff changeset	98 ifelse([$3], , , [$3])
0f6ec7b761a6 [project @ 1998-01-16 05:15:43 by jwe] jwe parents: 3107 diff changeset	99 fi
0f6ec7b761a6 [project @ 1998-01-16 05:15:43 by jwe] jwe parents: 3107 diff changeset	100 ])
0f6ec7b761a6 [project @ 1998-01-16 05:15:43 by jwe] jwe parents: 3107 diff changeset	101 dnl
29367 8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	102 dnl Check if pthread stack size accounts for thread-local storage.
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	103 dnl
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	104 dnl This program should succeed if the pthread library allocates memory
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	105 dnl for thread-local (__thread) variables independently of the
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	106 dnl requested thread stack size.
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	107 dnl
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	108 dnl It will fail if (as in the current version of glibc) the storage
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	109 dnl for thread-local variables is subtracted from the memory allocated
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	110 dnl for the thread stack. (This can cause problems for Java and for
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	111 dnl other libraries.)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	112 dnl
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	113 dnl This bug is tracked in glibc at:
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	114 dnl https://sourceware.org/bugzilla/show_bug.cgi?id=11787
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	115 dnl
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	116 AC_DEFUN([OCTAVE_CHECK_BROKEN_PTHREAD_STACKSIZE], [
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	117 AC_CACHE_CHECK([whether pthread stack size does not account for thread-local storage],
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	118 [octave_cv_broken_pthread_stacksize],
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	119 [AC_LANG_PUSH(C)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	120 AC_RUN_IFELSE([AC_LANG_PROGRAM([[
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	121 #include <stdio.h>
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	122 #include <string.h>
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	123 #include <pthread.h>
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	124
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	125 static char __thread data[100 * 1024];
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	126
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	127 static void * threadfunc(void *arg)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	128 {
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	129 return data;
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	130 }
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	131 ]], [[
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	132 pthread_attr_t attr;
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	133 pthread_t thread;
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	134 int errnum;
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	135
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	136 pthread_attr_init (&attr);
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	137 errnum = pthread_attr_setstacksize (&attr, 64 * 1024);
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	138 if (errnum != 0)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	139 {
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	140 fprintf (stderr, "pthread_attr_setstacksize: %s\n", strerror(errnum));
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	141 return 1;
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	142 }
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	143 errnum = pthread_create (&thread, &attr, &threadfunc, NULL);
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	144 if (errnum != 0)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	145 {
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	146 fprintf (stderr, "pthread_create: %s\n", strerror(errnum));
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	147 return 1;
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	148 }
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	149 errnum = pthread_join (thread, NULL);
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	150 if (errnum != 0)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	151 {
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	152 fprintf (stderr, "pthread_join: %s\n", strerror(errnum));
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	153 return 1;
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	154 }
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	155
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	156 pthread_attr_destroy (&attr);
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	157 return 0;
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	158 ]])],
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	159 octave_cv_broken_pthread_stacksize=no,
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	160 octave_cv_broken_pthread_stacksize=yes,
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	161 octave_cv_broken_pthread_stacksize=no)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	162 AC_LANG_POP(C)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	163 ])
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	164 if test $octave_cv_broken_pthread_stacksize = yes; then
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	165 AC_DEFINE(HAVE_BROKEN_PTHREAD_STACKSIZE, 1,
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	166 [Define to 1 if pthread stack size does not account for thread-local storage.])
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	167 fi
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	168 ])
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	169 dnl
31982 86eb373a6c64 build: Check whether using STL from LLVM or Apple (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31933 diff changeset	170 dnl Check for LLVM or Apple libc++ library.
86eb373a6c64 build: Check whether using STL from LLVM or Apple (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31933 diff changeset	171 dnl
86eb373a6c64 build: Check whether using STL from LLVM or Apple (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31933 diff changeset	172 AC_DEFUN([OCTAVE_LLVM_LIBCXX], [
86eb373a6c64 build: Check whether using STL from LLVM or Apple (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31933 diff changeset	173 AC_CACHE_CHECK([whether using STL from LLVM or Apple],
86eb373a6c64 build: Check whether using STL from LLVM or Apple (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31933 diff changeset	174 [octave_cv_llvm_libcxx],
86eb373a6c64 build: Check whether using STL from LLVM or Apple (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31933 diff changeset	175 [AC_LANG_PUSH(C++)
86eb373a6c64 build: Check whether using STL from LLVM or Apple (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31933 diff changeset	176 AC_RUN_IFELSE([AC_LANG_PROGRAM([[
86eb373a6c64 build: Check whether using STL from LLVM or Apple (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31933 diff changeset	177 // Include any header from the STL
86eb373a6c64 build: Check whether using STL from LLVM or Apple (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31933 diff changeset	178 #include <iostream>
86eb373a6c64 build: Check whether using STL from LLVM or Apple (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31933 diff changeset	179 ]], [[
86eb373a6c64 build: Check whether using STL from LLVM or Apple (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31933 diff changeset	180 #if defined (_LIBCPP_VERSION)
86eb373a6c64 build: Check whether using STL from LLVM or Apple (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31933 diff changeset	181 return (0);
86eb373a6c64 build: Check whether using STL from LLVM or Apple (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31933 diff changeset	182 #else
86eb373a6c64 build: Check whether using STL from LLVM or Apple (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31933 diff changeset	183 return (1);
86eb373a6c64 build: Check whether using STL from LLVM or Apple (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31933 diff changeset	184 #endif
86eb373a6c64 build: Check whether using STL from LLVM or Apple (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31933 diff changeset	185 ]])],
86eb373a6c64 build: Check whether using STL from LLVM or Apple (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31933 diff changeset	186 octave_cv_llvm_libcxx=yes,
86eb373a6c64 build: Check whether using STL from LLVM or Apple (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31933 diff changeset	187 octave_cv_llvm_libcxx=no,
86eb373a6c64 build: Check whether using STL from LLVM or Apple (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31933 diff changeset	188 octave_cv_llvm_libcxx=no)
86eb373a6c64 build: Check whether using STL from LLVM or Apple (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31933 diff changeset	189 AC_LANG_POP(C++)
86eb373a6c64 build: Check whether using STL from LLVM or Apple (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31933 diff changeset	190 ])
86eb373a6c64 build: Check whether using STL from LLVM or Apple (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31933 diff changeset	191 if test $octave_cv_llvm_libcxx = yes; then
86eb373a6c64 build: Check whether using STL from LLVM or Apple (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31933 diff changeset	192 AC_DEFINE(HAVE_LLVM_LIBCXX, 1,
86eb373a6c64 build: Check whether using STL from LLVM or Apple (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31933 diff changeset	193 [Define to 1 if linking to LLVM or Apple libc++.])
86eb373a6c64 build: Check whether using STL from LLVM or Apple (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31933 diff changeset	194 fi
86eb373a6c64 build: Check whether using STL from LLVM or Apple (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31933 diff changeset	195 ])
86eb373a6c64 build: Check whether using STL from LLVM or Apple (bug #63930). Markus Mützel <markus.muetzel@gmx.de> parents: 31933 diff changeset	196 dnl
30488 abb4823df535 with C++17, match malloc/free for MEX memory (bug #61472) John W. Eaton <jwe@octave.org> parents: 30447 diff changeset	197 dnl Check whether std::pmr::polymorphic_allocator is available.
abb4823df535 with C++17, match malloc/free for MEX memory (bug #61472) John W. Eaton <jwe@octave.org> parents: 30447 diff changeset	198 dnl
abb4823df535 with C++17, match malloc/free for MEX memory (bug #61472) John W. Eaton <jwe@octave.org> parents: 30447 diff changeset	199 AC_DEFUN([OCTAVE_CHECK_STD_PMR_POLYMORPHIC_ALLOCATOR], [
30501 79a7f3e3cf54 Use consistent name for OCTAVE_HAVE_STD_PMR_POLYMORPHIC_ALLOCATOR (bug #61472). Markus Mützel <markus.muetzel@gmx.de> parents: 30488 diff changeset	200 AC_CACHE_CHECK([whether std::pmr::polymorphic_allocator is available],
30488 abb4823df535 with C++17, match malloc/free for MEX memory (bug #61472) John W. Eaton <jwe@octave.org> parents: 30447 diff changeset	201 [octave_cv_std_pmr_polymorphic_allocator],
abb4823df535 with C++17, match malloc/free for MEX memory (bug #61472) John W. Eaton <jwe@octave.org> parents: 30447 diff changeset	202 [AC_LANG_PUSH(C++)
33393 f3ffee7cf478 build: Run test for polymorphic allocators if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 33391 diff changeset	203 AC_RUN_IFELSE([AC_LANG_PROGRAM([[
f3ffee7cf478 build: Run test for polymorphic allocators if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 33391 diff changeset	204 #include <cstdlib>
f3ffee7cf478 build: Run test for polymorphic allocators if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 33391 diff changeset	205 #include <memory_resource>
f3ffee7cf478 build: Run test for polymorphic allocators if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 33391 diff changeset	206 #include <vector>
f3ffee7cf478 build: Run test for polymorphic allocators if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 33391 diff changeset	207 class mx_memory_resource : public std::pmr::memory_resource
f3ffee7cf478 build: Run test for polymorphic allocators if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 33391 diff changeset	208 {
f3ffee7cf478 build: Run test for polymorphic allocators if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 33391 diff changeset	209 private:
f3ffee7cf478 build: Run test for polymorphic allocators if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 33391 diff changeset	210 void * do_allocate (std::size_t bytes, size_t /alignment/)
f3ffee7cf478 build: Run test for polymorphic allocators if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 33391 diff changeset	211 {
f3ffee7cf478 build: Run test for polymorphic allocators if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 33391 diff changeset	212 void *ptr = std::malloc (bytes);
f3ffee7cf478 build: Run test for polymorphic allocators if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 33391 diff changeset	213 if (! ptr)
f3ffee7cf478 build: Run test for polymorphic allocators if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 33391 diff changeset	214 throw std::bad_alloc ();
f3ffee7cf478 build: Run test for polymorphic allocators if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 33391 diff changeset	215 return ptr;
f3ffee7cf478 build: Run test for polymorphic allocators if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 33391 diff changeset	216 }
f3ffee7cf478 build: Run test for polymorphic allocators if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 33391 diff changeset	217 void do_deallocate (void* ptr, std::size_t /bytes/,
f3ffee7cf478 build: Run test for polymorphic allocators if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 33391 diff changeset	218 std::size_t /alignment/)
f3ffee7cf478 build: Run test for polymorphic allocators if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 33391 diff changeset	219 {
f3ffee7cf478 build: Run test for polymorphic allocators if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 33391 diff changeset	220 std::free (ptr);
f3ffee7cf478 build: Run test for polymorphic allocators if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 33391 diff changeset	221 }
f3ffee7cf478 build: Run test for polymorphic allocators if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 33391 diff changeset	222 bool do_is_equal (const std::pmr::memory_resource& other) const noexcept
f3ffee7cf478 build: Run test for polymorphic allocators if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 33391 diff changeset	223 {
f3ffee7cf478 build: Run test for polymorphic allocators if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 33391 diff changeset	224 return this == dynamic_cast<const mx_memory_resource *> (&other);
f3ffee7cf478 build: Run test for polymorphic allocators if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 33391 diff changeset	225 return true;
f3ffee7cf478 build: Run test for polymorphic allocators if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 33391 diff changeset	226 }
f3ffee7cf478 build: Run test for polymorphic allocators if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 33391 diff changeset	227 };
f3ffee7cf478 build: Run test for polymorphic allocators if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 33391 diff changeset	228 mx_memory_resource the_mx_memory_resource;
f3ffee7cf478 build: Run test for polymorphic allocators if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 33391 diff changeset	229 ]], [[
f3ffee7cf478 build: Run test for polymorphic allocators if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 33391 diff changeset	230 std::pmr::vector<int> my_int_vec { &the_mx_memory_resource };
f3ffee7cf478 build: Run test for polymorphic allocators if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 33391 diff changeset	231 ]])],
f3ffee7cf478 build: Run test for polymorphic allocators if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 33391 diff changeset	232 octave_cv_std_pmr_polymorphic_allocator=yes,
f3ffee7cf478 build: Run test for polymorphic allocators if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 33391 diff changeset	233 octave_cv_std_pmr_polymorphic_allocator=no,
f3ffee7cf478 build: Run test for polymorphic allocators if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 33391 diff changeset	234 [## On macOS, we need to run an executable to check if polymorphic
f3ffee7cf478 build: Run test for polymorphic allocators if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 33391 diff changeset	235 ## allocators are working.
f3ffee7cf478 build: Run test for polymorphic allocators if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 33391 diff changeset	236 ## When cross-compiling to that target, the following test might succeed
f3ffee7cf478 build: Run test for polymorphic allocators if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 33391 diff changeset	237 ## even if polymorphic allocators are not actually implemented. In that
f3ffee7cf478 build: Run test for polymorphic allocators if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 33391 diff changeset	238 ## case, users would need to manually configure with
f3ffee7cf478 build: Run test for polymorphic allocators if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 33391 diff changeset	239 ## `--disable-std-pmr-polymorphic-allocator`.
f3ffee7cf478 build: Run test for polymorphic allocators if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 33391 diff changeset	240 ## When cross-compiling to any other target, the following test should be
f3ffee7cf478 build: Run test for polymorphic allocators if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 33391 diff changeset	241 ## giving accurate results.
f3ffee7cf478 build: Run test for polymorphic allocators if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 33391 diff changeset	242
f3ffee7cf478 build: Run test for polymorphic allocators if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 33391 diff changeset	243 ## FIXME: Is there a way to not repeat the same code from above?
30488 abb4823df535 with C++17, match malloc/free for MEX memory (bug #61472) John W. Eaton <jwe@octave.org> parents: 30447 diff changeset	244 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
abb4823df535 with C++17, match malloc/free for MEX memory (bug #61472) John W. Eaton <jwe@octave.org> parents: 30447 diff changeset	245 #include <cstdlib>
abb4823df535 with C++17, match malloc/free for MEX memory (bug #61472) John W. Eaton <jwe@octave.org> parents: 30447 diff changeset	246 #include <memory_resource>
abb4823df535 with C++17, match malloc/free for MEX memory (bug #61472) John W. Eaton <jwe@octave.org> parents: 30447 diff changeset	247 #include <vector>
abb4823df535 with C++17, match malloc/free for MEX memory (bug #61472) John W. Eaton <jwe@octave.org> parents: 30447 diff changeset	248 class mx_memory_resource : public std::pmr::memory_resource
abb4823df535 with C++17, match malloc/free for MEX memory (bug #61472) John W. Eaton <jwe@octave.org> parents: 30447 diff changeset	249 {
abb4823df535 with C++17, match malloc/free for MEX memory (bug #61472) John W. Eaton <jwe@octave.org> parents: 30447 diff changeset	250 private:
abb4823df535 with C++17, match malloc/free for MEX memory (bug #61472) John W. Eaton <jwe@octave.org> parents: 30447 diff changeset	251 void * do_allocate (std::size_t bytes, size_t /alignment/)
abb4823df535 with C++17, match malloc/free for MEX memory (bug #61472) John W. Eaton <jwe@octave.org> parents: 30447 diff changeset	252 {
abb4823df535 with C++17, match malloc/free for MEX memory (bug #61472) John W. Eaton <jwe@octave.org> parents: 30447 diff changeset	253 void *ptr = std::malloc (bytes);
abb4823df535 with C++17, match malloc/free for MEX memory (bug #61472) John W. Eaton <jwe@octave.org> parents: 30447 diff changeset	254 if (! ptr)
abb4823df535 with C++17, match malloc/free for MEX memory (bug #61472) John W. Eaton <jwe@octave.org> parents: 30447 diff changeset	255 throw std::bad_alloc ();
abb4823df535 with C++17, match malloc/free for MEX memory (bug #61472) John W. Eaton <jwe@octave.org> parents: 30447 diff changeset	256 return ptr;
abb4823df535 with C++17, match malloc/free for MEX memory (bug #61472) John W. Eaton <jwe@octave.org> parents: 30447 diff changeset	257 }
abb4823df535 with C++17, match malloc/free for MEX memory (bug #61472) John W. Eaton <jwe@octave.org> parents: 30447 diff changeset	258 void do_deallocate (void* ptr, std::size_t /bytes/,
abb4823df535 with C++17, match malloc/free for MEX memory (bug #61472) John W. Eaton <jwe@octave.org> parents: 30447 diff changeset	259 std::size_t /alignment/)
abb4823df535 with C++17, match malloc/free for MEX memory (bug #61472) John W. Eaton <jwe@octave.org> parents: 30447 diff changeset	260 {
abb4823df535 with C++17, match malloc/free for MEX memory (bug #61472) John W. Eaton <jwe@octave.org> parents: 30447 diff changeset	261 std::free (ptr);
abb4823df535 with C++17, match malloc/free for MEX memory (bug #61472) John W. Eaton <jwe@octave.org> parents: 30447 diff changeset	262 }
abb4823df535 with C++17, match malloc/free for MEX memory (bug #61472) John W. Eaton <jwe@octave.org> parents: 30447 diff changeset	263 bool do_is_equal (const std::pmr::memory_resource& other) const noexcept
abb4823df535 with C++17, match malloc/free for MEX memory (bug #61472) John W. Eaton <jwe@octave.org> parents: 30447 diff changeset	264 {
abb4823df535 with C++17, match malloc/free for MEX memory (bug #61472) John W. Eaton <jwe@octave.org> parents: 30447 diff changeset	265 return this == dynamic_cast<const mx_memory_resource *> (&other);
abb4823df535 with C++17, match malloc/free for MEX memory (bug #61472) John W. Eaton <jwe@octave.org> parents: 30447 diff changeset	266 return true;
abb4823df535 with C++17, match malloc/free for MEX memory (bug #61472) John W. Eaton <jwe@octave.org> parents: 30447 diff changeset	267 }
abb4823df535 with C++17, match malloc/free for MEX memory (bug #61472) John W. Eaton <jwe@octave.org> parents: 30447 diff changeset	268 };
abb4823df535 with C++17, match malloc/free for MEX memory (bug #61472) John W. Eaton <jwe@octave.org> parents: 30447 diff changeset	269 mx_memory_resource the_mx_memory_resource;
abb4823df535 with C++17, match malloc/free for MEX memory (bug #61472) John W. Eaton <jwe@octave.org> parents: 30447 diff changeset	270 ]], [[
abb4823df535 with C++17, match malloc/free for MEX memory (bug #61472) John W. Eaton <jwe@octave.org> parents: 30447 diff changeset	271 std::pmr::vector<int> my_int_vec { &the_mx_memory_resource };
abb4823df535 with C++17, match malloc/free for MEX memory (bug #61472) John W. Eaton <jwe@octave.org> parents: 30447 diff changeset	272 ]])],
abb4823df535 with C++17, match malloc/free for MEX memory (bug #61472) John W. Eaton <jwe@octave.org> parents: 30447 diff changeset	273 octave_cv_std_pmr_polymorphic_allocator=yes,
33393 f3ffee7cf478 build: Run test for polymorphic allocators if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 33391 diff changeset	274 octave_cv_std_pmr_polymorphic_allocator=no)])
30488 abb4823df535 with C++17, match malloc/free for MEX memory (bug #61472) John W. Eaton <jwe@octave.org> parents: 30447 diff changeset	275 AC_LANG_POP(C++)
abb4823df535 with C++17, match malloc/free for MEX memory (bug #61472) John W. Eaton <jwe@octave.org> parents: 30447 diff changeset	276 ])
abb4823df535 with C++17, match malloc/free for MEX memory (bug #61472) John W. Eaton <jwe@octave.org> parents: 30447 diff changeset	277 if test $octave_cv_std_pmr_polymorphic_allocator = yes; then
30501 79a7f3e3cf54 Use consistent name for OCTAVE_HAVE_STD_PMR_POLYMORPHIC_ALLOCATOR (bug #61472). Markus Mützel <markus.muetzel@gmx.de> parents: 30488 diff changeset	278 AC_DEFINE(OCTAVE_HAVE_STD_PMR_POLYMORPHIC_ALLOCATOR, 1,
30488 abb4823df535 with C++17, match malloc/free for MEX memory (bug #61472) John W. Eaton <jwe@octave.org> parents: 30447 diff changeset	279 [Define to 1 if std::pmr::polymorphic_allocator is available.])
33391 0d1a3c2ad9c6 build: Correct result of std::pmr::polymorphic_allocator in configure summary. Markus Mützel <markus.muetzel@gmx.de> parents: 33227 diff changeset	280 HAVE_STD_PMR_POLYMORPHIC_ALLOCATOR="yes"
0d1a3c2ad9c6 build: Correct result of std::pmr::polymorphic_allocator in configure summary. Markus Mützel <markus.muetzel@gmx.de> parents: 33227 diff changeset	281 else
0d1a3c2ad9c6 build: Correct result of std::pmr::polymorphic_allocator in configure summary. Markus Mützel <markus.muetzel@gmx.de> parents: 33227 diff changeset	282 HAVE_STD_PMR_POLYMORPHIC_ALLOCATOR="no"
30488 abb4823df535 with C++17, match malloc/free for MEX memory (bug #61472) John W. Eaton <jwe@octave.org> parents: 30447 diff changeset	283 fi
abb4823df535 with C++17, match malloc/free for MEX memory (bug #61472) John W. Eaton <jwe@octave.org> parents: 30447 diff changeset	284 ])
abb4823df535 with C++17, match malloc/free for MEX memory (bug #61472) John W. Eaton <jwe@octave.org> parents: 30447 diff changeset	285 dnl
21160 b5b531ba93ce build: Use configure-time test to check CXSparse version. Rik <rik@octave.org> parents: 21150 diff changeset	286 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	287 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	288 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	289 dnl
b5b531ba93ce build: Use configure-time test to check CXSparse version. Rik <rik@octave.org> parents: 21150 diff changeset	290 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	291 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	292 [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	293 [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	294 CPPFLAGS="$CXSPARSE_CPPFLAGS $CPPFLAGS"
21160 b5b531ba93ce build: Use configure-time test to check CXSparse version. Rik <rik@octave.org> parents: 21150 diff changeset	295 AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
b5b531ba93ce build: Use configure-time test to check CXSparse version. Rik <rik@octave.org> parents: 21150 diff changeset	296 #if defined (HAVE_SUITESPARSE_CS_H)
b5b531ba93ce build: Use configure-time test to check CXSparse version. Rik <rik@octave.org> parents: 21150 diff changeset	297 #include <suitesparse/cs.h>
b5b531ba93ce build: Use configure-time test to check CXSparse version. Rik <rik@octave.org> parents: 21150 diff changeset	298 #elif defined (HAVE_CXSPARSE_CS_H)
b5b531ba93ce build: Use configure-time test to check CXSparse version. Rik <rik@octave.org> parents: 21150 diff changeset	299 #include <cxsparse/cs.h>
b5b531ba93ce build: Use configure-time test to check CXSparse version. Rik <rik@octave.org> parents: 21150 diff changeset	300 #elif defined (HAVE_CS_H)
b5b531ba93ce build: Use configure-time test to check CXSparse version. Rik <rik@octave.org> parents: 21150 diff changeset	301 #include <cs.h>
b5b531ba93ce build: Use configure-time test to check CXSparse version. Rik <rik@octave.org> parents: 21150 diff changeset	302 #endif
b5b531ba93ce build: Use configure-time test to check CXSparse version. Rik <rik@octave.org> parents: 21150 diff changeset	303 ]], [[
b5b531ba93ce build: Use configure-time test to check CXSparse version. Rik <rik@octave.org> parents: 21150 diff changeset	304 #if (defined (HAVE_CXSPARSE) \
b5b531ba93ce build: Use configure-time test to check CXSparse version. Rik <rik@octave.org> parents: 21150 diff changeset	305 && (! defined (CS_VER) \
b5b531ba93ce build: Use configure-time test to check CXSparse version. Rik <rik@octave.org> parents: 21150 diff changeset	306 \|\| CS_VER < 2 \
b5b531ba93ce build: Use configure-time test to check CXSparse version. Rik <rik@octave.org> parents: 21150 diff changeset	307 \|\| (CS_VER == 2 && CS_SUBVER < 2)))
b5b531ba93ce build: Use configure-time test to check CXSparse version. Rik <rik@octave.org> parents: 21150 diff changeset	308 #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	309 #endif
b5b531ba93ce build: Use configure-time test to check CXSparse version. Rik <rik@octave.org> parents: 21150 diff changeset	310 ]])],
b5b531ba93ce build: Use configure-time test to check CXSparse version. Rik <rik@octave.org> parents: 21150 diff changeset	311 octave_cv_cxsparse_version_ok=yes,
b5b531ba93ce build: Use configure-time test to check CXSparse version. Rik <rik@octave.org> parents: 21150 diff changeset	312 octave_cv_cxsparse_version_ok=no)
b5b531ba93ce build: Use configure-time test to check CXSparse version. Rik <rik@octave.org> parents: 21150 diff changeset	313 CPPFLAGS="$ac_octave_save_CPPFLAGS"
b5b531ba93ce build: Use configure-time test to check CXSparse version. Rik <rik@octave.org> parents: 21150 diff changeset	314 ])
b5b531ba93ce build: Use configure-time test to check CXSparse version. Rik <rik@octave.org> parents: 21150 diff changeset	315 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	316 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	317 [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	318 fi
b5b531ba93ce build: Use configure-time test to check CXSparse version. Rik <rik@octave.org> parents: 21150 diff changeset	319 ])
b5b531ba93ce build: Use configure-time test to check CXSparse version. Rik <rik@octave.org> parents: 21150 diff changeset	320 dnl
15969 139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	321 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	322 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	323 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	324 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	325 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	326 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	327 dnl ahead of the main FFTW library.
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	328 dnl
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	329 AC_DEFUN([OCTAVE_CHECK_FFTW_THREADS], [
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	330 ac_octave_save_CPPFLAGS="$CPPFLAGS"
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	331 ac_octave_save_LDFLAGS="$LDFLAGS"
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	332 ac_octave_save_LIBS="$LIBS"
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	333 CPPFLAGS="$m4_toupper([$1])_CPPFLAGS $CPPFLAGS"
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	334 LDFLAGS="$m4_toupper([$1])_LDFLAGS $LDFLAGS"
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	335 LIBS="$m4_toupper([$1])_LIBS $LIBS"
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	336 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	337 [octave_cv_[$1]_threads_lib],
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	338 [AC_LINK_IFELSE([AC_LANG_PROGRAM([[
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	339 #include <fftw3.h>
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	340 ]], [[
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	341 $2 (2);
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	342 ]])],
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	343 [octave_cv_[$1]_threads_lib=yes],
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	344 [LIBS="-l[$1]_threads $LIBS"
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	345 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	346 #include <fftw3.h>
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	347 ]], [[
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	348 $2 (2);
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	349 ]])],
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	350 [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	351 [octave_cv_[$1]_threads_lib=no])
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	352 ])
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	353 ])
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	354 case $octave_cv_[$1]_threads_lib in
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	355 -l*)
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	356 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	357 ;;
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	358 no)
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	359 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	360 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	361 ;;
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	362 esac
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	363 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	364 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	365 [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	366 fi
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	367 CPPFLAGS="$ac_octave_save_CPPFLAGS"
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	368 LDFLAGS="$ac_octave_save_LDFLAGS"
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	369 LIBS="$ac_octave_save_LIBS"
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	370 ])
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	371 dnl
29367 8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	372 dnl OCTAVE_CHECK_FORTRAN_SYMBOL_AND_CALLING_CONVENTIONS
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	373 dnl
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	374 dnl Set variables related to Fortran symbol names (append underscore,
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	375 dnl use uppercase names, etc.) and calling convention (mostly used for
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	376 dnl determining how character strings are passed).
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	377 dnl
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	378 AC_DEFUN([OCTAVE_CHECK_FORTRAN_SYMBOL_AND_CALLING_CONVENTIONS], [
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	379 F77_TOLOWER=yes
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	380 F77_APPEND_UNDERSCORE=yes
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	381 F77_APPEND_EXTRA_UNDERSCORE=yes
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	382
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	383 case $ac_cv_f77_mangling in
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	384 "upper case") F77_TOLOWER=no ;;
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	385 esac
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	386 case $ac_cv_f77_mangling in
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	387 "no underscore") F77_APPEND_UNDERSCORE=no ;;
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	388 esac
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	389 case $ac_cv_f77_mangling in
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	390 "no extra underscore") F77_APPEND_EXTRA_UNDERSCORE=no ;;
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	391 esac
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	392
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	393 case $canonical_host_type in
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	394 i[[3456789]]86--)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	395 if test $ac_cv_f77_compiler_gnu = yes; then
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	396 OCTAVE_F77_FLAG([-mieee-fp])
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	397 fi
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	398 ;;
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	399 alpha--*)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	400 if test $ac_cv_f77_compiler_gnu = yes; then
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	401 OCTAVE_F77_FLAG([-mieee])
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	402 else
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	403 OCTAVE_F77_FLAG([-ieee])
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	404 OCTAVE_F77_FLAG([-fpe1])
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	405 fi
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	406 ;;
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	407 powerpc-apple-machten*)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	408 FFLAGS=
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	409 ;;
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	410 esac
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	411
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	412 if test $ac_cv_f77_compiler_gnu = yes; then
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	413 FORTRAN_CALLING_CONVENTION=gfortran
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	414 else
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	415 FORTRAN_CALLING_CONVENTION=unknown
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	416 fi
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	417 AC_ARG_ENABLE([fortran-calling-convention],
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	418 [AS_HELP_STRING([--enable-fortran-calling-convention=OPTION],
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	419 [Select C++ to Fortran calling convention. "gfortran" should be detected automatically. Other options are "cray", "visual-fortran", or "f2c".])],
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	420 [FORTRAN_CALLING_CONVENTION="$enableval"], [])
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	421
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	422 case $FORTRAN_CALLING_CONVENTION in
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	423 gfortran)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	424 AC_DEFINE(F77_USES_GFORTRAN_CALLING_CONVENTION, 1, [Define to 1 if calling Fortran from C++ should use the gfortran calling convention.])
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	425 ;;
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	426 cray)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	427 AC_DEFINE(F77_USES_CRAY_CALLING_CONVENTION, 1, [Define to 1 if calling Fortran from C++ should use the Cray Fortran calling convention.])
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	428 ;;
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	429 visual-fortran)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	430 AC_DEFINE(F77_USES_VISUAL_FORTRAN_CALLING_CONVENTION, 1, [Define to 1 if calling Fortran from C++ should use the Visual Fortran calling convention.])
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	431 ;;
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	432 f2c)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	433 AC_DEFINE(F77_USES_F2C_CALLING_CONVENTION, 1, [Define to 1 if calling Fortran from C++ should use the f2c calling convention.])
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	434 ;;
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	435 *)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	436 AC_MSG_ERROR([to build Octave, the C++ to Fortran calling convention must be known.])
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	437 ;;
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	438 esac
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	439
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	440 if test -n "$FFLAGS"; then
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	441 AC_MSG_NOTICE([defining FFLAGS to be $FFLAGS])
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	442 fi
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	443
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	444 AC_SUBST(F77_TOLOWER)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	445 AC_SUBST(F77_APPEND_UNDERSCORE)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	446 AC_SUBST(F77_APPEND_EXTRA_UNDERSCORE)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	447 ])
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	448 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	449 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	450 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	451 AC_DEFUN([OCTAVE_CHECK_FUNC_GLUTESSCALLBACK_THREEDOTS], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	452 AC_CACHE_CHECK([whether gluTessCallback is called with "(...)"],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	453 [octave_cv_func_glutesscallback_threedots],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	454 [AC_LANG_PUSH(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	455 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	456 #if defined (HAVE_GL_GLU_H)
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	457 # include <GL/glu.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	458 #elif defined HAVE_OPENGL_GLU_H \|\| defined HAVE_FRAMEWORK_OPENGL
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	459 # include <OpenGL/glu.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	460 #endif
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	461 ]], [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	462 GLvoid (*func)(...);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	463 gluTessCallback(0, 0, func);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	464 ]])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	465 octave_cv_func_glutesscallback_threedots=yes,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	466 octave_cv_func_glutesscallback_threedots=no)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	467 AC_LANG_POP(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	468 ])
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	469 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	470 AC_DEFINE(HAVE_GLUTESSCALLBACK_THREEDOTS, 1,
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	471 [Define to 1 if gluTessCallback is called with (...).])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	472 fi
9596 f26229391ea1 configure.in, aclocal.m4: check fortran integer size John W. Eaton <jwe@octave.org> parents: 9577 diff changeset	473 ])
f26229391ea1 configure.in, aclocal.m4: check fortran integer size John W. Eaton <jwe@octave.org> parents: 9577 diff changeset	474 dnl
29367 8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	475 dnl Check whether the Qt class QList has a constructor that accepts
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	476 dnl a pair of iterators. This constructor was introduced in Qt 5.14.
18973 625e3bb65885 don't require Qt 4.7 (bug #42657) John W. Eaton <jwe@octave.org> parents: 18141 diff changeset	477 dnl
31749 0668557b8f30 * acinclude.m4: Update Qt version comments. John W. Eaton <jwe@octave.org> parents: 31748 diff changeset	478 dnl FIXME: Delete this entirely when we drop support for Qt 5.13 or older.
0668557b8f30 * acinclude.m4: Update Qt version comments. John W. Eaton <jwe@octave.org> parents: 31748 diff changeset	479 dnl
29367 8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	480 AC_DEFUN([OCTAVE_CHECK_FUNC_QFONTMETRICS_HORIZONTAL_ADVANCE], [
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	481 AC_CACHE_CHECK([for QFontMetrics::horizontalAdvance function],
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	482 [octave_cv_func_qfontmetrics_horizontal_advance],
17111 bb713af2e1d9 build: detect Qt functions required for building the gui Mike Miller <mtmiller@ieee.org> parents: 17034 diff changeset	483 [AC_LANG_PUSH(C++)
bb713af2e1d9 build: detect Qt functions required for building the gui Mike Miller <mtmiller@ieee.org> parents: 17034 diff changeset	484 ac_octave_save_CPPFLAGS="$CPPFLAGS"
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	485 ac_octave_save_CXXFLAGS="$CXXFLAGS"
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	486 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	487 CXXFLAGS="$CXXPICFLAG $CXXFLAGS"
17111 bb713af2e1d9 build: detect Qt functions required for building the gui Mike Miller <mtmiller@ieee.org> parents: 17034 diff changeset	488 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
29367 8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	489 #include <QFont>
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	490 #include <QFontMetrics>
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	491 #include <QString>
17111 bb713af2e1d9 build: detect Qt functions required for building the gui Mike Miller <mtmiller@ieee.org> parents: 17034 diff changeset	492 ]], [[
29367 8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	493 QFont font;
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	494 QFontMetrics fm (font);
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	495 fm.horizontalAdvance ('x');
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	496 fm.horizontalAdvance (QString ("string"));
17111 bb713af2e1d9 build: detect Qt functions required for building the gui Mike Miller <mtmiller@ieee.org> parents: 17034 diff changeset	497 ]])],
29367 8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	498 octave_cv_func_qfontmetrics_horizontal_advance=yes,
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	499 octave_cv_func_qfontmetrics_horizontal_advance=no)
17111 bb713af2e1d9 build: detect Qt functions required for building the gui Mike Miller <mtmiller@ieee.org> parents: 17034 diff changeset	500 CPPFLAGS="$ac_octave_save_CPPFLAGS"
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	501 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	502 AC_LANG_POP(C++)
bb713af2e1d9 build: detect Qt functions required for building the gui Mike Miller <mtmiller@ieee.org> parents: 17034 diff changeset	503 ])
29367 8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	504 if test $octave_cv_func_qfontmetrics_horizontal_advance = yes; then
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	505 AC_DEFINE(HAVE_QFONTMETRICS_HORIZONTAL_ADVANCE, 1,
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	506 [Define to 1 if you have the `QFontMetrics::horizontalAdvance' function.])
27842 e79999c5d782 fix Qt4 build errors (bug #57420) John W. Eaton <jwe@octave.org> parents: 27839 diff changeset	507 fi
e79999c5d782 fix Qt4 build errors (bug #57420) John W. Eaton <jwe@octave.org> parents: 27839 diff changeset	508 ])
e79999c5d782 fix Qt4 build errors (bug #57420) John W. Eaton <jwe@octave.org> parents: 27839 diff changeset	509 dnl
29367 8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	510 dnl Check whether the Qt class QHelpEngine has the documentsForIdentifier
32008 4d15e1304a48 build: Check for Qt function QTextStream::setEncoding. Markus Mützel <markus.muetzel@gmx.de> parents: 32006 diff changeset	511 dnl function. This member function was introduced in Qt 5.15.
24827 1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	512 dnl
31749 0668557b8f30 * acinclude.m4: Update Qt version comments. John W. Eaton <jwe@octave.org> parents: 31748 diff changeset	513 dnl FIXME: Delete this entirely when we drop support for Qt 5.14 or older.
0668557b8f30 * acinclude.m4: Update Qt version comments. John W. Eaton <jwe@octave.org> parents: 31748 diff changeset	514 dnl
29367 8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	515 AC_DEFUN([OCTAVE_CHECK_FUNC_QHELPENGINE_DOCUMENTSFORIDENTIFIER], [
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	516 AC_CACHE_CHECK([for QHelpEngine::documentsForIdentifier in <QHelpEngine>],
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	517 [octave_cv_func_qhelpengine_documentsforidentifier],
24827 1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	518 [AC_LANG_PUSH(C++)
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	519 ac_octave_save_CPPFLAGS="$CPPFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	520 ac_octave_save_CXXFLAGS="$CXXFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	521 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
29367 8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	522 CXXFLAGS="$CXXPICFLAG $CXXFLAGS"
24827 1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	523 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
29367 8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	524 #include <QHelpEngine>
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	525 #include <QHelpLink>
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	526 #include <QList>
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	527 #include <QString>
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	528 #include <QUrl>
24827 1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	529 ]], [[
29367 8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	530 QString collection_file;
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	531 QHelpEngine eng (collection_file);
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	532 QString id;
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	533 eng.documentsForIdentifier (id);
24827 1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	534 ]])],
29367 8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	535 octave_cv_func_qhelpengine_documentsforidentifier=yes,
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	536 octave_cv_func_qhelpengine_documentsforidentifier=no)
24827 1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	537 CPPFLAGS="$ac_octave_save_CPPFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	538 CXXFLAGS="$ac_octave_save_CXXFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	539 AC_LANG_POP(C++)
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	540 ])
29367 8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	541 if test $octave_cv_func_qhelpengine_documentsforidentifier = yes; then
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	542 AC_DEFINE(HAVE_QHELPENGINE_DOCUMENTSFORIDENTIFIER, 1,
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	543 [Define to 1 if you have the `QHelpEngine::documentsForIdentifier' member function.])
24827 1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	544 fi
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	545 ])
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	546 dnl
25061 5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	547 dnl Check whether the Qt QHelpSearchQueryWidget class has the searchInput
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	548 dnl member function. This function was introduced in Qt 5.9.
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	549 dnl
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	550 dnl FIXME: Delete this entirely when we drop support for Qt 5.8 or older.
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	551 dnl
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	552 AC_DEFUN([OCTAVE_CHECK_FUNC_QHELPSEARCHQUERYWIDGET_SEARCHINPUT], [
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	553 AC_CACHE_CHECK([for QHelpSearchQueryWidget::searchInput],
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	554 [octave_cv_func_qhelpsearchquerywidget_searchinput],
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	555 [AC_LANG_PUSH(C++)
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	556 ac_octave_save_CPPFLAGS="$CPPFLAGS"
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	557 ac_octave_save_CXXFLAGS="$CXXFLAGS"
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	558 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
30447 8a341cf6773d build: Fix possible typo in configure tests. Markus Mützel <markus.muetzel@gmx.de> parents: 30243 diff changeset	559 CXXFLAGS="$CXXPICFLAG $CXXFLAGS"
25061 5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	560 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	561 #include <QHelpSearchQueryWidget>
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	562 #include <QString>
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	563 ]], [[
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	564 QHelpSearchQueryWidget *query_widget = new QHelpSearchQueryWidget ();
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	565 QString search_input = query_widget->searchInput ();
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	566 ]])],
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	567 octave_cv_func_qhelpsearchquerywidget_searchinput=yes,
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	568 octave_cv_func_qhelpsearchquerywidget_searchinput=no)
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	569 CPPFLAGS="$ac_octave_save_CPPFLAGS"
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	570 CXXFLAGS="$ac_octave_save_CXXFLAGS"
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	571 AC_LANG_POP(C++)
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	572 ])
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	573 if test $octave_cv_func_qhelpsearchquerywidget_searchinput = yes; then
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	574 AC_DEFINE(HAVE_QHELPSEARCHQUERYWIDGET_SEARCHINPUT, 1,
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	575 [Define to 1 if you have the `QHelpSearchQueryWidget::searchInput' member function.])
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	576 fi
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	577 ])
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	578 dnl
29367 8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	579 dnl Check whether the Qt class QList has a constructor that accepts
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	580 dnl a pair of iterators. This constructor was introduced in Qt 5.14.
18216 e54cfaae830b Make editor tabs draggable if feature is available Richard Crozier richard dot crozier(at)yahoo.co.uk parents: 18141 diff changeset	581 dnl
31749 0668557b8f30 * acinclude.m4: Update Qt version comments. John W. Eaton <jwe@octave.org> parents: 31748 diff changeset	582 dnl FIXME: Delete this entirely when we drop support for Qt 5.13 or older.
0668557b8f30 * acinclude.m4: Update Qt version comments. John W. Eaton <jwe@octave.org> parents: 31748 diff changeset	583 dnl
29367 8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	584 AC_DEFUN([OCTAVE_CHECK_FUNC_QLIST_ITERATOR_CONSTRUCTOR], [
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	585 AC_CACHE_CHECK([for QList<T>::QList (iterator, iterator) constructor],
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	586 [octave_cv_func_qlist_iterator_constructor],
24823 53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	587 [AC_LANG_PUSH(C++)
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	588 ac_octave_save_CPPFLAGS="$CPPFLAGS"
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	589 ac_octave_save_CXXFLAGS="$CXXFLAGS"
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	590 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	591 CXXFLAGS="$CXXPICFLAG $CXXFLAGS"
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	592 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	593 #include <QList>
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	594 ]], [[
29367 8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	595 QList<int> lst_one;
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	596 QList<int> lst_two (lst_one.begin (), lst_one.end ());
24823 53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	597 ]])],
29367 8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	598 octave_cv_func_qlist_iterator_constructor=yes,
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	599 octave_cv_func_qlist_iterator_constructor=no)
24823 53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	600 CPPFLAGS="$ac_octave_save_CPPFLAGS"
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	601 CXXFLAGS="$ac_octave_save_CXXFLAGS"
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	602 AC_LANG_POP(C++)
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	603 ])
29367 8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	604 if test $octave_cv_func_qlist_iterator_constructor = yes; then
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	605 AC_DEFINE(HAVE_QLIST_ITERATOR_CONSTRUCTOR, 1,
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	606 [Define to 1 if you have the `QList<T>::QList (iterator, iterator)' constructor.])
24823 53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	607 fi
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	608 ])
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	609 dnl
29048 440ace36950e avoid warnings about deprecated QWheelEvent::pos method John W. Eaton <jwe@octave.org> parents: 29047 diff changeset	610 dnl Check whether the Qt class QWheelEvent has the position member function.
440ace36950e avoid warnings about deprecated QWheelEvent::pos method John W. Eaton <jwe@octave.org> parents: 29047 diff changeset	611 dnl This member function was introduced in Qt 5.14.
440ace36950e avoid warnings about deprecated QWheelEvent::pos method John W. Eaton <jwe@octave.org> parents: 29047 diff changeset	612 dnl
31749 0668557b8f30 * acinclude.m4: Update Qt version comments. John W. Eaton <jwe@octave.org> parents: 31748 diff changeset	613 dnl FIXME: Delete this entirely when we drop support for Qt 5.13 or older.
0668557b8f30 * acinclude.m4: Update Qt version comments. John W. Eaton <jwe@octave.org> parents: 31748 diff changeset	614 dnl
29048 440ace36950e avoid warnings about deprecated QWheelEvent::pos method John W. Eaton <jwe@octave.org> parents: 29047 diff changeset	615 AC_DEFUN([OCTAVE_CHECK_FUNC_QWHEELEVENT_POSITION], [
440ace36950e avoid warnings about deprecated QWheelEvent::pos method John W. Eaton <jwe@octave.org> parents: 29047 diff changeset	616 AC_CACHE_CHECK([for QWheelEvent::position in <QWheelEvent>],
440ace36950e avoid warnings about deprecated QWheelEvent::pos method John W. Eaton <jwe@octave.org> parents: 29047 diff changeset	617 [octave_cv_func_qwheelevent_position],
440ace36950e avoid warnings about deprecated QWheelEvent::pos method John W. Eaton <jwe@octave.org> parents: 29047 diff changeset	618 [AC_LANG_PUSH(C++)
440ace36950e avoid warnings about deprecated QWheelEvent::pos method John W. Eaton <jwe@octave.org> parents: 29047 diff changeset	619 ac_octave_save_CPPFLAGS="$CPPFLAGS"
440ace36950e avoid warnings about deprecated QWheelEvent::pos method John W. Eaton <jwe@octave.org> parents: 29047 diff changeset	620 ac_octave_save_CXXFLAGS="$CXXFLAGS"
440ace36950e avoid warnings about deprecated QWheelEvent::pos method John W. Eaton <jwe@octave.org> parents: 29047 diff changeset	621 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
440ace36950e avoid warnings about deprecated QWheelEvent::pos method John W. Eaton <jwe@octave.org> parents: 29047 diff changeset	622 CXXFLAGS="$CXXPICFLAG $CXXFLAGS"
440ace36950e avoid warnings about deprecated QWheelEvent::pos method John W. Eaton <jwe@octave.org> parents: 29047 diff changeset	623 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
440ace36950e avoid warnings about deprecated QWheelEvent::pos method John W. Eaton <jwe@octave.org> parents: 29047 diff changeset	624 #include <QWheelEvent>
440ace36950e avoid warnings about deprecated QWheelEvent::pos method John W. Eaton <jwe@octave.org> parents: 29047 diff changeset	625 void foo (const QWheelEvent& ev)
440ace36950e avoid warnings about deprecated QWheelEvent::pos method John W. Eaton <jwe@octave.org> parents: 29047 diff changeset	626 {
440ace36950e avoid warnings about deprecated QWheelEvent::pos method John W. Eaton <jwe@octave.org> parents: 29047 diff changeset	627 ev.position ();
440ace36950e avoid warnings about deprecated QWheelEvent::pos method John W. Eaton <jwe@octave.org> parents: 29047 diff changeset	628 };
440ace36950e avoid warnings about deprecated QWheelEvent::pos method John W. Eaton <jwe@octave.org> parents: 29047 diff changeset	629 ]])],
440ace36950e avoid warnings about deprecated QWheelEvent::pos method John W. Eaton <jwe@octave.org> parents: 29047 diff changeset	630 octave_cv_func_qwheelevent_position=yes,
440ace36950e avoid warnings about deprecated QWheelEvent::pos method John W. Eaton <jwe@octave.org> parents: 29047 diff changeset	631 octave_cv_func_qwheelevent_position=no)
440ace36950e avoid warnings about deprecated QWheelEvent::pos method John W. Eaton <jwe@octave.org> parents: 29047 diff changeset	632 CPPFLAGS="$ac_octave_save_CPPFLAGS"
440ace36950e avoid warnings about deprecated QWheelEvent::pos method John W. Eaton <jwe@octave.org> parents: 29047 diff changeset	633 CXXFLAGS="$ac_octave_save_CXXFLAGS"
440ace36950e avoid warnings about deprecated QWheelEvent::pos method John W. Eaton <jwe@octave.org> parents: 29047 diff changeset	634 AC_LANG_POP(C++)
440ace36950e avoid warnings about deprecated QWheelEvent::pos method John W. Eaton <jwe@octave.org> parents: 29047 diff changeset	635 ])
440ace36950e avoid warnings about deprecated QWheelEvent::pos method John W. Eaton <jwe@octave.org> parents: 29047 diff changeset	636 if test $octave_cv_func_qwheelevent_position = yes; then
440ace36950e avoid warnings about deprecated QWheelEvent::pos method John W. Eaton <jwe@octave.org> parents: 29047 diff changeset	637 AC_DEFINE(HAVE_QWHEELEVENT_POSITION, 1,
440ace36950e avoid warnings about deprecated QWheelEvent::pos method John W. Eaton <jwe@octave.org> parents: 29047 diff changeset	638 [Define to 1 if you have the `QWheelEvent::position' member function.])
440ace36950e avoid warnings about deprecated QWheelEvent::pos method John W. Eaton <jwe@octave.org> parents: 29047 diff changeset	639 fi
440ace36950e avoid warnings about deprecated QWheelEvent::pos method John W. Eaton <jwe@octave.org> parents: 29047 diff changeset	640 ])
440ace36950e avoid warnings about deprecated QWheelEvent::pos method John W. Eaton <jwe@octave.org> parents: 29047 diff changeset	641 dnl
31212 55415fa6a20f svgconvert: Use Lossless encoding of images when available (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 31134 diff changeset	642 dnl Check whether the Qt method QPainter::setRenderHint accepts the
31749 0668557b8f30 * acinclude.m4: Update Qt version comments. John W. Eaton <jwe@octave.org> parents: 31748 diff changeset	643 dnl QPainter::LosslessImageRendering flag. This flag was introduced in
0668557b8f30 * acinclude.m4: Update Qt version comments. John W. Eaton <jwe@octave.org> parents: 31748 diff changeset	644 dnl Qt 5.13.
0668557b8f30 * acinclude.m4: Update Qt version comments. John W. Eaton <jwe@octave.org> parents: 31748 diff changeset	645 dnl
0668557b8f30 * acinclude.m4: Update Qt version comments. John W. Eaton <jwe@octave.org> parents: 31748 diff changeset	646 dnl FIXME: Delete this entirely when we drop support for Qt 5.12 or older.
31212 55415fa6a20f svgconvert: Use Lossless encoding of images when available (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 31134 diff changeset	647 dnl
55415fa6a20f svgconvert: Use Lossless encoding of images when available (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 31134 diff changeset	648 AC_DEFUN([OCTAVE_CHECK_FUNC_QPAINTER_SETRENDERHINT_LOSSLESS], [
55415fa6a20f svgconvert: Use Lossless encoding of images when available (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 31134 diff changeset	649 AC_CACHE_CHECK([for QPainter::LosslessImageRendering flag],
55415fa6a20f svgconvert: Use Lossless encoding of images when available (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 31134 diff changeset	650 [octave_cv_func_qpainter_setrenderhint_lossless],
55415fa6a20f svgconvert: Use Lossless encoding of images when available (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 31134 diff changeset	651 [AC_LANG_PUSH(C++)
55415fa6a20f svgconvert: Use Lossless encoding of images when available (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 31134 diff changeset	652 ac_octave_save_CPPFLAGS="$CPPFLAGS"
55415fa6a20f svgconvert: Use Lossless encoding of images when available (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 31134 diff changeset	653 ac_octave_save_CXXFLAGS="$CXXFLAGS"
55415fa6a20f svgconvert: Use Lossless encoding of images when available (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 31134 diff changeset	654 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
55415fa6a20f svgconvert: Use Lossless encoding of images when available (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 31134 diff changeset	655 CXXFLAGS="$CXXPICFLAG $CXXFLAGS"
55415fa6a20f svgconvert: Use Lossless encoding of images when available (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 31134 diff changeset	656 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
55415fa6a20f svgconvert: Use Lossless encoding of images when available (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 31134 diff changeset	657 #include <QPainter>
55415fa6a20f svgconvert: Use Lossless encoding of images when available (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 31134 diff changeset	658 ]], [[
55415fa6a20f svgconvert: Use Lossless encoding of images when available (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 31134 diff changeset	659 QPainter painter;
55415fa6a20f svgconvert: Use Lossless encoding of images when available (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 31134 diff changeset	660 painter.setRenderHint (QPainter::LosslessImageRendering);
55415fa6a20f svgconvert: Use Lossless encoding of images when available (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 31134 diff changeset	661 ]])],
55415fa6a20f svgconvert: Use Lossless encoding of images when available (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 31134 diff changeset	662 octave_cv_func_qpainter_setrenderhint_lossless=yes,
55415fa6a20f svgconvert: Use Lossless encoding of images when available (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 31134 diff changeset	663 octave_cv_func_qpainter_setrenderhint_lossless=no)
55415fa6a20f svgconvert: Use Lossless encoding of images when available (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 31134 diff changeset	664 CPPFLAGS="$ac_octave_save_CPPFLAGS"
55415fa6a20f svgconvert: Use Lossless encoding of images when available (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 31134 diff changeset	665 CXXFLAGS="$ac_octave_save_CXXFLAGS"
55415fa6a20f svgconvert: Use Lossless encoding of images when available (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 31134 diff changeset	666 AC_LANG_POP(C++)
55415fa6a20f svgconvert: Use Lossless encoding of images when available (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 31134 diff changeset	667 ])
55415fa6a20f svgconvert: Use Lossless encoding of images when available (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 31134 diff changeset	668 if test $octave_cv_func_qpainter_setrenderhint_lossless = yes; then
55415fa6a20f svgconvert: Use Lossless encoding of images when available (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 31134 diff changeset	669 AC_DEFINE(HAVE_QPAINTER_RENDERHINT_LOSSLESS, 1,
55415fa6a20f svgconvert: Use Lossless encoding of images when available (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 31134 diff changeset	670 [Define to 1 if you have the `QPainter::LosslessImageRendering' flag.])
55415fa6a20f svgconvert: Use Lossless encoding of images when available (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 31134 diff changeset	671 fi
55415fa6a20f svgconvert: Use Lossless encoding of images when available (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 31134 diff changeset	672 ])
55415fa6a20f svgconvert: Use Lossless encoding of images when available (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 31134 diff changeset	673 dnl
32005 8f9de7cb4e02 Use appropriate type for arguments of Color::getRgbF and QColor::getHslF. Markus Mützel <markus.muetzel@gmx.de> parents: 32004 diff changeset	674 dnl Check whether the Qt methods QColor::getRgbF and QColor::getHslF
8f9de7cb4e02 Use appropriate type for arguments of Color::getRgbF and QColor::getHslF. Markus Mützel <markus.muetzel@gmx.de> parents: 32004 diff changeset	675 dnl use float types as their arguments. The type of the arguments
8f9de7cb4e02 Use appropriate type for arguments of Color::getRgbF and QColor::getHslF. Markus Mützel <markus.muetzel@gmx.de> parents: 32004 diff changeset	676 dnl changed from qreal to float in Qt6.
8f9de7cb4e02 Use appropriate type for arguments of Color::getRgbF and QColor::getHslF. Markus Mützel <markus.muetzel@gmx.de> parents: 32004 diff changeset	677 dnl
8f9de7cb4e02 Use appropriate type for arguments of Color::getRgbF and QColor::getHslF. Markus Mützel <markus.muetzel@gmx.de> parents: 32004 diff changeset	678 dnl FIXME: Delete this check when we drop support for any version of Qt5.
8f9de7cb4e02 Use appropriate type for arguments of Color::getRgbF and QColor::getHslF. Markus Mützel <markus.muetzel@gmx.de> parents: 32004 diff changeset	679 dnl
8f9de7cb4e02 Use appropriate type for arguments of Color::getRgbF and QColor::getHslF. Markus Mützel <markus.muetzel@gmx.de> parents: 32004 diff changeset	680 AC_DEFUN([OCTAVE_CHECK_FUNC_QCOLOR_FLOAT_TYPE], [
8f9de7cb4e02 Use appropriate type for arguments of Color::getRgbF and QColor::getHslF. Markus Mützel <markus.muetzel@gmx.de> parents: 32004 diff changeset	681 AC_CACHE_CHECK([for QColor::getRgbF and QColor::getHslF with float arguments],
8f9de7cb4e02 Use appropriate type for arguments of Color::getRgbF and QColor::getHslF. Markus Mützel <markus.muetzel@gmx.de> parents: 32004 diff changeset	682 [octave_cv_func_qcolor_float_type],
8f9de7cb4e02 Use appropriate type for arguments of Color::getRgbF and QColor::getHslF. Markus Mützel <markus.muetzel@gmx.de> parents: 32004 diff changeset	683 [AC_LANG_PUSH(C++)
8f9de7cb4e02 Use appropriate type for arguments of Color::getRgbF and QColor::getHslF. Markus Mützel <markus.muetzel@gmx.de> parents: 32004 diff changeset	684 ac_octave_save_CPPFLAGS="$CPPFLAGS"
8f9de7cb4e02 Use appropriate type for arguments of Color::getRgbF and QColor::getHslF. Markus Mützel <markus.muetzel@gmx.de> parents: 32004 diff changeset	685 ac_octave_save_CXXFLAGS="$CXXFLAGS"
8f9de7cb4e02 Use appropriate type for arguments of Color::getRgbF and QColor::getHslF. Markus Mützel <markus.muetzel@gmx.de> parents: 32004 diff changeset	686 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
8f9de7cb4e02 Use appropriate type for arguments of Color::getRgbF and QColor::getHslF. Markus Mützel <markus.muetzel@gmx.de> parents: 32004 diff changeset	687 CXXFLAGS="$CXXPICFLAG $CXXFLAGS"
8f9de7cb4e02 Use appropriate type for arguments of Color::getRgbF and QColor::getHslF. Markus Mützel <markus.muetzel@gmx.de> parents: 32004 diff changeset	688 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
8f9de7cb4e02 Use appropriate type for arguments of Color::getRgbF and QColor::getHslF. Markus Mützel <markus.muetzel@gmx.de> parents: 32004 diff changeset	689 #include <QColor>
8f9de7cb4e02 Use appropriate type for arguments of Color::getRgbF and QColor::getHslF. Markus Mützel <markus.muetzel@gmx.de> parents: 32004 diff changeset	690 ]], [[
8f9de7cb4e02 Use appropriate type for arguments of Color::getRgbF and QColor::getHslF. Markus Mützel <markus.muetzel@gmx.de> parents: 32004 diff changeset	691 QColor color;
8f9de7cb4e02 Use appropriate type for arguments of Color::getRgbF and QColor::getHslF. Markus Mützel <markus.muetzel@gmx.de> parents: 32004 diff changeset	692 float r, g, b, h, s, l, a;
8f9de7cb4e02 Use appropriate type for arguments of Color::getRgbF and QColor::getHslF. Markus Mützel <markus.muetzel@gmx.de> parents: 32004 diff changeset	693 color.getRgbF (&r, &g, &b);
8f9de7cb4e02 Use appropriate type for arguments of Color::getRgbF and QColor::getHslF. Markus Mützel <markus.muetzel@gmx.de> parents: 32004 diff changeset	694 color.getHslF (&h, &s, &l, &a);
8f9de7cb4e02 Use appropriate type for arguments of Color::getRgbF and QColor::getHslF. Markus Mützel <markus.muetzel@gmx.de> parents: 32004 diff changeset	695 ]])],
8f9de7cb4e02 Use appropriate type for arguments of Color::getRgbF and QColor::getHslF. Markus Mützel <markus.muetzel@gmx.de> parents: 32004 diff changeset	696 octave_cv_func_qcolor_float_type=yes,
8f9de7cb4e02 Use appropriate type for arguments of Color::getRgbF and QColor::getHslF. Markus Mützel <markus.muetzel@gmx.de> parents: 32004 diff changeset	697 octave_cv_func_qcolor_float_type=no)
8f9de7cb4e02 Use appropriate type for arguments of Color::getRgbF and QColor::getHslF. Markus Mützel <markus.muetzel@gmx.de> parents: 32004 diff changeset	698 CPPFLAGS="$ac_octave_save_CPPFLAGS"
8f9de7cb4e02 Use appropriate type for arguments of Color::getRgbF and QColor::getHslF. Markus Mützel <markus.muetzel@gmx.de> parents: 32004 diff changeset	699 CXXFLAGS="$ac_octave_save_CXXFLAGS"
8f9de7cb4e02 Use appropriate type for arguments of Color::getRgbF and QColor::getHslF. Markus Mützel <markus.muetzel@gmx.de> parents: 32004 diff changeset	700 AC_LANG_POP(C++)
8f9de7cb4e02 Use appropriate type for arguments of Color::getRgbF and QColor::getHslF. Markus Mützel <markus.muetzel@gmx.de> parents: 32004 diff changeset	701 ])
8f9de7cb4e02 Use appropriate type for arguments of Color::getRgbF and QColor::getHslF. Markus Mützel <markus.muetzel@gmx.de> parents: 32004 diff changeset	702 if test $octave_cv_func_qcolor_float_type = yes; then
8f9de7cb4e02 Use appropriate type for arguments of Color::getRgbF and QColor::getHslF. Markus Mützel <markus.muetzel@gmx.de> parents: 32004 diff changeset	703 AC_DEFINE(HAVE_QCOLOR_FLOAT_TYPE, 1,
8f9de7cb4e02 Use appropriate type for arguments of Color::getRgbF and QColor::getHslF. Markus Mützel <markus.muetzel@gmx.de> parents: 32004 diff changeset	704 [Define to 1 if QColor::getRgbF and QColor::getHslF use float type arguments.])
8f9de7cb4e02 Use appropriate type for arguments of Color::getRgbF and QColor::getHslF. Markus Mützel <markus.muetzel@gmx.de> parents: 32004 diff changeset	705 fi
8f9de7cb4e02 Use appropriate type for arguments of Color::getRgbF and QColor::getHslF. Markus Mützel <markus.muetzel@gmx.de> parents: 32004 diff changeset	706 ])
8f9de7cb4e02 Use appropriate type for arguments of Color::getRgbF and QColor::getHslF. Markus Mützel <markus.muetzel@gmx.de> parents: 32004 diff changeset	707 dnl
32006 5724d89e9244 Use QStreamView if available. Markus Mützel <markus.muetzel@gmx.de> parents: 32005 diff changeset	708 dnl Check whether Qt provides a QStringView class. This class was first
5724d89e9244 Use QStreamView if available. Markus Mützel <markus.muetzel@gmx.de> parents: 32005 diff changeset	709 dnl introduced in Qt 5.10 and finally replaced QStringRef in Qt6.
5724d89e9244 Use QStreamView if available. Markus Mützel <markus.muetzel@gmx.de> parents: 32005 diff changeset	710 dnl
5724d89e9244 Use QStreamView if available. Markus Mützel <markus.muetzel@gmx.de> parents: 32005 diff changeset	711 dnl FIXME: Delete this check when we drop support for Qt 5.9 or older.
5724d89e9244 Use QStreamView if available. Markus Mützel <markus.muetzel@gmx.de> parents: 32005 diff changeset	712 dnl
5724d89e9244 Use QStreamView if available. Markus Mützel <markus.muetzel@gmx.de> parents: 32005 diff changeset	713 AC_DEFUN([OCTAVE_CHECK_CLASS_QSTRINGVIEW], [
5724d89e9244 Use QStreamView if available. Markus Mützel <markus.muetzel@gmx.de> parents: 32005 diff changeset	714 AC_CACHE_CHECK([for class QStringView],
5724d89e9244 Use QStreamView if available. Markus Mützel <markus.muetzel@gmx.de> parents: 32005 diff changeset	715 [octave_cv_class_qstringview],
5724d89e9244 Use QStreamView if available. Markus Mützel <markus.muetzel@gmx.de> parents: 32005 diff changeset	716 [AC_LANG_PUSH(C++)
5724d89e9244 Use QStreamView if available. Markus Mützel <markus.muetzel@gmx.de> parents: 32005 diff changeset	717 ac_octave_save_CPPFLAGS="$CPPFLAGS"
5724d89e9244 Use QStreamView if available. Markus Mützel <markus.muetzel@gmx.de> parents: 32005 diff changeset	718 ac_octave_save_CXXFLAGS="$CXXFLAGS"
5724d89e9244 Use QStreamView if available. Markus Mützel <markus.muetzel@gmx.de> parents: 32005 diff changeset	719 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
5724d89e9244 Use QStreamView if available. Markus Mützel <markus.muetzel@gmx.de> parents: 32005 diff changeset	720 CXXFLAGS="$CXXPICFLAG $CXXFLAGS"
5724d89e9244 Use QStreamView if available. Markus Mützel <markus.muetzel@gmx.de> parents: 32005 diff changeset	721 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
5724d89e9244 Use QStreamView if available. Markus Mützel <markus.muetzel@gmx.de> parents: 32005 diff changeset	722 #include <QStringView>
5724d89e9244 Use QStreamView if available. Markus Mützel <markus.muetzel@gmx.de> parents: 32005 diff changeset	723 ]], [[
5724d89e9244 Use QStreamView if available. Markus Mützel <markus.muetzel@gmx.de> parents: 32005 diff changeset	724 QStringView qstrv {};
5724d89e9244 Use QStreamView if available. Markus Mützel <markus.muetzel@gmx.de> parents: 32005 diff changeset	725 ]])],
5724d89e9244 Use QStreamView if available. Markus Mützel <markus.muetzel@gmx.de> parents: 32005 diff changeset	726 octave_cv_class_qstringview=yes,
5724d89e9244 Use QStreamView if available. Markus Mützel <markus.muetzel@gmx.de> parents: 32005 diff changeset	727 octave_cv_class_qstringview=no)
5724d89e9244 Use QStreamView if available. Markus Mützel <markus.muetzel@gmx.de> parents: 32005 diff changeset	728 CPPFLAGS="$ac_octave_save_CPPFLAGS"
5724d89e9244 Use QStreamView if available. Markus Mützel <markus.muetzel@gmx.de> parents: 32005 diff changeset	729 CXXFLAGS="$ac_octave_save_CXXFLAGS"
5724d89e9244 Use QStreamView if available. Markus Mützel <markus.muetzel@gmx.de> parents: 32005 diff changeset	730 AC_LANG_POP(C++)
5724d89e9244 Use QStreamView if available. Markus Mützel <markus.muetzel@gmx.de> parents: 32005 diff changeset	731 ])
5724d89e9244 Use QStreamView if available. Markus Mützel <markus.muetzel@gmx.de> parents: 32005 diff changeset	732 if test $octave_cv_class_qstringview = yes; then
5724d89e9244 Use QStreamView if available. Markus Mützel <markus.muetzel@gmx.de> parents: 32005 diff changeset	733 AC_DEFINE(HAVE_QSTRINGVIEW, 1,
5724d89e9244 Use QStreamView if available. Markus Mützel <markus.muetzel@gmx.de> parents: 32005 diff changeset	734 [Define to 1 if Qt provides the class QStringView.])
5724d89e9244 Use QStreamView if available. Markus Mützel <markus.muetzel@gmx.de> parents: 32005 diff changeset	735 fi
5724d89e9244 Use QStreamView if available. Markus Mützel <markus.muetzel@gmx.de> parents: 32005 diff changeset	736 ])
5724d89e9244 Use QStreamView if available. Markus Mützel <markus.muetzel@gmx.de> parents: 32005 diff changeset	737 dnl
32008 4d15e1304a48 build: Check for Qt function QTextStream::setEncoding. Markus Mützel <markus.muetzel@gmx.de> parents: 32006 diff changeset	738 dnl Check whether the Qt class QTextStream has the setEncoding function.
4d15e1304a48 build: Check for Qt function QTextStream::setEncoding. Markus Mützel <markus.muetzel@gmx.de> parents: 32006 diff changeset	739 dnl This function was introduced replacing QTextStream::setCodec in Qt6.
4d15e1304a48 build: Check for Qt function QTextStream::setEncoding. Markus Mützel <markus.muetzel@gmx.de> parents: 32006 diff changeset	740 dnl
4d15e1304a48 build: Check for Qt function QTextStream::setEncoding. Markus Mützel <markus.muetzel@gmx.de> parents: 32006 diff changeset	741 dnl FIXME: Delete this check when we drop support for any version of Qt5.
4d15e1304a48 build: Check for Qt function QTextStream::setEncoding. Markus Mützel <markus.muetzel@gmx.de> parents: 32006 diff changeset	742 dnl
4d15e1304a48 build: Check for Qt function QTextStream::setEncoding. Markus Mützel <markus.muetzel@gmx.de> parents: 32006 diff changeset	743 AC_DEFUN([OCTAVE_CHECK_FUNC_QTEXTSTREAM_SETENCODING], [
4d15e1304a48 build: Check for Qt function QTextStream::setEncoding. Markus Mützel <markus.muetzel@gmx.de> parents: 32006 diff changeset	744 AC_CACHE_CHECK([for QTextStream::setEncoding],
4d15e1304a48 build: Check for Qt function QTextStream::setEncoding. Markus Mützel <markus.muetzel@gmx.de> parents: 32006 diff changeset	745 [octave_cv_func_qtextstream_setencoding],
4d15e1304a48 build: Check for Qt function QTextStream::setEncoding. Markus Mützel <markus.muetzel@gmx.de> parents: 32006 diff changeset	746 [AC_LANG_PUSH(C++)
4d15e1304a48 build: Check for Qt function QTextStream::setEncoding. Markus Mützel <markus.muetzel@gmx.de> parents: 32006 diff changeset	747 ac_octave_save_CPPFLAGS="$CPPFLAGS"
4d15e1304a48 build: Check for Qt function QTextStream::setEncoding. Markus Mützel <markus.muetzel@gmx.de> parents: 32006 diff changeset	748 ac_octave_save_CXXFLAGS="$CXXFLAGS"
4d15e1304a48 build: Check for Qt function QTextStream::setEncoding. Markus Mützel <markus.muetzel@gmx.de> parents: 32006 diff changeset	749 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
4d15e1304a48 build: Check for Qt function QTextStream::setEncoding. Markus Mützel <markus.muetzel@gmx.de> parents: 32006 diff changeset	750 CXXFLAGS="$CXXPICFLAG $CXXFLAGS"
4d15e1304a48 build: Check for Qt function QTextStream::setEncoding. Markus Mützel <markus.muetzel@gmx.de> parents: 32006 diff changeset	751 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
4d15e1304a48 build: Check for Qt function QTextStream::setEncoding. Markus Mützel <markus.muetzel@gmx.de> parents: 32006 diff changeset	752 #include <QStringConverter>
4d15e1304a48 build: Check for Qt function QTextStream::setEncoding. Markus Mützel <markus.muetzel@gmx.de> parents: 32006 diff changeset	753 #include <QTextStream>
4d15e1304a48 build: Check for Qt function QTextStream::setEncoding. Markus Mützel <markus.muetzel@gmx.de> parents: 32006 diff changeset	754 ]], [[
4d15e1304a48 build: Check for Qt function QTextStream::setEncoding. Markus Mützel <markus.muetzel@gmx.de> parents: 32006 diff changeset	755 QTextStream textstream;
4d15e1304a48 build: Check for Qt function QTextStream::setEncoding. Markus Mützel <markus.muetzel@gmx.de> parents: 32006 diff changeset	756 textstream.setEncoding (QStringConverter::Utf8);
4d15e1304a48 build: Check for Qt function QTextStream::setEncoding. Markus Mützel <markus.muetzel@gmx.de> parents: 32006 diff changeset	757 ]])],
4d15e1304a48 build: Check for Qt function QTextStream::setEncoding. Markus Mützel <markus.muetzel@gmx.de> parents: 32006 diff changeset	758 octave_cv_func_qtextstream_setencoding=yes,
4d15e1304a48 build: Check for Qt function QTextStream::setEncoding. Markus Mützel <markus.muetzel@gmx.de> parents: 32006 diff changeset	759 octave_cv_func_qtextstream_setencoding=no)
4d15e1304a48 build: Check for Qt function QTextStream::setEncoding. Markus Mützel <markus.muetzel@gmx.de> parents: 32006 diff changeset	760 CPPFLAGS="$ac_octave_save_CPPFLAGS"
4d15e1304a48 build: Check for Qt function QTextStream::setEncoding. Markus Mützel <markus.muetzel@gmx.de> parents: 32006 diff changeset	761 CXXFLAGS="$ac_octave_save_CXXFLAGS"
4d15e1304a48 build: Check for Qt function QTextStream::setEncoding. Markus Mützel <markus.muetzel@gmx.de> parents: 32006 diff changeset	762 AC_LANG_POP(C++)
4d15e1304a48 build: Check for Qt function QTextStream::setEncoding. Markus Mützel <markus.muetzel@gmx.de> parents: 32006 diff changeset	763 ])
4d15e1304a48 build: Check for Qt function QTextStream::setEncoding. Markus Mützel <markus.muetzel@gmx.de> parents: 32006 diff changeset	764 if test $octave_cv_func_qtextstream_setencoding = yes; then
4d15e1304a48 build: Check for Qt function QTextStream::setEncoding. Markus Mützel <markus.muetzel@gmx.de> parents: 32006 diff changeset	765 AC_DEFINE(HAVE_QTEXTSTREAM_SETENCODING, 1,
4d15e1304a48 build: Check for Qt function QTextStream::setEncoding. Markus Mützel <markus.muetzel@gmx.de> parents: 32006 diff changeset	766 [Define to 1 if you have the `QTextStream::setEncoding' member function.])
4d15e1304a48 build: Check for Qt function QTextStream::setEncoding. Markus Mützel <markus.muetzel@gmx.de> parents: 32006 diff changeset	767 fi
4d15e1304a48 build: Check for Qt function QTextStream::setEncoding. Markus Mützel <markus.muetzel@gmx.de> parents: 32006 diff changeset	768 ])
4d15e1304a48 build: Check for Qt function QTextStream::setEncoding. Markus Mützel <markus.muetzel@gmx.de> parents: 32006 diff changeset	769 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	770 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	771 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	772 AC_DEFUN([OCTAVE_CHECK_HDF5_HAS_VER_16_API], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	773 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	774 [octave_cv_hdf5_has_ver_16_api],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	775 [AC_LINK_IFELSE([AC_LANG_PROGRAM([[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	776 #include <hdf5.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	777 ]], [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	778 H5Eset_auto (0, 0);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	779 ]])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	780 octave_cv_hdf5_has_ver_16_api=yes,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	781 octave_cv_hdf5_has_ver_16_api=no)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	782 ])
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	783 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	784 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	785 fi
14605 28e53daab1f8 Cleanup on autoconf warnings Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14550 diff changeset	786 ])
28e53daab1f8 Cleanup on autoconf warnings Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14550 diff changeset	787 dnl
30243 a4061ae5ff79 Use UTF-8 file API if supported by HDF5 library. Markus Mützel <markus.muetzel@gmx.de> parents: 30170 diff changeset	788 dnl Check whether HDF5 library has UTF-8 file API.
a4061ae5ff79 Use UTF-8 file API if supported by HDF5 library. Markus Mützel <markus.muetzel@gmx.de> parents: 30170 diff changeset	789 dnl
a4061ae5ff79 Use UTF-8 file API if supported by HDF5 library. Markus Mützel <markus.muetzel@gmx.de> parents: 30170 diff changeset	790 AC_DEFUN([OCTAVE_CHECK_HDF5_HAS_UTF8_API], [
a4061ae5ff79 Use UTF-8 file API if supported by HDF5 library. Markus Mützel <markus.muetzel@gmx.de> parents: 30170 diff changeset	791 AC_CACHE_CHECK([whether HDF5 library has UTF-8 file API],
a4061ae5ff79 Use UTF-8 file API if supported by HDF5 library. Markus Mützel <markus.muetzel@gmx.de> parents: 30170 diff changeset	792 [octave_cv_hdf5_has_utf8_api],
a4061ae5ff79 Use UTF-8 file API if supported by HDF5 library. Markus Mützel <markus.muetzel@gmx.de> parents: 30170 diff changeset	793 [case $host_os in
a4061ae5ff79 Use UTF-8 file API if supported by HDF5 library. Markus Mützel <markus.muetzel@gmx.de> parents: 30170 diff changeset	794 msdosmsvc \| mingw*)
a4061ae5ff79 Use UTF-8 file API if supported by HDF5 library. Markus Mützel <markus.muetzel@gmx.de> parents: 30170 diff changeset	795 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
a4061ae5ff79 Use UTF-8 file API if supported by HDF5 library. Markus Mützel <markus.muetzel@gmx.de> parents: 30170 diff changeset	796 #include <stddef.h>
a4061ae5ff79 Use UTF-8 file API if supported by HDF5 library. Markus Mützel <markus.muetzel@gmx.de> parents: 30170 diff changeset	797 const wchar_t H5_get_utf16_str(const char s);
a4061ae5ff79 Use UTF-8 file API if supported by HDF5 library. Markus Mützel <markus.muetzel@gmx.de> parents: 30170 diff changeset	798 ]], [[
a4061ae5ff79 Use UTF-8 file API if supported by HDF5 library. Markus Mützel <markus.muetzel@gmx.de> parents: 30170 diff changeset	799 H5_get_utf16_str ("");
a4061ae5ff79 Use UTF-8 file API if supported by HDF5 library. Markus Mützel <markus.muetzel@gmx.de> parents: 30170 diff changeset	800 ]])],
a4061ae5ff79 Use UTF-8 file API if supported by HDF5 library. Markus Mützel <markus.muetzel@gmx.de> parents: 30170 diff changeset	801 octave_cv_hdf5_has_utf8_api=yes,
a4061ae5ff79 Use UTF-8 file API if supported by HDF5 library. Markus Mützel <markus.muetzel@gmx.de> parents: 30170 diff changeset	802 octave_cv_hdf5_has_utf8_api=no)
a4061ae5ff79 Use UTF-8 file API if supported by HDF5 library. Markus Mützel <markus.muetzel@gmx.de> parents: 30170 diff changeset	803 ;;
a4061ae5ff79 Use UTF-8 file API if supported by HDF5 library. Markus Mützel <markus.muetzel@gmx.de> parents: 30170 diff changeset	804 *)
a4061ae5ff79 Use UTF-8 file API if supported by HDF5 library. Markus Mützel <markus.muetzel@gmx.de> parents: 30170 diff changeset	805 ## Assume yes on all other platforms
a4061ae5ff79 Use UTF-8 file API if supported by HDF5 library. Markus Mützel <markus.muetzel@gmx.de> parents: 30170 diff changeset	806 octave_cv_hdf5_has_utf8_api=yes
a4061ae5ff79 Use UTF-8 file API if supported by HDF5 library. Markus Mützel <markus.muetzel@gmx.de> parents: 30170 diff changeset	807 ;;
a4061ae5ff79 Use UTF-8 file API if supported by HDF5 library. Markus Mützel <markus.muetzel@gmx.de> parents: 30170 diff changeset	808 esac
a4061ae5ff79 Use UTF-8 file API if supported by HDF5 library. Markus Mützel <markus.muetzel@gmx.de> parents: 30170 diff changeset	809 ])
a4061ae5ff79 Use UTF-8 file API if supported by HDF5 library. Markus Mützel <markus.muetzel@gmx.de> parents: 30170 diff changeset	810 if test $octave_cv_hdf5_has_utf8_api = yes; then
a4061ae5ff79 Use UTF-8 file API if supported by HDF5 library. Markus Mützel <markus.muetzel@gmx.de> parents: 30170 diff changeset	811 AC_DEFINE(HAVE_HDF5_UTF8, 1, [Define to 1 if HDF5 has UTF-8 file API.])
a4061ae5ff79 Use UTF-8 file API if supported by HDF5 library. Markus Mützel <markus.muetzel@gmx.de> parents: 30170 diff changeset	812 fi
a4061ae5ff79 Use UTF-8 file API if supported by HDF5 library. Markus Mützel <markus.muetzel@gmx.de> parents: 30170 diff changeset	813 ])
a4061ae5ff79 Use UTF-8 file API if supported by HDF5 library. Markus Mützel <markus.muetzel@gmx.de> parents: 30170 diff changeset	814 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	815 dnl Usage:
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	816 dnl OCTAVE_CHECK_LIB(LIBRARY, DOC-NAME, WARN-MSG, HEADER, FUNC,
23006 06c248729e6f allow OCTAVE_CHECK_LIB to stop with an error if a library is required John W. Eaton <jwe@octave.org> parents: 22986 diff changeset	817 dnl LANG, DOC-STRING, EXTRA-CHECK, PKG-CONFIG-NAME,
06c248729e6f allow OCTAVE_CHECK_LIB to stop with an error if a library is required John W. Eaton <jwe@octave.org> parents: 22986 diff changeset	818 dnl REQUIRED)
14605 28e53daab1f8 Cleanup on autoconf warnings Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14550 diff changeset	819 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	820 AC_DEFUN([OCTAVE_CHECK_LIB], [
23017 0f22914be30e * acinclude.m4 (OCTAVE_CHECK_LIB): Downcase --with-XYZ options. John W. Eaton <jwe@octave.org> parents: 23008 diff changeset	821 AC_ARG_WITH([m4_tolower($1)-includedir],
0f22914be30e * acinclude.m4 (OCTAVE_CHECK_LIB): Downcase --with-XYZ options. John W. Eaton <jwe@octave.org> parents: 23008 diff changeset	822 [AS_HELP_STRING([--with-m4_tolower($1)-includedir=DIR],
9519 ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	823 [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	824 [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	825 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	826
23017 0f22914be30e * acinclude.m4 (OCTAVE_CHECK_LIB): Downcase --with-XYZ options. John W. Eaton <jwe@octave.org> parents: 23008 diff changeset	827 AC_ARG_WITH([m4_tolower($1)-libdir],
0f22914be30e * acinclude.m4 (OCTAVE_CHECK_LIB): Downcase --with-XYZ options. John W. Eaton <jwe@octave.org> parents: 23008 diff changeset	828 [AS_HELP_STRING([--with-m4_tolower($1)-libdir=DIR],
9519 ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	829 [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	830 [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	831 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	832
23017 0f22914be30e * acinclude.m4 (OCTAVE_CHECK_LIB): Downcase --with-XYZ options. John W. Eaton <jwe@octave.org> parents: 23008 diff changeset	833 AC_ARG_WITH([m4_tolower($1)],
23006 06c248729e6f allow OCTAVE_CHECK_LIB to stop with an error if a library is required John W. Eaton <jwe@octave.org> parents: 22986 diff changeset	834 [ifelse([$#], 10,
06c248729e6f allow OCTAVE_CHECK_LIB to stop with an error if a library is required John W. Eaton <jwe@octave.org> parents: 22986 diff changeset	835 [m4_ifblank([$7],
23017 0f22914be30e * acinclude.m4 (OCTAVE_CHECK_LIB): Downcase --with-XYZ options. John W. Eaton <jwe@octave.org> parents: 23008 diff changeset	836 [AS_HELP_STRING([--with-m4_tolower($1)=<lib>], [use $2 library <lib>])],
0f22914be30e * acinclude.m4 (OCTAVE_CHECK_LIB): Downcase --with-XYZ options. John W. Eaton <jwe@octave.org> parents: 23008 diff changeset	837 [AS_HELP_STRING([--with-m4_tolower($1)], [$7])])],
23006 06c248729e6f allow OCTAVE_CHECK_LIB to stop with an error if a library is required John W. Eaton <jwe@octave.org> parents: 22986 diff changeset	838 [m4_ifblank([$7],
23017 0f22914be30e * acinclude.m4 (OCTAVE_CHECK_LIB): Downcase --with-XYZ options. John W. Eaton <jwe@octave.org> parents: 23008 diff changeset	839 [AS_HELP_STRING([--without-m4_tolower($1)], [don't use $2 library])],
0f22914be30e * acinclude.m4 (OCTAVE_CHECK_LIB): Downcase --with-XYZ options. John W. Eaton <jwe@octave.org> parents: 23008 diff changeset	840 [AS_HELP_STRING([--without-m4_tolower($1)], [$7])])])],
9519 ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	841 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	842
22039 0a528a6dac95 build: use pkg-config in OCTAVE_CHECK_LIB without overriding user options Mike Miller <mtmiller@octave.org> parents: 22036 diff changeset	843 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	844 m4_toupper([$1])_LIBS=
21381 e5d96f39a37d configure script fixes John W. Eaton <jwe@octave.org> parents: 21374 diff changeset	845 warn_$1="$3"
9519 ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	846 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	847 no)
23006 06c248729e6f allow OCTAVE_CHECK_LIB to stop with an error if a library is required John W. Eaton <jwe@octave.org> parents: 22986 diff changeset	848 ifelse([$#], 10,
23017 0f22914be30e * acinclude.m4 (OCTAVE_CHECK_LIB): Downcase --with-XYZ options. John W. Eaton <jwe@octave.org> parents: 23008 diff changeset	849 [AC_MSG_ERROR([--without-m4_tolower($1) specified but $2 is required.])],
28299 a8f6a7083428 Don't issue configure warnings when --without-XXX used (bug #58330) Rik <rik@octave.org> parents: 27957 diff changeset	850 [warn_$1=""
23006 06c248729e6f allow OCTAVE_CHECK_LIB to stop with an error if a library is required John W. Eaton <jwe@octave.org> parents: 22986 diff changeset	851 m4_toupper([$1])_LIBS=])
9539 41a74dcd14df Clear QHULL_LIBS etc on errors. Interpret --without-qhull etc correctly. David Grundberg <individ@acc.umu.se> parents: 9531 diff changeset	852 ;;
9519 ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	853 yes \| "")
22039 0a528a6dac95 build: use pkg-config in OCTAVE_CHECK_LIB without overriding user options Mike Miller <mtmiller@octave.org> parents: 22036 diff changeset	854 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	855 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	856 ;;
ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	857 -* \| / \| .a \| .so \| .so. \| *.o)
ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	858 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	859 ;;
ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	860 *)
ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	861 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	862 ;;
ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	863 esac
ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	864
22039 0a528a6dac95 build: use pkg-config in OCTAVE_CHECK_LIB without overriding user options Mike Miller <mtmiller@octave.org> parents: 22036 diff changeset	865 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	866 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	867 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	868 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	869 fi
0a528a6dac95 build: use pkg-config in OCTAVE_CHECK_LIB without overriding user options Mike Miller <mtmiller@octave.org> parents: 22036 diff changeset	870 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	871 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	872 fi
23835 6ae0292aaa5c configure: ensure empty pkg-config results are actually empty (bug #51680) Mike Miller <mtmiller@octave.org> parents: 23414 diff changeset	873 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	874 ])
0a528a6dac95 build: use pkg-config in OCTAVE_CHECK_LIB without overriding user options Mike Miller <mtmiller@octave.org> parents: 22036 diff changeset	875 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	876
9519 ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	877 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	878 ac_octave_save_CPPFLAGS="$CPPFLAGS"
15350 6a0c0d3d60b6 build: Implement some caching for OCTAVE_CHECK_LIB macro. Rik <rik@octave.org> parents: 15338 diff changeset	879 ac_octave_save_LDFLAGS="$LDFLAGS"
6a0c0d3d60b6 build: Implement some caching for OCTAVE_CHECK_LIB macro. Rik <rik@octave.org> parents: 15338 diff changeset	880 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	881 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	882 LDFLAGS="$m4_toupper([$1])_LDFLAGS $LDFLAGS"
6a0c0d3d60b6 build: Implement some caching for OCTAVE_CHECK_LIB macro. Rik <rik@octave.org> parents: 15338 diff changeset	883 LIBS="$m4_toupper([$1])_LIBS $LIBS"
9523 0ce82753dd72 more configure changes for libraries John W. Eaton <jwe@octave.org> parents: 9520 diff changeset	884 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	885 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	886 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	887 [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	888 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	889 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	890 [octave_cv_lib_$1],
6a0c0d3d60b6 build: Implement some caching for OCTAVE_CHECK_LIB macro. Rik <rik@octave.org> parents: 15338 diff changeset	891 [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	892 [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	893 ])
6a0c0d3d60b6 build: Implement some caching for OCTAVE_CHECK_LIB macro. Rik <rik@octave.org> parents: 15338 diff changeset	894 if test "$octave_cv_lib_$1" = yes; then
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	895 m4_ifblank([$8], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	896 warn_$1=
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	897 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	898 [Define to 1 if $2 is available.])], [$8])
25299 537b732926fb fix logic error in OCTAVE_CONFIG_LIB (bug #53736) John W. Eaton <jwe@octave.org> parents: 25135 diff changeset	899 else
537b732926fb fix logic error in OCTAVE_CONFIG_LIB (bug #53736) John W. Eaton <jwe@octave.org> parents: 25135 diff changeset	900 m4_toupper([$1])_LIBS=
9519 ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	901 fi
25299 537b732926fb fix logic error in OCTAVE_CONFIG_LIB (bug #53736) John W. Eaton <jwe@octave.org> parents: 25135 diff changeset	902 else
25666 b08864ae8506 OCTAVE_CHECK_LIB: avoid shell syntax error if not checking for lib John W. Eaton <jwe@octave.org> parents: 25559 diff changeset	903 octave_cv_lib_$1=no
25299 537b732926fb fix logic error in OCTAVE_CONFIG_LIB (bug #53736) John W. Eaton <jwe@octave.org> parents: 25135 diff changeset	904 m4_toupper([$1])_LIBS=
9568 d3fccc4c4b9e use OCTAVE_CHECK_LIBRARY to check for ARPACK John W. Eaton <jwe@octave.org> parents: 9543 diff changeset	905 fi
9523 0ce82753dd72 more configure changes for libraries John W. Eaton <jwe@octave.org> parents: 9520 diff changeset	906 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	907 CPPFLAGS="$ac_octave_save_CPPFLAGS"
15350 6a0c0d3d60b6 build: Implement some caching for OCTAVE_CHECK_LIB macro. Rik <rik@octave.org> parents: 15338 diff changeset	908 LDFLAGS="$ac_octave_save_LDFLAGS"
6a0c0d3d60b6 build: Implement some caching for OCTAVE_CHECK_LIB macro. Rik <rik@octave.org> parents: 15338 diff changeset	909 LIBS="$ac_octave_save_LIBS"
21381 e5d96f39a37d configure script fixes John W. Eaton <jwe@octave.org> parents: 21374 diff changeset	910 else
e5d96f39a37d configure script fixes John W. Eaton <jwe@octave.org> parents: 21374 diff changeset	911 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	912 fi
15350 6a0c0d3d60b6 build: Implement some caching for OCTAVE_CHECK_LIB macro. Rik <rik@octave.org> parents: 15338 diff changeset	913
23006 06c248729e6f allow OCTAVE_CHECK_LIB to stop with an error if a library is required John W. Eaton <jwe@octave.org> parents: 22986 diff changeset	914 ifelse([$#], 10, [
06c248729e6f allow OCTAVE_CHECK_LIB to stop with an error if a library is required John W. Eaton <jwe@octave.org> parents: 22986 diff changeset	915 if test $octave_cv_lib_$1 = no; then
06c248729e6f allow OCTAVE_CHECK_LIB to stop with an error if a library is required John W. Eaton <jwe@octave.org> parents: 22986 diff changeset	916 AC_MSG_ERROR([to build Octave, you must have the $2 library and header files installed])
06c248729e6f allow OCTAVE_CHECK_LIB to stop with an error if a library is required John W. Eaton <jwe@octave.org> parents: 22986 diff changeset	917 fi])
9519 ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	918 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	919 if test -n "$warn_$1"; then
21381 e5d96f39a37d configure script fixes John W. Eaton <jwe@octave.org> parents: 21374 diff changeset	920 OCTAVE_CONFIGURE_WARNING([warn_$1])
9519 ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	921 fi
ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	922 ])
ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	923 dnl
15133 f91eac1bc66d m4/acinclude.m4: Correct typos, use consistent style for describing macros. Rik <rik@octave.org> parents: 15126 diff changeset	924 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	925 dnl
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	926 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	927 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	928 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	929 dnl allocated arrays in Fortran does not?
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	930 dnl
18058 46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	931 dnl FIXME: it would be nice to avoid the duplication of F77 macros
25047 1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	932 dnl and typedefs here and in the f77-fcn.h header file. Also, the
1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	933 dnl definition of the character handling macros are not right for
1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	934 dnl all systems (but should work on most modern systems in use today).
18058 46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	935 dnl
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	936 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	937 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	938 [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	939 [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	940 AC_RUN_IFELSE([AC_LANG_PROGRAM([[
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	941
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	942 #include <cfloat>
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	943
18058 46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	944 #include <stdint.h>
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	945
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	946 typedef int F77_RET_T;
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	947
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	948 #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	949 #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	950
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	951 #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	952
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	953 #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	954 #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	955
25047 1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	956 #define F77_INT $OCTAVE_F77_INT_TYPE
1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	957 #define F77_DBLE double
1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	958
18058 46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	959 extern "C"
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	960 {
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	961 F77_RET_T
25047 1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	962 F77_FUNC (dnaupd, DNAUPD) (F77_INT&,
18058 46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	963 F77_CONST_CHAR_ARG_DECL,
25047 1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	964 const F77_INT&,
18058 46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	965 F77_CONST_CHAR_ARG_DECL,
25047 1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	966 F77_INT&, const F77_DBLE&,
1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	967 F77_DBLE, const F77_INT&, F77_DBLE,
1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	968 const F77_INT&, F77_INT*,
1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	969 F77_INT, F77_DBLE, F77_DBLE*,
1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	970 const F77_INT&, F77_INT&
18058 46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	971 F77_CHAR_ARG_LEN_DECL
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	972 F77_CHAR_ARG_LEN_DECL);
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	973
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	974 F77_RET_T
25047 1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	975 F77_FUNC (dneupd, DNEUPD) (const F77_INT&,
18058 46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	976 F77_CONST_CHAR_ARG_DECL,
25047 1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	977 F77_INT, F77_DBLE, F77_DBLE*,
1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	978 F77_DBLE*, const F77_INT&, const F77_DBLE&,
1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	979 const F77_DBLE&, F77_DBLE*,
18058 46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	980 F77_CONST_CHAR_ARG_DECL,
25047 1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	981 const F77_INT&,
18058 46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	982 F77_CONST_CHAR_ARG_DECL,
25047 1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	983 F77_INT&, const F77_DBLE&, F77_DBLE*,
1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	984 const F77_INT&, F77_DBLE*,
1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	985 const F77_INT&, F77_INT*,
1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	986 F77_INT, F77_DBLE, F77_DBLE*,
1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	987 const F77_INT&, F77_INT&
18058 46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	988 F77_CHAR_ARG_LEN_DECL
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	989 F77_CHAR_ARG_LEN_DECL
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	990 F77_CHAR_ARG_LEN_DECL);
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	991
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	992 F77_RET_T
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	993 F77_FUNC (dgemv, DGEMV) (F77_CONST_CHAR_ARG_DECL,
25047 1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	994 const F77_INT&, const F77_INT&,
1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	995 const F77_DBLE&, const F77_DBLE*,
1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	996 const F77_INT&, const F77_DBLE*,
1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	997 const F77_INT&, const F77_DBLE&,
1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	998 F77_DBLE*, const F77_INT&
18058 46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	999 F77_CHAR_ARG_LEN_DECL);
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	1000 }
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	1001
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1002 void
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1003 doit (void)
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1004 {
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1005 // 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	1006
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1007 // Problem matrix. See bug #31479.
25047 1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	1008 F77_INT n = 4;
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1009 double m = new double [n n];
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1010 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	1011 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	1012 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	1013 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	1014
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1015 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	1016
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1017 resid[0] = 0.960966;
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1018 resid[1] = 0.741195;
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1019 resid[2] = 0.150143;
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1020 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	1021
25047 1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	1022 F77_INT *ip = new F77_INT [11];
14144 834df9f10963 remove ARPACK files from sources and restore configure checks for external ARPACK library John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	1023
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1024 ip[0] = 1; // ishift
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1025 ip[1] = 0; // ip[1] not referenced
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1026 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	1027 ip[3] = 1; // NB blocksize in recurrence
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1028 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	1029 ip[5] = 0; // ip[5] not referenced
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1030 ip[6] = 1; // mode
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1031 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	1032 ip[8] = 0;
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1033 ip[9] = 0;
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1034 ip[10] = 0;
17034 8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	1035
25047 1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	1036 F77_INT *ipntr = new F77_INT [14];
14144 834df9f10963 remove ARPACK files from sources and restore configure checks for external ARPACK library John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	1037
25047 1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	1038 F77_INT k = 1;
1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	1039 F77_INT p = 3;
1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	1040 F77_INT lwork = 3 * p * (p + 2);
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1041
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1042 double v = new double [n (p + 1)];
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1043 double *workl = new double [lwork + 1];
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1044 double workd = new double [3 n + 1];
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1045
25047 1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	1046 F77_INT ido = 0;
1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	1047 F77_INT info = 0;
14144 834df9f10963 remove ARPACK files from sources and restore configure checks for external ARPACK library John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	1048
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1049 double tol = DBL_EPSILON;
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1050
17034 8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	1051 do
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1052 {
18058 46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	1053 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	1054 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	1055 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	1056 workd, workl, lwork, info
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	1057 F77_CHAR_ARG_LEN (1)
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	1058 F77_CHAR_ARG_LEN (2));
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1059
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1060 if (ido == -1 \|\| ido == 1 \|\| ido == 2)
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1061 {
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1062 double *x = workd + ipntr[0] - 1;
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1063 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	1064
18058 46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	1065 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	1066 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	1067 F77_CHAR_ARG_LEN (1));
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1068 }
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1069 else
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1070 {
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1071 if (info < 0)
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1072 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	1073
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1074 break;
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1075 }
17034 8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	1076 }
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1077 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	1078
25047 1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	1079 F77_INT *sel = new F77_INT [p];
14144 834df9f10963 remove ARPACK files from sources and restore configure checks for external ARPACK library John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	1080
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1081 // 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	1082 double *dr = new double [k + 1];
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1083 double *di = new double [k + 1];
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1084 double workev = new double [3 p];
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1085
25047 1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	1086 for (F77_INT i = 0; i < k + 1; i++)
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1087 dr[i] = di[i] = 0.0;
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1088
25047 1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	1089 F77_INT rvec = 1;
14144 834df9f10963 remove ARPACK files from sources and restore configure checks for external ARPACK library John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	1090
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1091 double sigmar = 0.0;
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1092 double sigmai = 0.0;
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1093
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1094 // 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	1095 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	1096
18058 46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	1097 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	1098 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	1099 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	1100 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	1101 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	1102 workl, lwork, info
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	1103 F77_CHAR_ARG_LEN (1)
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	1104 F77_CHAR_ARG_LEN (1)
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	1105 F77_CHAR_ARG_LEN (2));
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1106 }
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1107
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1108 ]], [[
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1109
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1110 for (int i = 0; i < 10; i++)
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1111 doit ();
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1112
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1113 ]])],
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1114 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	1115 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	1116 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	1117 AC_LANG_POP(C++)
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1118 ])
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1119 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	1120 $1
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1121 :
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1122 else
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1123 $2
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1124 :
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1125 fi
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1126 ])
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1127 dnl
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1128 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	1129 dnl
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1130 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	1131 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	1132 dnl See bug #52425.
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1133 dnl
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1134 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	1135 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	1136 [octave_cv_lib_arpack_ok_2],
24336 0771ce2d30ef build: Fix compiling OCTAVE_ARPACK_OK_2 Fortran code (bug #52425). Rik <rik@octave.org> parents: 24289 diff changeset	1137 [save_FFLAGS="$FFLAGS"
0771ce2d30ef build: Fix compiling OCTAVE_ARPACK_OK_2 Fortran code (bug #52425). Rik <rik@octave.org> parents: 24289 diff changeset	1138 FFLAGS="$FFLAGS $F77_INTEGER_8_FLAG"
0771ce2d30ef build: Fix compiling OCTAVE_ARPACK_OK_2 Fortran code (bug #52425). Rik <rik@octave.org> parents: 24289 diff changeset	1139 AC_LANG_PUSH(Fortran 77)
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1140 AC_RUN_IFELSE([[
24446 4ca5c9f899d3 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 24337 diff changeset	1141 program bug_52425
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1142 c
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1143 integer maxn, maxnev, maxncv, ldv
24446 4ca5c9f899d3 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 24337 diff changeset	1144 parameter (maxn=256, maxnev=10, maxncv=25,
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1145 $ ldv=maxn )
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1146 c
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1147 Double precision
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1148 & 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	1149 & 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	1150 & ax(maxn)
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1151 logical select(maxncv)
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1152 integer iparam(11), ipntr(11)
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1153 c
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1154 character bmat1, which2
24446 4ca5c9f899d3 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 24337 diff changeset	1155 integer ido, n, nev, ncv, lworkl, info, ierr, j,
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1156 & nx, nconv, maxitr, mode, ishfts
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1157 logical rvec
24446 4ca5c9f899d3 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 24337 diff changeset	1158 Double precision
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1159 & tol, sigma
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1160 c
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1161 Double precision
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1162 & zero
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1163 parameter (zero = 0.0D+0)
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1164 c
24446 4ca5c9f899d3 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 24337 diff changeset	1165 Double precision
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1166 & dnrm2
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1167 external dnrm2, daxpy
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1168 c
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1169 intrinsic abs
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1170 c
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1171 n = 20
24446 4ca5c9f899d3 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 24337 diff changeset	1172 nev = 4
4ca5c9f899d3 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 24337 diff changeset	1173 ncv = 20
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1174 bmat = 'I'
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1175 which = 'BE'
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1176 c
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1177 lworkl = ncv*(ncv+8)
24446 4ca5c9f899d3 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 24337 diff changeset	1178 tol = zero
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1179 info = 1
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1180 do j = 1,n
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1181 resid (j) = 1.0d0
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1182 end do
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1183 ido = 0
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1184 c
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1185 ishfts = 1
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1186 maxitr = 300
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1187 mode = 1
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1188 c
24446 4ca5c9f899d3 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 24337 diff changeset	1189 iparam(1) = ishfts
4ca5c9f899d3 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 24337 diff changeset	1190 iparam(3) = maxitr
4ca5c9f899d3 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 24337 diff changeset	1191 iparam(7) = mode
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1192 c
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1193 10 continue
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1194 c
24446 4ca5c9f899d3 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 24337 diff changeset	1195 call dsaupd ( ido, bmat, n, which, nev, tol, resid,
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1196 & 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	1197 & lworkl, info )
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1198 c
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1199 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	1200 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	1201 go to 10
24446 4ca5c9f899d3 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 24337 diff changeset	1202 end if
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1203 c
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1204 if ( info .lt. 0 ) then
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1205 stop 1
24446 4ca5c9f899d3 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 24337 diff changeset	1206 else
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1207 rvec = .false.
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1208 c
24446 4ca5c9f899d3 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 24337 diff changeset	1209 call dseupd ( rvec, 'All', select, d, v, ldv, sigma,
4ca5c9f899d3 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 24337 diff changeset	1210 & bmat, n, which, nev, tol, resid, ncv, v, ldv,
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1211 & 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	1212 c
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1213 if ( ierr .ne. 0) then
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1214 stop 1
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1215 else
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1216 nconv = iparam(5)
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1217 do 20 j=1, nconv
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1218 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	1219 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	1220 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	1221 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	1222 c
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1223 20 continue
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1224 c
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1225 c \| Litmus test: return 1 or 0 based on returned eigenvalue
24446 4ca5c9f899d3 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 24337 diff changeset	1226 c
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1227 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	1228 stop 1
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1229 else
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1230 stop 0
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1231 end if
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1232 end if
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1233 end if
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1234 c
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1235 end
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1236 c
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1237 subroutine av (n, v, w)
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1238 integer n, j
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1239 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	1240 c
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1241 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	1242 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	1243 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	1244 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	1245 10 continue
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1246 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	1247 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	1248 return
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1249 end
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1250 ]],
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1251 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	1252 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	1253 octave_cv_lib_arpack_ok_2=yes)
24336 0771ce2d30ef build: Fix compiling OCTAVE_ARPACK_OK_2 Fortran code (bug #52425). Rik <rik@octave.org> parents: 24289 diff changeset	1254 ## Restore FFLAGS.
0771ce2d30ef build: Fix compiling OCTAVE_ARPACK_OK_2 Fortran code (bug #52425). Rik <rik@octave.org> parents: 24289 diff changeset	1255 FFLAGS="$save_FFLAGS"
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1256 AC_LANG_POP(Fortran 77)
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1257 ])
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1258 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	1259 $1
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	1260 :
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	1261 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	1262 $2
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	1263 :
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	1264 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	1265 ])
834df9f10963 remove ARPACK files from sources and restore configure checks for external ARPACK library John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	1266 dnl
17241 03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1267 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	1268 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	1269 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	1270 dnl
03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1271 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	1272 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	1273 [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	1274 [AC_LANG_PUSH(C++)
03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1275 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	1276 extern "C"
03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1277 {
03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1278 #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	1279 #include <glpk/glpk.h>
03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1280 #else
03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1281 #include <glpk.h>
03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1282 #endif
03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1283 }
03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1284 ]], [[
03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1285 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	1286 glp_iptcp iptcp;
03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1287 glp_init_iptcp (&iptcp);
03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1288 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	1289 ]])],
03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1290 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	1291 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	1292 AC_LANG_POP(C++)
03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1293 ])
03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1294 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	1295 $1
03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1296 :
03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1297 else
03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1298 $2
03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1299 :
03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1300 fi
03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1301 ])
03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1302 dnl
32049 1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1303 dnl Check whether iconv provides the function iconvlist.
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1304 dnl
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1305 AC_DEFUN([OCTAVE_CHECK_ICONVLIST], [
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1306 AC_CACHE_CHECK([whether the function iconvlist is available],
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1307 [octave_cv_iconvlist],
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1308 [ac_octave_save_LIBS="$LIBS"
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1309 LIBS="$LIBICONV $LIBS"
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1310 AC_LANG_PUSH(C++)
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1311 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1312 #if HAVE_ICONV
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1313 extern "C"
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1314 {
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1315 # include <iconv.h>
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1316 }
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1317 #endif
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1318 ]], [[
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1319 iconvlist (
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1320 [] (unsigned int, const char * const , void ) -> int
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1321 {
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1322 return 0;
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1323 },
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1324 nullptr);
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1325 ]])],
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1326 octave_cv_iconvlist=yes,
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1327 octave_cv_iconvlist=no)
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1328 AC_LANG_POP(C++)
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1329 LIBS="$ac_octave_save_LIBS"
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1330 ])
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1331 if test $octave_cv_iconvlist = yes; then
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1332 AC_DEFINE(HAVE_ICONVLIST, 1, [Define to 1 if iconvlist is available.])
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1333 fi
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1334 ])
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1335 dnl
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1336 dnl Check whether iconv provides the function iconv_canonicalize.
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1337 dnl
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1338 AC_DEFUN([OCTAVE_CHECK_ICONV_CANONICALIZE], [
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1339 AC_CACHE_CHECK([whether the function iconv_canonicalize is available],
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1340 [octave_cv_iconv_canonicalize],
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1341 [ac_octave_save_LIBS="$LIBS"
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1342 LIBS="$LIBICONV $LIBS"
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1343 AC_LANG_PUSH(C++)
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1344 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1345 #if HAVE_ICONV
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1346 extern "C"
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1347 {
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1348 # include <iconv.h>
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1349 }
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1350 #endif
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1351 ]], [[
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1352 iconv_canonicalize ("UTF-8");
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1353 ]])],
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1354 octave_cv_iconv_canonicalize=yes,
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1355 octave_cv_iconv_canonicalize=no)
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1356 AC_LANG_POP(C++)
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1357 LIBS="$ac_octave_save_LIBS"
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1358 ])
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1359 if test $octave_cv_iconv_canonicalize = yes; then
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1360 AC_DEFINE(HAVE_ICONV_CANONICALIZE, 1,
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1361 [Define to 1 if iconv_canonicalize is available.])
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1362 fi
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1363 ])
1c99c8f020f7 gui: Show encodings available with iconv in file editor preferences. Markus Mützel <markus.muetzel@gmx.de> parents: 32008 diff changeset	1364 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1365 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	1366 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	1367 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	1368 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1369 AC_DEFUN([OCTAVE_CHECK_LIB_HDF5_DLL], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1370 AC_CACHE_CHECK([if _HDF5USEDLL_ needs to be defined],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1371 [octave_cv_lib_hdf5_dll],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1372 [AC_LINK_IFELSE([AC_LANG_PROGRAM([[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1373 #include <hdf5.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1374 ]], [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1375 hid_t x = H5T_NATIVE_DOUBLE;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1376 return x
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1377 ]])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1378 [octave_cv_lib_hdf5_dll=no],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1379 [save_CFLAGS="$CFLAGS"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1380 CFLAGS="$CFLAGS -DWIN32 -D_HDF5USEDLL_"
31134 b8d37c022e40 acinclude.m4: use same name for temporary LIBS variable throughout all macros. Rik <rik@octave.org> parents: 31133 diff changeset	1381 ac_octave_save_LIBS="$LIBS"
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1382 LIBS="$HDF5_LIBS $LIBS"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1383 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1384 #include <hdf5.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1385 ]], [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1386 hid_t x = H5T_NATIVE_DOUBLE;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1387 return x
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 octave_cv_lib_hdf5_dll=yes,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1390 octave_cv_lib_hdf5_dll=no)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1391 CFLAGS="$save_CFLAGS"
31134 b8d37c022e40 acinclude.m4: use same name for temporary LIBS variable throughout all macros. Rik <rik@octave.org> parents: 31133 diff changeset	1392 LIBS="$ac_octave_save_LIBS"
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1393 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1394 ])
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	1395 if test $octave_cv_lib_hdf5_dll = yes; then
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1396 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	1397 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1398 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1399 dnl
15133 f91eac1bc66d m4/acinclude.m4: Correct typos, use consistent style for describing macros. Rik <rik@octave.org> parents: 15126 diff changeset	1400 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	1401 dnl
15063 36cbcc37fdb8 Refactor configure.ac to make it more understandable. Rik <rik@octave.org> parents: 15013 diff changeset	1402 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	1403 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	1404 dnl
15063 36cbcc37fdb8 Refactor configure.ac to make it more understandable. Rik <rik@octave.org> parents: 15013 diff changeset	1405 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	1406 dnl libraries and header files?
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: 7361 diff changeset	1407 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1408 AC_DEFUN([OCTAVE_CHECK_LIB_OPENGL], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1409 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	1410
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1411 ## On MacOSX systems the OpenGL framework can be used
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1412 OCTAVE_HAVE_FRAMEWORK(OpenGL, [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1413 #include <OpenGL/gl.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1414 #include <OpenGL/glu.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1415 ]], [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1416 GLint par; glGetIntegerv (GL_VIEWPORT, &par);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1417 ]],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1418 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	1419
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	1420 if test $have_framework_opengl = yes; then
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1421 AC_DEFINE(HAVE_FRAMEWORK_OPENGL, 1,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1422 [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	1423 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	1424 AC_MSG_NOTICE([adding -framework OpenGL to OPENGL_LIBS])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1425 OCTAVE_CHECK_FUNC_GLUTESSCALLBACK_THREEDOTS
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1426 else
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1427 case $canonical_host_type in
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1428 --mingw32* \| --msdosmsvc)
15319 daf74ce2afdc m4/acinclude.m4: Use more consistent m4 quoting of arguments to macros. Rik <rik@octave.org> parents: 15302 diff changeset	1429 AC_CHECK_HEADERS([windows.h])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1430 ;;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1431 esac
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1432 have_opengl_incs=no
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1433 AC_CHECK_HEADERS([GL/gl.h OpenGL/gl.h],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1434 [AC_CHECK_HEADERS([GL/glu.h OpenGL/glu.h],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1435 [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	1436 #if defined (HAVE_WINDOWS_H)
7954 3ffc34caec65 configure fixes John W. Eaton <jwe@octave.org> parents: 7945 diff changeset	1437 #include <windows.h>
3ffc34caec65 configure fixes John W. Eaton <jwe@octave.org> parents: 7945 diff changeset	1438 #endif
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1439 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1440 break
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1441 ], [], [
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21604 diff changeset	1442 #if defined (HAVE_WINDOWS_H)
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1443 # include <windows.h>
7954 3ffc34caec65 configure fixes John W. Eaton <jwe@octave.org> parents: 7945 diff changeset	1444 #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	1445 ])
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	1446
17197 fbee0d312af5 acinclude.m4: Remove some unnecessary double quotes around variables. Rik <rik@octave.org> parents: 17196 diff changeset	1447 if test $have_opengl_incs = yes; then
18866 95b69b880b19 Allow conpile of gl-render.cc under mingw. John Donoghue parents: 18854 diff changeset	1448 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	1449 #if defined (HAVE_WINDOWS_H)
18866 95b69b880b19 Allow conpile of gl-render.cc under mingw. John Donoghue parents: 18854 diff changeset	1450 # include <windows.h>
95b69b880b19 Allow conpile of gl-render.cc under mingw. John Donoghue parents: 18854 diff changeset	1451 #endif
95b69b880b19 Allow conpile of gl-render.cc under mingw. John Donoghue parents: 18854 diff changeset	1452 #if defined (HAVE_GL_GL_H)
95b69b880b19 Allow conpile of gl-render.cc under mingw. John Donoghue parents: 18854 diff changeset	1453 # include <GL/gl.h>
95b69b880b19 Allow conpile of gl-render.cc under mingw. John Donoghue parents: 18854 diff changeset	1454 #elif defined (HAVE_OPENGL_GL_H)
95b69b880b19 Allow conpile of gl-render.cc under mingw. John Donoghue parents: 18854 diff changeset	1455 # include <OpenGL/gl.h>
95b69b880b19 Allow conpile of gl-render.cc under mingw. John Donoghue parents: 18854 diff changeset	1456 #endif
95b69b880b19 Allow conpile of gl-render.cc under mingw. John Donoghue parents: 18854 diff changeset	1457 ])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1458 case $canonical_host_type in
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1459 --mingw32* \| --msdosmsvc)
31134 b8d37c022e40 acinclude.m4: use same name for temporary LIBS variable throughout all macros. Rik <rik@octave.org> parents: 31133 diff changeset	1460 ac_octave_save_LIBS="$LIBS"
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1461 LIBS="$LIBS -lopengl32"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1462 AC_MSG_CHECKING([for glEnable in -lopengl32])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1463 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1464 #if HAVE_WINDOWS_H
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1465 # include <windows.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1466 #endif
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1467 #if defined (HAVE_GL_GL_H)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1468 # include <GL/gl.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1469 #elif defined (HAVE_OPENGL_GL_H)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1470 # include <OpenGL/gl.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1471 #endif
17034 8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	1472 ]], [[
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1473 glEnable(GL_SMOOTH);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1474 ]])], [OPENGL_LIBS="-lopengl32 -lglu32"])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1475
31134 b8d37c022e40 acinclude.m4: use same name for temporary LIBS variable throughout all macros. Rik <rik@octave.org> parents: 31133 diff changeset	1476 LIBS="$ac_octave_save_LIBS"
21374 1487a68a496a untangle configuration of OpenGL, FLTK, and Qt (bug #47263) John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	1477 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	1478 AC_MSG_RESULT([yes])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1479 else
15319 daf74ce2afdc m4/acinclude.m4: Use more consistent m4 quoting of arguments to macros. Rik <rik@octave.org> parents: 15302 diff changeset	1480 AC_MSG_RESULT([no])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1481 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1482 ;;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1483 *)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1484 ## 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	1485 AC_CHECK_LIB([GL], [glEnable], [OPENGL_LIBS="-lGL -lGLU"])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1486 ;;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1487 esac
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1488 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	1489 fi
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1490 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	1491 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	1492 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	1493 fi
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: 7361 diff changeset	1494 ])
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: 7825 diff changeset	1495 dnl
27543 d7b18d44ae4e Check if PCRE was compiled with --enable-utf (bug #35910). Markus Mützel <markus.muetzel@gmx.de> parents: 27450 diff changeset	1496 dnl Check whether PCRE is compiled with --enable-utf.
d7b18d44ae4e Check if PCRE was compiled with --enable-utf (bug #35910). Markus Mützel <markus.muetzel@gmx.de> parents: 27450 diff changeset	1497 dnl
d7b18d44ae4e Check if PCRE was compiled with --enable-utf (bug #35910). Markus Mützel <markus.muetzel@gmx.de> parents: 27450 diff changeset	1498 AC_DEFUN([OCTAVE_CHECK_LIB_PCRE_OK], [
d7b18d44ae4e Check if PCRE was compiled with --enable-utf (bug #35910). Markus Mützel <markus.muetzel@gmx.de> parents: 27450 diff changeset	1499 AC_CACHE_CHECK([whether PCRE library was compiled with UTF support],
d7b18d44ae4e Check if PCRE was compiled with --enable-utf (bug #35910). Markus Mützel <markus.muetzel@gmx.de> parents: 27450 diff changeset	1500 [octave_cv_lib_pcre_ok],
d7b18d44ae4e Check if PCRE was compiled with --enable-utf (bug #35910). Markus Mützel <markus.muetzel@gmx.de> parents: 27450 diff changeset	1501 [AC_LANG_PUSH(C++)
d7b18d44ae4e Check if PCRE was compiled with --enable-utf (bug #35910). Markus Mützel <markus.muetzel@gmx.de> parents: 27450 diff changeset	1502 AC_RUN_IFELSE([AC_LANG_PROGRAM([[
d7b18d44ae4e Check if PCRE was compiled with --enable-utf (bug #35910). Markus Mützel <markus.muetzel@gmx.de> parents: 27450 diff changeset	1503 #include <stdio.h>
d7b18d44ae4e Check if PCRE was compiled with --enable-utf (bug #35910). Markus Mützel <markus.muetzel@gmx.de> parents: 27450 diff changeset	1504 #if defined (HAVE_PCRE_H)
d7b18d44ae4e Check if PCRE was compiled with --enable-utf (bug #35910). Markus Mützel <markus.muetzel@gmx.de> parents: 27450 diff changeset	1505 # include <pcre.h>
d7b18d44ae4e Check if PCRE was compiled with --enable-utf (bug #35910). Markus Mützel <markus.muetzel@gmx.de> parents: 27450 diff changeset	1506 #elif defined (HAVE_PCRE_PCRE_H)
d7b18d44ae4e Check if PCRE was compiled with --enable-utf (bug #35910). Markus Mützel <markus.muetzel@gmx.de> parents: 27450 diff changeset	1507 # include <pcre/pcre.h>
d7b18d44ae4e Check if PCRE was compiled with --enable-utf (bug #35910). Markus Mützel <markus.muetzel@gmx.de> parents: 27450 diff changeset	1508 #endif
d7b18d44ae4e Check if PCRE was compiled with --enable-utf (bug #35910). Markus Mützel <markus.muetzel@gmx.de> parents: 27450 diff changeset	1509 ]], [[
d7b18d44ae4e Check if PCRE was compiled with --enable-utf (bug #35910). Markus Mützel <markus.muetzel@gmx.de> parents: 27450 diff changeset	1510 const char *pattern = "test";
d7b18d44ae4e Check if PCRE was compiled with --enable-utf (bug #35910). Markus Mützel <markus.muetzel@gmx.de> parents: 27450 diff changeset	1511 const char *err;
d7b18d44ae4e Check if PCRE was compiled with --enable-utf (bug #35910). Markus Mützel <markus.muetzel@gmx.de> parents: 27450 diff changeset	1512 int erroffset;
d7b18d44ae4e Check if PCRE was compiled with --enable-utf (bug #35910). Markus Mützel <markus.muetzel@gmx.de> parents: 27450 diff changeset	1513 pcre *data = pcre_compile (pattern, PCRE_UTF8, &err, &erroffset, nullptr);
d7b18d44ae4e Check if PCRE was compiled with --enable-utf (bug #35910). Markus Mützel <markus.muetzel@gmx.de> parents: 27450 diff changeset	1514 return (! data);
d7b18d44ae4e Check if PCRE was compiled with --enable-utf (bug #35910). Markus Mützel <markus.muetzel@gmx.de> parents: 27450 diff changeset	1515 ]])],
d7b18d44ae4e Check if PCRE was compiled with --enable-utf (bug #35910). Markus Mützel <markus.muetzel@gmx.de> parents: 27450 diff changeset	1516 octave_cv_lib_pcre_ok=yes,
d7b18d44ae4e Check if PCRE was compiled with --enable-utf (bug #35910). Markus Mützel <markus.muetzel@gmx.de> parents: 27450 diff changeset	1517 octave_cv_lib_pcre_ok=no,
d7b18d44ae4e Check if PCRE was compiled with --enable-utf (bug #35910). Markus Mützel <markus.muetzel@gmx.de> parents: 27450 diff changeset	1518 octave_cv_lib_pcre_ok=yes)
d7b18d44ae4e Check if PCRE was compiled with --enable-utf (bug #35910). Markus Mützel <markus.muetzel@gmx.de> parents: 27450 diff changeset	1519 AC_LANG_POP(C++)
d7b18d44ae4e Check if PCRE was compiled with --enable-utf (bug #35910). Markus Mützel <markus.muetzel@gmx.de> parents: 27450 diff changeset	1520 ])
d7b18d44ae4e Check if PCRE was compiled with --enable-utf (bug #35910). Markus Mützel <markus.muetzel@gmx.de> parents: 27450 diff changeset	1521 if test $octave_cv_lib_pcre_ok = yes; then
d7b18d44ae4e Check if PCRE was compiled with --enable-utf (bug #35910). Markus Mützel <markus.muetzel@gmx.de> parents: 27450 diff changeset	1522 $1
d7b18d44ae4e Check if PCRE was compiled with --enable-utf (bug #35910). Markus Mützel <markus.muetzel@gmx.de> parents: 27450 diff changeset	1523 :
d7b18d44ae4e Check if PCRE was compiled with --enable-utf (bug #35910). Markus Mützel <markus.muetzel@gmx.de> parents: 27450 diff changeset	1524 else
d7b18d44ae4e Check if PCRE was compiled with --enable-utf (bug #35910). Markus Mützel <markus.muetzel@gmx.de> parents: 27450 diff changeset	1525 $2
d7b18d44ae4e Check if PCRE was compiled with --enable-utf (bug #35910). Markus Mützel <markus.muetzel@gmx.de> parents: 27450 diff changeset	1526 :
d7b18d44ae4e Check if PCRE was compiled with --enable-utf (bug #35910). Markus Mützel <markus.muetzel@gmx.de> parents: 27450 diff changeset	1527 fi
d7b18d44ae4e Check if PCRE was compiled with --enable-utf (bug #35910). Markus Mützel <markus.muetzel@gmx.de> parents: 27450 diff changeset	1528 ])
d7b18d44ae4e Check if PCRE was compiled with --enable-utf (bug #35910). Markus Mützel <markus.muetzel@gmx.de> parents: 27450 diff changeset	1529 dnl
31424 d1165473e4b0 allow Octave to use PCRE2 (bug #61542) Rafael Laboissiere <rafael@laboissiere.net> parents: 31415 diff changeset	1530 dnl Check whether PCRE2 is compiled with --enable-utf.
d1165473e4b0 allow Octave to use PCRE2 (bug #61542) Rafael Laboissiere <rafael@laboissiere.net> parents: 31415 diff changeset	1531 dnl
d1165473e4b0 allow Octave to use PCRE2 (bug #61542) Rafael Laboissiere <rafael@laboissiere.net> parents: 31415 diff changeset	1532 AC_DEFUN([OCTAVE_CHECK_LIB_PCRE2_OK], [
d1165473e4b0 allow Octave to use PCRE2 (bug #61542) Rafael Laboissiere <rafael@laboissiere.net> parents: 31415 diff changeset	1533 AC_CACHE_CHECK([whether PCRE2 library was compiled with UTF support],
d1165473e4b0 allow Octave to use PCRE2 (bug #61542) Rafael Laboissiere <rafael@laboissiere.net> parents: 31415 diff changeset	1534 [octave_cv_lib_pcre2_ok],
d1165473e4b0 allow Octave to use PCRE2 (bug #61542) Rafael Laboissiere <rafael@laboissiere.net> parents: 31415 diff changeset	1535 [AC_LANG_PUSH(C++)
d1165473e4b0 allow Octave to use PCRE2 (bug #61542) Rafael Laboissiere <rafael@laboissiere.net> parents: 31415 diff changeset	1536 AC_RUN_IFELSE([AC_LANG_PROGRAM([[
d1165473e4b0 allow Octave to use PCRE2 (bug #61542) Rafael Laboissiere <rafael@laboissiere.net> parents: 31415 diff changeset	1537 #include <stdio.h>
31933 c250c30c86a2 acinclude.m4: Correct typo in #define PCRE2_CODE_UNIT_WIDTH. Rik <rik@octave.org> parents: 31706 diff changeset	1538 #define PCRE2_CODE_UNIT_WIDTH 8
31424 d1165473e4b0 allow Octave to use PCRE2 (bug #61542) Rafael Laboissiere <rafael@laboissiere.net> parents: 31415 diff changeset	1539 #if defined (HAVE_PCRE2_H)
d1165473e4b0 allow Octave to use PCRE2 (bug #61542) Rafael Laboissiere <rafael@laboissiere.net> parents: 31415 diff changeset	1540 # include <pcre2.h>
d1165473e4b0 allow Octave to use PCRE2 (bug #61542) Rafael Laboissiere <rafael@laboissiere.net> parents: 31415 diff changeset	1541 #elif defined (HAVE_PCRE2_PCRE2_H)
d1165473e4b0 allow Octave to use PCRE2 (bug #61542) Rafael Laboissiere <rafael@laboissiere.net> parents: 31415 diff changeset	1542 # include <pcre2/pcre2.h>
d1165473e4b0 allow Octave to use PCRE2 (bug #61542) Rafael Laboissiere <rafael@laboissiere.net> parents: 31415 diff changeset	1543 #endif
d1165473e4b0 allow Octave to use PCRE2 (bug #61542) Rafael Laboissiere <rafael@laboissiere.net> parents: 31415 diff changeset	1544 ]], [[
d1165473e4b0 allow Octave to use PCRE2 (bug #61542) Rafael Laboissiere <rafael@laboissiere.net> parents: 31415 diff changeset	1545 const char *pattern = "test";
d1165473e4b0 allow Octave to use PCRE2 (bug #61542) Rafael Laboissiere <rafael@laboissiere.net> parents: 31415 diff changeset	1546 int err;
d1165473e4b0 allow Octave to use PCRE2 (bug #61542) Rafael Laboissiere <rafael@laboissiere.net> parents: 31415 diff changeset	1547 PCRE2_SIZE erroffset;
d1165473e4b0 allow Octave to use PCRE2 (bug #61542) Rafael Laboissiere <rafael@laboissiere.net> parents: 31415 diff changeset	1548 pcre2_code *data = pcre2_compile ((PCRE2_SPTR) pattern, PCRE2_ZERO_TERMINATED, PCRE2_UTF, &err, &erroffset, nullptr);
d1165473e4b0 allow Octave to use PCRE2 (bug #61542) Rafael Laboissiere <rafael@laboissiere.net> parents: 31415 diff changeset	1549 return (! data);
d1165473e4b0 allow Octave to use PCRE2 (bug #61542) Rafael Laboissiere <rafael@laboissiere.net> parents: 31415 diff changeset	1550 ]])],
d1165473e4b0 allow Octave to use PCRE2 (bug #61542) Rafael Laboissiere <rafael@laboissiere.net> parents: 31415 diff changeset	1551 octave_cv_lib_pcre2_ok=yes,
d1165473e4b0 allow Octave to use PCRE2 (bug #61542) Rafael Laboissiere <rafael@laboissiere.net> parents: 31415 diff changeset	1552 octave_cv_lib_pcre2_ok=no,
d1165473e4b0 allow Octave to use PCRE2 (bug #61542) Rafael Laboissiere <rafael@laboissiere.net> parents: 31415 diff changeset	1553 octave_cv_lib_pcre2_ok=yes)
d1165473e4b0 allow Octave to use PCRE2 (bug #61542) Rafael Laboissiere <rafael@laboissiere.net> parents: 31415 diff changeset	1554 AC_LANG_POP(C++)
d1165473e4b0 allow Octave to use PCRE2 (bug #61542) Rafael Laboissiere <rafael@laboissiere.net> parents: 31415 diff changeset	1555 ])
d1165473e4b0 allow Octave to use PCRE2 (bug #61542) Rafael Laboissiere <rafael@laboissiere.net> parents: 31415 diff changeset	1556 if test $octave_cv_lib_pcre2_ok = yes; then
d1165473e4b0 allow Octave to use PCRE2 (bug #61542) Rafael Laboissiere <rafael@laboissiere.net> parents: 31415 diff changeset	1557 $1
d1165473e4b0 allow Octave to use PCRE2 (bug #61542) Rafael Laboissiere <rafael@laboissiere.net> parents: 31415 diff changeset	1558 :
d1165473e4b0 allow Octave to use PCRE2 (bug #61542) Rafael Laboissiere <rafael@laboissiere.net> parents: 31415 diff changeset	1559 else
d1165473e4b0 allow Octave to use PCRE2 (bug #61542) Rafael Laboissiere <rafael@laboissiere.net> parents: 31415 diff changeset	1560 $2
d1165473e4b0 allow Octave to use PCRE2 (bug #61542) Rafael Laboissiere <rafael@laboissiere.net> parents: 31415 diff changeset	1561 :
d1165473e4b0 allow Octave to use PCRE2 (bug #61542) Rafael Laboissiere <rafael@laboissiere.net> parents: 31415 diff changeset	1562 fi
d1165473e4b0 allow Octave to use PCRE2 (bug #61542) Rafael Laboissiere <rafael@laboissiere.net> parents: 31415 diff changeset	1563 ])
d1165473e4b0 allow Octave to use PCRE2 (bug #61542) Rafael Laboissiere <rafael@laboissiere.net> parents: 31415 diff changeset	1564 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1565 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	1566 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1567 AC_DEFUN([OCTAVE_CHECK_LIB_QHULL_OK], [
29629 93c8df989ea0 qhull: Use reentrant libqhull_r (bug #60016). Stefan Brüns <stefan.bruens@rwth-aachen.de> parents: 29588 diff changeset	1568 AC_CACHE_CHECK([whether the qhull_r library works],
93c8df989ea0 qhull: Use reentrant libqhull_r (bug #60016). Stefan Brüns <stefan.bruens@rwth-aachen.de> parents: 29588 diff changeset	1569 [octave_cv_lib_qhull_r_ok],
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1570 [AC_RUN_IFELSE([AC_LANG_PROGRAM([[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1571 #include <stdio.h>
29629 93c8df989ea0 qhull: Use reentrant libqhull_r (bug #60016). Stefan Brüns <stefan.bruens@rwth-aachen.de> parents: 29588 diff changeset	1572 #if defined (HAVE_LIBQHULL_R_LIBQHULL_R_H)
93c8df989ea0 qhull: Use reentrant libqhull_r (bug #60016). Stefan Brüns <stefan.bruens@rwth-aachen.de> parents: 29588 diff changeset	1573 # include <libqhull_r/libqhull_r.h>
93c8df989ea0 qhull: Use reentrant libqhull_r (bug #60016). Stefan Brüns <stefan.bruens@rwth-aachen.de> parents: 29588 diff changeset	1574 # include <libqhull_r/qset_r.h>
93c8df989ea0 qhull: Use reentrant libqhull_r (bug #60016). Stefan Brüns <stefan.bruens@rwth-aachen.de> parents: 29588 diff changeset	1575 # include <libqhull_r/geom_r.h>
93c8df989ea0 qhull: Use reentrant libqhull_r (bug #60016). Stefan Brüns <stefan.bruens@rwth-aachen.de> parents: 29588 diff changeset	1576 # include <libqhull_r/poly_r.h>
93c8df989ea0 qhull: Use reentrant libqhull_r (bug #60016). Stefan Brüns <stefan.bruens@rwth-aachen.de> parents: 29588 diff changeset	1577 # include <libqhull_r/io_r.h>
93c8df989ea0 qhull: Use reentrant libqhull_r (bug #60016). Stefan Brüns <stefan.bruens@rwth-aachen.de> parents: 29588 diff changeset	1578 #elif defined (HAVE_LIBQHULL_R_H)
93c8df989ea0 qhull: Use reentrant libqhull_r (bug #60016). Stefan Brüns <stefan.bruens@rwth-aachen.de> parents: 29588 diff changeset	1579 # include <libqhull_r.h>
93c8df989ea0 qhull: Use reentrant libqhull_r (bug #60016). Stefan Brüns <stefan.bruens@rwth-aachen.de> parents: 29588 diff changeset	1580 # include <qset_r.h>
93c8df989ea0 qhull: Use reentrant libqhull_r (bug #60016). Stefan Brüns <stefan.bruens@rwth-aachen.de> parents: 29588 diff changeset	1581 # include <geom_r.h>
93c8df989ea0 qhull: Use reentrant libqhull_r (bug #60016). Stefan Brüns <stefan.bruens@rwth-aachen.de> parents: 29588 diff changeset	1582 # include <poly_r.h>
93c8df989ea0 qhull: Use reentrant libqhull_r (bug #60016). Stefan Brüns <stefan.bruens@rwth-aachen.de> parents: 29588 diff changeset	1583 # include <io_r.h>
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1584 #endif
29629 93c8df989ea0 qhull: Use reentrant libqhull_r (bug #60016). Stefan Brüns <stefan.bruens@rwth-aachen.de> parents: 29588 diff changeset	1585 #if defined (NEED_QHULL_R_VERSION)
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1586 char *qh_version = "version";
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1587 #endif
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1588 ]], [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1589 int dim = 2;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1590 int n = 4;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1591 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	1592 boolT ismalloc = 0;
29632 162abe58aaef build: Initialize QHull context structure in configure test (bug #60016). Markus Mützel <markus.muetzel@gmx.de> parents: 29629 diff changeset	1593 qhT context = { };
29629 93c8df989ea0 qhull: Use reentrant libqhull_r (bug #60016). Stefan Brüns <stefan.bruens@rwth-aachen.de> parents: 29588 diff changeset	1594 qhT* qh = &context;
93c8df989ea0 qhull: Use reentrant libqhull_r (bug #60016). Stefan Brüns <stefan.bruens@rwth-aachen.de> parents: 29588 diff changeset	1595 return qh_new_qhull (qh, dim, n, points, ismalloc, "qhull ", 0, stderr);
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1596 ]])],
29629 93c8df989ea0 qhull: Use reentrant libqhull_r (bug #60016). Stefan Brüns <stefan.bruens@rwth-aachen.de> parents: 29588 diff changeset	1597 octave_cv_lib_qhull_r_ok=yes,
93c8df989ea0 qhull: Use reentrant libqhull_r (bug #60016). Stefan Brüns <stefan.bruens@rwth-aachen.de> parents: 29588 diff changeset	1598 octave_cv_lib_qhull_r_ok=no,
93c8df989ea0 qhull: Use reentrant libqhull_r (bug #60016). Stefan Brüns <stefan.bruens@rwth-aachen.de> parents: 29588 diff changeset	1599 octave_cv_lib_qhull_r_ok=yes)
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1600 ])
29629 93c8df989ea0 qhull: Use reentrant libqhull_r (bug #60016). Stefan Brüns <stefan.bruens@rwth-aachen.de> parents: 29588 diff changeset	1601 if test $octave_cv_lib_qhull_r_ok = yes; then
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1602 $1
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	1603 :
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1604 else
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1605 $2
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	1606 :
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1607 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	1608 ])
20715 5b7643257978 Remove trailing whitespace at end of lines. Rik <rik@octave.org> parents: 20420 diff changeset	1609 dnl
20153 3b3579ad7e46 Check for a modern version of sndfile in configure scripts (bug #44976). Rik <rik@octave.org> parents: 19816 diff changeset	1610 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	1611 dnl
3b3579ad7e46 Check for a modern version of sndfile in configure scripts (bug #44976). Rik <rik@octave.org> parents: 19816 diff changeset	1612 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	1613 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	1614 [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	1615 [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	1616 #include <sndfile.h>
3b3579ad7e46 Check for a modern version of sndfile in configure scripts (bug #44976). Rik <rik@octave.org> parents: 19816 diff changeset	1617 ]], [[
3b3579ad7e46 Check for a modern version of sndfile in configure scripts (bug #44976). Rik <rik@octave.org> parents: 19816 diff changeset	1618 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	1619 ]])],
3b3579ad7e46 Check for a modern version of sndfile in configure scripts (bug #44976). Rik <rik@octave.org> parents: 19816 diff changeset	1620 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	1621 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	1622 ])
3b3579ad7e46 Check for a modern version of sndfile in configure scripts (bug #44976). Rik <rik@octave.org> parents: 19816 diff changeset	1623 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	1624 $1
3b3579ad7e46 Check for a modern version of sndfile in configure scripts (bug #44976). Rik <rik@octave.org> parents: 19816 diff changeset	1625 :
3b3579ad7e46 Check for a modern version of sndfile in configure scripts (bug #44976). Rik <rik@octave.org> parents: 19816 diff changeset	1626 else
3b3579ad7e46 Check for a modern version of sndfile in configure scripts (bug #44976). Rik <rik@octave.org> parents: 19816 diff changeset	1627 $2
3b3579ad7e46 Check for a modern version of sndfile in configure scripts (bug #44976). Rik <rik@octave.org> parents: 19816 diff changeset	1628 :
3b3579ad7e46 Check for a modern version of sndfile in configure scripts (bug #44976). Rik <rik@octave.org> parents: 19816 diff changeset	1629 fi
3b3579ad7e46 Check for a modern version of sndfile in configure scripts (bug #44976). Rik <rik@octave.org> parents: 19816 diff changeset	1630 ])
32195 9cb43336c3b3 audiowrite: Allow writing mp3 through libsndfile API (bug #64388). John Donoghue <john.donoghue@ieee.org> parents: 32051 diff changeset	1631
9cb43336c3b3 audiowrite: Allow writing mp3 through libsndfile API (bug #64388). John Donoghue <john.donoghue@ieee.org> parents: 32051 diff changeset	1632 dnl
32427 8a8f16e7c462 maint: strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 32367 diff changeset	1633 dnl Check for support of some specific formats in sndfile library
32195 9cb43336c3b3 audiowrite: Allow writing mp3 through libsndfile API (bug #64388). John Donoghue <john.donoghue@ieee.org> parents: 32051 diff changeset	1634 dnl
9cb43336c3b3 audiowrite: Allow writing mp3 through libsndfile API (bug #64388). John Donoghue <john.donoghue@ieee.org> parents: 32051 diff changeset	1635 AC_DEFUN([OCTAVE_CHECK_LIB_SNDFILE_FORMATS], [
9cb43336c3b3 audiowrite: Allow writing mp3 through libsndfile API (bug #64388). John Donoghue <john.donoghue@ieee.org> parents: 32051 diff changeset	1636 AC_CACHE_CHECK([whether sndfile library supports mp3],
9cb43336c3b3 audiowrite: Allow writing mp3 through libsndfile API (bug #64388). John Donoghue <john.donoghue@ieee.org> parents: 32051 diff changeset	1637 [octave_cv_lib_sndfile_format_mp3],
9cb43336c3b3 audiowrite: Allow writing mp3 through libsndfile API (bug #64388). John Donoghue <john.donoghue@ieee.org> parents: 32051 diff changeset	1638 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
9cb43336c3b3 audiowrite: Allow writing mp3 through libsndfile API (bug #64388). John Donoghue <john.donoghue@ieee.org> parents: 32051 diff changeset	1639 #include <sndfile.h>
9cb43336c3b3 audiowrite: Allow writing mp3 through libsndfile API (bug #64388). John Donoghue <john.donoghue@ieee.org> parents: 32051 diff changeset	1640 ]], [[
9cb43336c3b3 audiowrite: Allow writing mp3 through libsndfile API (bug #64388). John Donoghue <john.donoghue@ieee.org> parents: 32051 diff changeset	1641 int x = SF_FORMAT_MPEG;
9cb43336c3b3 audiowrite: Allow writing mp3 through libsndfile API (bug #64388). John Donoghue <john.donoghue@ieee.org> parents: 32051 diff changeset	1642 ]])],
9cb43336c3b3 audiowrite: Allow writing mp3 through libsndfile API (bug #64388). John Donoghue <john.donoghue@ieee.org> parents: 32051 diff changeset	1643 octave_cv_lib_sndfile_format_mp3=yes,
9cb43336c3b3 audiowrite: Allow writing mp3 through libsndfile API (bug #64388). John Donoghue <john.donoghue@ieee.org> parents: 32051 diff changeset	1644 octave_cv_lib_sndfile_format_mp3=no)
9cb43336c3b3 audiowrite: Allow writing mp3 through libsndfile API (bug #64388). John Donoghue <john.donoghue@ieee.org> parents: 32051 diff changeset	1645 ])
9cb43336c3b3 audiowrite: Allow writing mp3 through libsndfile API (bug #64388). John Donoghue <john.donoghue@ieee.org> parents: 32051 diff changeset	1646 if test $octave_cv_lib_sndfile_format_mp3 = yes; then
9cb43336c3b3 audiowrite: Allow writing mp3 through libsndfile API (bug #64388). John Donoghue <john.donoghue@ieee.org> parents: 32051 diff changeset	1647 AC_DEFINE(HAVE_LIB_SNDFILE_FORMAT_MP3, 1,
9cb43336c3b3 audiowrite: Allow writing mp3 through libsndfile API (bug #64388). John Donoghue <john.donoghue@ieee.org> parents: 32051 diff changeset	1648 [Define to 1 if libsndfile supports mp3.])
9cb43336c3b3 audiowrite: Allow writing mp3 through libsndfile API (bug #64388). John Donoghue <john.donoghue@ieee.org> parents: 32051 diff changeset	1649 fi
9cb43336c3b3 audiowrite: Allow writing mp3 through libsndfile API (bug #64388). John Donoghue <john.donoghue@ieee.org> parents: 32051 diff changeset	1650 ])
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	1651 dnl
29367 8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1652 dnl Check whether new API is used with QHelpIndexWidget.
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1653 dnl Under new API, QHelpIndexWidget emits documentActivates.
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1654 dnl Under old API, QHelpIndexWidget emits linkActivated.
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1655 dnl New structure/signal API was introduced in Qt 5.15.
23510 b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1656 dnl
29367 8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1657 dnl FIXME: Delete this entirely when we drop support for Qt 5.14 or older.
24093 7d9ba57201b4 configure: improve Qt feature tests for functionality and consistency Mike Miller <mtmiller@octave.org> parents: 24077 diff changeset	1658 dnl
29367 8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1659 AC_DEFUN([OCTAVE_CHECK_NEW_QHELPINDEXWIDGET_API], [
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1660 AC_CACHE_CHECK([for new QHelpIndexWidget API],
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1661 [octave_cv_new_qhelpindexwidget_api],
23510 b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1662 [AC_LANG_PUSH(C++)
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1663 ac_octave_save_CPPFLAGS="$CPPFLAGS"
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1664 ac_octave_save_CXXFLAGS="$CXXFLAGS"
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1665 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
30447 8a341cf6773d build: Fix possible typo in configure tests. Markus Mützel <markus.muetzel@gmx.de> parents: 30243 diff changeset	1666 CXXFLAGS="$CXXPICFLAG $CXXFLAGS"
23510 b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1667 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
29367 8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1668 #include <QHelpLink>
23510 b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1669 ]], [[
29367 8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1670 QHelpLink link;
23510 b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1671 ]])],
29367 8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1672 octave_cv_new_qhelpindexwidget_api=yes,
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1673 octave_cv_new_qhelpindexwidget_api=no)
23510 b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1674 CPPFLAGS="$ac_octave_save_CPPFLAGS"
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1675 CXXFLAGS="$ac_octave_save_CXXFLAGS"
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1676 AC_LANG_POP(C++)
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1677 ])
29367 8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1678 if test $octave_cv_new_qhelpindexwidget_api = yes; then
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1679 AC_DEFINE(HAVE_NEW_QHELPINDEXWIDGET_API, 1,
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1680 [Define to 1 if using new QHelpIndexWidget API.])
23510 b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1681 fi
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1682 ])
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1683 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1684 dnl Check for the Qhull version.
23510 b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1685 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1686 AC_DEFUN([OCTAVE_CHECK_QHULL_VERSION], [
29629 93c8df989ea0 qhull: Use reentrant libqhull_r (bug #60016). Stefan Brüns <stefan.bruens@rwth-aachen.de> parents: 29588 diff changeset	1687 AC_CACHE_CHECK([for qh_version in $QHULL_R_LIBS],
93c8df989ea0 qhull: Use reentrant libqhull_r (bug #60016). Stefan Brüns <stefan.bruens@rwth-aachen.de> parents: 29588 diff changeset	1688 [octave_cv_lib_qhull_r_version],
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1689 [AC_LINK_IFELSE([AC_LANG_PROGRAM([[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1690 #include <stdio.h>
29629 93c8df989ea0 qhull: Use reentrant libqhull_r (bug #60016). Stefan Brüns <stefan.bruens@rwth-aachen.de> parents: 29588 diff changeset	1691 #if defined (HAVE_LIBQHULL_R_LIBQHULL_R_H)
93c8df989ea0 qhull: Use reentrant libqhull_r (bug #60016). Stefan Brüns <stefan.bruens@rwth-aachen.de> parents: 29588 diff changeset	1692 # include <libqhull_r/libqhull_r.h>
93c8df989ea0 qhull: Use reentrant libqhull_r (bug #60016). Stefan Brüns <stefan.bruens@rwth-aachen.de> parents: 29588 diff changeset	1693 # include <libqhull_r/qset_r.h>
93c8df989ea0 qhull: Use reentrant libqhull_r (bug #60016). Stefan Brüns <stefan.bruens@rwth-aachen.de> parents: 29588 diff changeset	1694 # include <libqhull_r/geom_r.h>
93c8df989ea0 qhull: Use reentrant libqhull_r (bug #60016). Stefan Brüns <stefan.bruens@rwth-aachen.de> parents: 29588 diff changeset	1695 # include <libqhull_r/poly_r.h>
93c8df989ea0 qhull: Use reentrant libqhull_r (bug #60016). Stefan Brüns <stefan.bruens@rwth-aachen.de> parents: 29588 diff changeset	1696 # include <libqhull_r/io_r.h>
93c8df989ea0 qhull: Use reentrant libqhull_r (bug #60016). Stefan Brüns <stefan.bruens@rwth-aachen.de> parents: 29588 diff changeset	1697 #elif defined (HAVE_LIBQHULL_R_H)
93c8df989ea0 qhull: Use reentrant libqhull_r (bug #60016). Stefan Brüns <stefan.bruens@rwth-aachen.de> parents: 29588 diff changeset	1698 # include <libqhull_r.h>
93c8df989ea0 qhull: Use reentrant libqhull_r (bug #60016). Stefan Brüns <stefan.bruens@rwth-aachen.de> parents: 29588 diff changeset	1699 # include <qset_r.h>
93c8df989ea0 qhull: Use reentrant libqhull_r (bug #60016). Stefan Brüns <stefan.bruens@rwth-aachen.de> parents: 29588 diff changeset	1700 # include <geom_r.h>
93c8df989ea0 qhull: Use reentrant libqhull_r (bug #60016). Stefan Brüns <stefan.bruens@rwth-aachen.de> parents: 29588 diff changeset	1701 # include <poly_r.h>
93c8df989ea0 qhull: Use reentrant libqhull_r (bug #60016). Stefan Brüns <stefan.bruens@rwth-aachen.de> parents: 29588 diff changeset	1702 # include <io_r.h>
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1703 #endif
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1704 ]], [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1705 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	1706 ]])],
29629 93c8df989ea0 qhull: Use reentrant libqhull_r (bug #60016). Stefan Brüns <stefan.bruens@rwth-aachen.de> parents: 29588 diff changeset	1707 octave_cv_lib_qhull_r_version=yes, octave_cv_lib_qhull_r_version=no)
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1708 ])
29629 93c8df989ea0 qhull: Use reentrant libqhull_r (bug #60016). Stefan Brüns <stefan.bruens@rwth-aachen.de> parents: 29588 diff changeset	1709 if test $octave_cv_lib_qhull_r_version = no; then
93c8df989ea0 qhull: Use reentrant libqhull_r (bug #60016). Stefan Brüns <stefan.bruens@rwth-aachen.de> parents: 29588 diff changeset	1710 AC_DEFINE(NEED_QHULL_R_VERSION, 1,
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1711 [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	1712 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1713 ])
24093 7d9ba57201b4 configure: improve Qt feature tests for functionality and consistency Mike Miller <mtmiller@octave.org> parents: 24077 diff changeset	1714 dnl
29367 8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1715 dnl Check whether the Qt class QRegion has the iterators and related
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1716 dnl functions introduced in Qt 5.8.
29271 0348f3f57e3c avoid build errors with Qt4 (bug #59813) John W. Eaton <jwe@octave.org> parents: 29147 diff changeset	1717 dnl
31749 0668557b8f30 * acinclude.m4: Update Qt version comments. John W. Eaton <jwe@octave.org> parents: 31748 diff changeset	1718 dnl FIXME: Delete this entirely when we drop support for Qt 5.7 or older.
0668557b8f30 * acinclude.m4: Update Qt version comments. John W. Eaton <jwe@octave.org> parents: 31748 diff changeset	1719 dnl
29367 8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1720 AC_DEFUN([OCTAVE_CHECK_QREGION_ITERATORS], [
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1721 AC_CACHE_CHECK([for QRegion iterators and related functions],
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1722 [octave_cv_qregion_iterators],
29271 0348f3f57e3c avoid build errors with Qt4 (bug #59813) John W. Eaton <jwe@octave.org> parents: 29147 diff changeset	1723 [AC_LANG_PUSH(C++)
0348f3f57e3c avoid build errors with Qt4 (bug #59813) John W. Eaton <jwe@octave.org> parents: 29147 diff changeset	1724 ac_octave_save_CPPFLAGS="$CPPFLAGS"
0348f3f57e3c avoid build errors with Qt4 (bug #59813) John W. Eaton <jwe@octave.org> parents: 29147 diff changeset	1725 ac_octave_save_CXXFLAGS="$CXXFLAGS"
0348f3f57e3c avoid build errors with Qt4 (bug #59813) John W. Eaton <jwe@octave.org> parents: 29147 diff changeset	1726 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
0348f3f57e3c avoid build errors with Qt4 (bug #59813) John W. Eaton <jwe@octave.org> parents: 29147 diff changeset	1727 CXXFLAGS="$CXXPICFLAG $CXXFLAGS"
0348f3f57e3c avoid build errors with Qt4 (bug #59813) John W. Eaton <jwe@octave.org> parents: 29147 diff changeset	1728 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
29367 8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1729 #include <QRegion>
29271 0348f3f57e3c avoid build errors with Qt4 (bug #59813) John W. Eaton <jwe@octave.org> parents: 29147 diff changeset	1730 ]], [[
29367 8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1731 QRegion region;
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1732 QRegion::const_iterator it;
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1733 it = region.begin ();
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1734 it = region.end ();
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1735 it = region.cbegin ();
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1736 it = region.cend ();
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1737 QRegion::const_reverse_iterator rit;
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1738 rit = region.rbegin ();
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1739 rit = region.rend ();
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1740 rit = region.crbegin ();
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1741 rit = region.crend ();
29271 0348f3f57e3c avoid build errors with Qt4 (bug #59813) John W. Eaton <jwe@octave.org> parents: 29147 diff changeset	1742 ]])],
29367 8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1743 octave_cv_qregion_iterators=yes,
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1744 octave_cv_qregion_iterators=no)
29271 0348f3f57e3c avoid build errors with Qt4 (bug #59813) John W. Eaton <jwe@octave.org> parents: 29147 diff changeset	1745 CPPFLAGS="$ac_octave_save_CPPFLAGS"
0348f3f57e3c avoid build errors with Qt4 (bug #59813) John W. Eaton <jwe@octave.org> parents: 29147 diff changeset	1746 CXXFLAGS="$ac_octave_save_CXXFLAGS"
0348f3f57e3c avoid build errors with Qt4 (bug #59813) John W. Eaton <jwe@octave.org> parents: 29147 diff changeset	1747 AC_LANG_POP(C++)
0348f3f57e3c avoid build errors with Qt4 (bug #59813) John W. Eaton <jwe@octave.org> parents: 29147 diff changeset	1748 ])
29367 8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1749 if test $octave_cv_qregion_iterators = yes; then
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1750 AC_DEFINE(HAVE_QREGION_ITERATORS, 1,
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1751 [Define to 1 if you have the `QFontMetrics::horizontalAdvance' function.])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1752 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1753 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1754 dnl
22823 e2afee0041bf new configure option, --without-qscintilla John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1755 dnl Check whether we have QScintilla for the given Qt VERSION.
20420 6cfbf412a2c3 configure.ac: Test that Qt and OpenGL can be used together (bug #45672) Mike Miller <mtmiller@octave.org> parents: 20416 diff changeset	1756 dnl
22823 e2afee0041bf new configure option, --without-qscintilla John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1757 AC_DEFUN([OCTAVE_CHECK_QSCINTILLA], [
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1758 qt_version="$1";
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1759 use_qscintilla=no
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1760 warn_qscintilla=""
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1761
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1762 ## Check for Qt libraries
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1763 case "$qt_version" in
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1764 5)
23414 a759896c2b53 acinclude.m4: Look for "qscintilla_qt5" as another name for Qt5 scintilla library. Rik <rik@octave.org> parents: 23219 diff changeset	1765 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	1766 ;;
32004 c5b57a82a17c build: Initial changes to enable building with Qt6. Markus Mützel <markus.muetzel@gmx.de> parents: 31984 diff changeset	1767 6)
c5b57a82a17c build: Initial changes to enable building with Qt6. Markus Mützel <markus.muetzel@gmx.de> parents: 31984 diff changeset	1768 octave_qscintilla_libnames="qscintilla2-qt6 qscintilla2_qt6 qt6scintilla2"
c5b57a82a17c build: Initial changes to enable building with Qt6. Markus Mützel <markus.muetzel@gmx.de> parents: 31984 diff changeset	1769 ;;
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1770 *)
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1771 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	1772 ;;
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1773 esac
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1774
22823 e2afee0041bf new configure option, --without-qscintilla John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1775 if test $build_qt_gui = yes && test $check_qscintilla = yes; then
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1776
22286 f394436a4025 build: improve QScintilla detection to work with distro naming schemes (bug #48773) Mike Miller <mtmiller@octave.org> parents: 22257 diff changeset	1777 ## 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	1778 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	1779 [octave_cv_lib_qscintilla],
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1780 [save_CPPFLAGS="$CPPFLAGS"
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1781 save_CXXFLAGS="$CXXFLAGS"
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1782 save_LDFLAGS="$LDFLAGS"
31134 b8d37c022e40 acinclude.m4: use same name for temporary LIBS variable throughout all macros. Rik <rik@octave.org> parents: 31133 diff changeset	1783 ac_octave_save_LIBS="$LIBS"
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1784 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1785 CXXFLAGS="$CXXPICFLAG $CXXFLAGS"
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1786 LDFLAGS="$QT_LDFLAGS $LDFLAGS"
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1787 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	1788 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	1789 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	1790 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
22456 8924139b4f21 fix test for qscintilla (bug #49018) John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1791 #include <Qsci/qsciapis.h>
8924139b4f21 fix test for qscintilla (bug #49018) John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1792 #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	1793 ]], [[
22456 8924139b4f21 fix test for qscintilla (bug #49018) John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1794 QsciLexer *lexer = new QsciLexerCPP ();
8924139b4f21 fix test for qscintilla (bug #49018) John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1795 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	1796 ]])],
f394436a4025 build: improve QScintilla detection to work with distro naming schemes (bug #48773) Mike Miller <mtmiller@octave.org> parents: 22257 diff changeset	1797 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	1798 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	1799 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	1800 break
f394436a4025 build: improve QScintilla detection to work with distro naming schemes (bug #48773) Mike Miller <mtmiller@octave.org> parents: 22257 diff changeset	1801 fi
f394436a4025 build: improve QScintilla detection to work with distro naming schemes (bug #48773) Mike Miller <mtmiller@octave.org> parents: 22257 diff changeset	1802 done
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1803 CPPFLAGS="$save_CPPFLAGS"
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1804 CXXFLAGS="$save_CXXFLAGS"
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1805 LDFLAGS="$save_LDFLAGS"
31134 b8d37c022e40 acinclude.m4: use same name for temporary LIBS variable throughout all macros. Rik <rik@octave.org> parents: 31133 diff changeset	1806 LIBS="$ac_octave_save_LIBS"
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1807 AC_LANG_POP([C++])
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1808 ])
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1809
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1810 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	1811 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	1812 else
22286 f394436a4025 build: improve QScintilla detection to work with distro naming schemes (bug #48773) Mike Miller <mtmiller@octave.org> parents: 22257 diff changeset	1813 ## 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	1814 ## 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	1815 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	1816 OCTAVE_CHECK_QSCINTILLA_VERSION
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1817 AC_DEFINE(HAVE_QSCINTILLA, 1,
22250 2fd4f1a3f4a8 allow building with Qt5 (bug #40252) John W. Eaton <jwe@octave.org> parents: 22234 diff changeset	1818 [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	1819
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1820 save_CPPFLAGS="$CPPFLAGS"
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1821 save_CXXFLAGS="$CXXFLAGS"
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1822 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1823 CXXFLAGS="$CXXPICFLAG $CXXFLAGS"
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1824 AC_LANG_PUSH(C++)
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1825 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	1826 AC_LANG_POP(C++)
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1827 CPPFLAGS="$save_CPPFLAGS"
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1828 CXXFLAGS="$save_CXXFLAGS"
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1829
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1830 use_qscintilla=yes
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1831 fi
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1832 fi
22823 e2afee0041bf new configure option, --without-qscintilla John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1833 ])
e2afee0041bf new configure option, --without-qscintilla John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1834 dnl
23510 b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1835 dnl Check whether QScintilla has version 2.6.0 or later
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1836 dnl FIXME: This test uses a version number. It potentially could
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1837 dnl be re-written to actually call the function, but is it worth it?
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1838 dnl
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1839 AC_DEFUN([OCTAVE_CHECK_QSCINTILLA_VERSION], [
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1840 AC_CACHE_CHECK([whether QScintilla has version 2.6.0 or later],
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1841 [octave_cv_version_2_6_0],
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1842 [AC_LANG_PUSH(C++)
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1843 ac_octave_save_CPPFLAGS="$CPPFLAGS"
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1844 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1845 AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1846 #include <Qsci/qsciglobal.h>
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1847 ]], [[
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1848 #if QSCINTILLA_VERSION < 0x020600
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1849 #error Old FindFirst function found.
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1850 #endif
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1851 ]])],
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1852 octave_cv_version_2_6_0=yes,
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1853 octave_cv_version_2_6_0=no)
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1854 CPPFLAGS="$ac_octave_save_CPPFLAGS"
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1855 AC_LANG_POP(C++)
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1856 ])
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1857 if test $octave_cv_version_2_6_0 = yes; then
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1858 AC_DEFINE(HAVE_QSCI_VERSION_2_6_0, 1,
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1859 [Define to 1 if QScintilla is of Version 2.6.0 or later.])
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1860 fi
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1861 ])
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1862 dnl
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1863 dnl OCTAVE_CHECK_QT
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1864 dnl
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1865 AC_DEFUN([OCTAVE_CHECK_QT], [
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1866 octave_qt_versions="$1"
22257 945e7f9c11ff build: fix configure --without-qt or --with-qt Mike Miller <mtmiller@octave.org> parents: 22255 diff changeset	1867
945e7f9c11ff build: fix configure --without-qt or --with-qt Mike Miller <mtmiller@octave.org> parents: 22255 diff changeset	1868 build_qt_gui=no
945e7f9c11ff build: fix configure --without-qt or --with-qt Mike Miller <mtmiller@octave.org> parents: 22255 diff changeset	1869 use_qscintilla=no
945e7f9c11ff build: fix configure --without-qt or --with-qt Mike Miller <mtmiller@octave.org> parents: 22255 diff changeset	1870 win32_terminal=no
945e7f9c11ff build: fix configure --without-qt or --with-qt Mike Miller <mtmiller@octave.org> parents: 22255 diff changeset	1871
22255 8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1872 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	1873 OCTAVE_CHECK_QT_VERSION([$ver])
22250 2fd4f1a3f4a8 allow building with Qt5 (bug #40252) John W. Eaton <jwe@octave.org> parents: 22234 diff changeset	1874 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	1875 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	1876 break
25134 5fccb7373bc4 allow configure to continue if some Qt tools are found (bug #53571) John W. Eaton <jwe@octave.org> parents: 25119 diff changeset	1877 elif test -n "$QT_MODULES_AVAILABLE"; then
32004 c5b57a82a17c build: Initial changes to enable building with Qt6. Markus Mützel <markus.muetzel@gmx.de> parents: 31984 diff changeset	1878 ## If some modules were found for $ver, then warn about possible
c5b57a82a17c build: Initial changes to enable building with Qt6. Markus Mützel <markus.muetzel@gmx.de> parents: 31984 diff changeset	1879 ## incomplete or broken Qt installation instead of checking for
c5b57a82a17c build: Initial changes to enable building with Qt6. Markus Mützel <markus.muetzel@gmx.de> parents: 31984 diff changeset	1880 ## next version in the list. Don't attempt a similar check for
c5b57a82a17c build: Initial changes to enable building with Qt6. Markus Mützel <markus.muetzel@gmx.de> parents: 31984 diff changeset	1881 ## tools here because Qt5 and Qt6 tools may be installed with
c5b57a82a17c build: Initial changes to enable building with Qt6. Markus Mützel <markus.muetzel@gmx.de> parents: 31984 diff changeset	1882 ## the same name so determining whether there is a mix of versions
c5b57a82a17c build: Initial changes to enable building with Qt6. Markus Mützel <markus.muetzel@gmx.de> parents: 31984 diff changeset	1883 ## will require more work than just looking which tools are installed.
25114 f191e1a26095 if a Qt version appears partially installed, don't check another version John W. Eaton <jwe@octave.org> parents: 25098 diff changeset	1884 warn_qt_modules="Your installation of Qt version $ver appears incomplete or broken in some way. Fix that or use --with-qt=VER to use another version."
f191e1a26095 if a Qt version appears partially installed, don't check another version John W. Eaton <jwe@octave.org> parents: 25098 diff changeset	1885 break
22255 8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1886 fi
8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1887 done
8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1888
8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1889 if test $build_qt_gui = yes; then
25097 cc21f66ecb1c display more info in configure summary about Qt version and missing features John W. Eaton <jwe@octave.org> parents: 25061 diff changeset	1890 BUILD_QT_SUMMARY_MSG="yes (version: $have_qt_version)"
22255 8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1891 if test x"$have_qt_version" = x5; then
24810 8a92f442c4a2 configure.ac: Overhaul file (bug #53186). Rik <rik@octave.org> parents: 24798 diff changeset	1892 AC_DEFINE(HAVE_QT5, 1, [Define to 1 if using Qt version 5.])
22255 8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1893 fi
32004 c5b57a82a17c build: Initial changes to enable building with Qt6. Markus Mützel <markus.muetzel@gmx.de> parents: 31984 diff changeset	1894 if test x"$have_qt_version" = x6; then
c5b57a82a17c build: Initial changes to enable building with Qt6. Markus Mützel <markus.muetzel@gmx.de> parents: 31984 diff changeset	1895 AC_DEFINE(HAVE_QT6, 1, [Define to 1 if using Qt version 6.])
c5b57a82a17c build: Initial changes to enable building with Qt6. Markus Mützel <markus.muetzel@gmx.de> parents: 31984 diff changeset	1896 fi
22255 8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1897 else
25119 14b9e2a1f3e1 if some Qt tools are instaslled, don't check for another version John W. Eaton <jwe@octave.org> parents: 25114 diff changeset	1898 if test -n "$QT_MODULES_MISSING" \|\| test -n "$QT_TOOLS_MISSING"; then
14b9e2a1f3e1 if some Qt tools are instaslled, don't check for another version John W. Eaton <jwe@octave.org> parents: 25114 diff changeset	1899 qt_missing=`echo $QT_MODULES_MISSING$QT_TOOLS_MISSING \| sed 's/ *$//'`
14b9e2a1f3e1 if some Qt tools are instaslled, don't check for another version John W. Eaton <jwe@octave.org> parents: 25114 diff changeset	1900 BUILD_QT_SUMMARY_MSG="no (missing:$qt_missing)"
25097 cc21f66ecb1c display more info in configure summary about Qt version and missing features John W. Eaton <jwe@octave.org> parents: 25061 diff changeset	1901 else
cc21f66ecb1c display more info in configure summary about Qt version and missing features John W. Eaton <jwe@octave.org> parents: 25061 diff changeset	1902 BUILD_QT_SUMMARY_MSG="no"
cc21f66ecb1c display more info in configure summary about Qt version and missing features John W. Eaton <jwe@octave.org> parents: 25061 diff changeset	1903 fi
25114 f191e1a26095 if a Qt version appears partially installed, don't check another version John W. Eaton <jwe@octave.org> parents: 25098 diff changeset	1904 if test -n "$warn_qt_modules"; then
f191e1a26095 if a Qt version appears partially installed, don't check another version John W. Eaton <jwe@octave.org> parents: 25098 diff changeset	1905 OCTAVE_CONFIGURE_WARNING([warn_qt_modules])
f191e1a26095 if a Qt version appears partially installed, don't check another version John W. Eaton <jwe@octave.org> parents: 25098 diff changeset	1906 fi
32350 de6e2f546970 build: Improve detection of Qt6 tools. Markus Mützel <markus.muetzel@gmx.de> parents: 32349 diff changeset	1907 if test -n "$warn_qt_cxx17"; then
de6e2f546970 build: Improve detection of Qt6 tools. Markus Mützel <markus.muetzel@gmx.de> parents: 32349 diff changeset	1908 OCTAVE_CONFIGURE_WARNING([warn_qt_cxx17])
de6e2f546970 build: Improve detection of Qt6 tools. Markus Mützel <markus.muetzel@gmx.de> parents: 32349 diff changeset	1909 fi
22255 8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1910 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	1911 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	1912 fi
8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1913 if test -n "$warn_qt_version"; then
27839 a8c5255c34b1 Announce deprecation of Qt4 and removal in Octave version 7. Rik <rik@octave.org> parents: 27543 diff changeset	1914 OCTAVE_CONFIGURE_WARNING([warn_qt_version])
22255 8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1915 fi
8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1916 if test -n "$warn_qt_tools"; then
27839 a8c5255c34b1 Announce deprecation of Qt4 and removal in Octave version 7. Rik <rik@octave.org> parents: 27543 diff changeset	1917 OCTAVE_CONFIGURE_WARNING([warn_qt_tools])
22255 8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1918 fi
8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1919 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	1920 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	1921 fi
8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1922 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	1923 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	1924 fi
8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1925 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	1926 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	1927 fi
8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1928 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	1929 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	1930 fi
8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1931 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	1932 OCTAVE_CONFIGURE_WARNING([warn_qscintilla])
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1933 fi
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1934 fi
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1935
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1936 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	1937 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	1938 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	1939 ])
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1940 dnl
30005 7677b6184c0b use new Qt::ImCursorRectangle enum value if available John W. Eaton <jwe@octave.org> parents: 29949 diff changeset	1941 dnl Check whether the Qt::ImCursorRectangle enum value exists.
7677b6184c0b use new Qt::ImCursorRectangle enum value if available John W. Eaton <jwe@octave.org> parents: 29949 diff changeset	1942 dnl It replaces the Qt::ImMicroFocus enum value that was deprecated
7677b6184c0b use new Qt::ImCursorRectangle enum value if available John W. Eaton <jwe@octave.org> parents: 29949 diff changeset	1943 dnl in Qt 5.14.
7677b6184c0b use new Qt::ImCursorRectangle enum value if available John W. Eaton <jwe@octave.org> parents: 29949 diff changeset	1944 dnl
7677b6184c0b use new Qt::ImCursorRectangle enum value if available John W. Eaton <jwe@octave.org> parents: 29949 diff changeset	1945 AC_DEFUN([OCTAVE_CHECK_QT_IMCURSORRECTANGLE_ENUM_VALUE], [
7677b6184c0b use new Qt::ImCursorRectangle enum value if available John W. Eaton <jwe@octave.org> parents: 29949 diff changeset	1946 AC_CACHE_CHECK([for Qt::ImCursorRectangle enum value],
7677b6184c0b use new Qt::ImCursorRectangle enum value if available John W. Eaton <jwe@octave.org> parents: 29949 diff changeset	1947 [octave_cv_qt_imcursorrectangle_enum_value],
7677b6184c0b use new Qt::ImCursorRectangle enum value if available John W. Eaton <jwe@octave.org> parents: 29949 diff changeset	1948 [AC_LANG_PUSH(C++)
7677b6184c0b use new Qt::ImCursorRectangle enum value if available John W. Eaton <jwe@octave.org> parents: 29949 diff changeset	1949 ac_octave_save_CPPFLAGS="$CPPFLAGS"
7677b6184c0b use new Qt::ImCursorRectangle enum value if available John W. Eaton <jwe@octave.org> parents: 29949 diff changeset	1950 ac_octave_save_CXXFLAGS="$CXXFLAGS"
7677b6184c0b use new Qt::ImCursorRectangle enum value if available John W. Eaton <jwe@octave.org> parents: 29949 diff changeset	1951 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
7677b6184c0b use new Qt::ImCursorRectangle enum value if available John W. Eaton <jwe@octave.org> parents: 29949 diff changeset	1952 CXXFLAGS="$CXXPICFLAG $CXXFLAGS"
7677b6184c0b use new Qt::ImCursorRectangle enum value if available John W. Eaton <jwe@octave.org> parents: 29949 diff changeset	1953 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
7677b6184c0b use new Qt::ImCursorRectangle enum value if available John W. Eaton <jwe@octave.org> parents: 29949 diff changeset	1954 #include <Qt>
7677b6184c0b use new Qt::ImCursorRectangle enum value if available John W. Eaton <jwe@octave.org> parents: 29949 diff changeset	1955 ]], [[
7677b6184c0b use new Qt::ImCursorRectangle enum value if available John W. Eaton <jwe@octave.org> parents: 29949 diff changeset	1956 Qt::InputMethodQuery method_query = Qt::ImCursorRectangle;
7677b6184c0b use new Qt::ImCursorRectangle enum value if available John W. Eaton <jwe@octave.org> parents: 29949 diff changeset	1957 ]])],
7677b6184c0b use new Qt::ImCursorRectangle enum value if available John W. Eaton <jwe@octave.org> parents: 29949 diff changeset	1958 octave_cv_qt_imcursorrectangle_enum_value=yes,
7677b6184c0b use new Qt::ImCursorRectangle enum value if available John W. Eaton <jwe@octave.org> parents: 29949 diff changeset	1959 octave_cv_qt_imcursorrectangle_enum_value=no)
7677b6184c0b use new Qt::ImCursorRectangle enum value if available John W. Eaton <jwe@octave.org> parents: 29949 diff changeset	1960 CPPFLAGS="$ac_octave_save_CPPFLAGS"
7677b6184c0b use new Qt::ImCursorRectangle enum value if available John W. Eaton <jwe@octave.org> parents: 29949 diff changeset	1961 CXXFLAGS="$ac_octave_save_CXXFLAGS"
7677b6184c0b use new Qt::ImCursorRectangle enum value if available John W. Eaton <jwe@octave.org> parents: 29949 diff changeset	1962 AC_LANG_POP(C++)
7677b6184c0b use new Qt::ImCursorRectangle enum value if available John W. Eaton <jwe@octave.org> parents: 29949 diff changeset	1963 ])
7677b6184c0b use new Qt::ImCursorRectangle enum value if available John W. Eaton <jwe@octave.org> parents: 29949 diff changeset	1964 if test $octave_cv_qt_imcursorrectangle_enum_value = yes; then
7677b6184c0b use new Qt::ImCursorRectangle enum value if available John W. Eaton <jwe@octave.org> parents: 29949 diff changeset	1965 AC_DEFINE(HAVE_QT_IMCURSORRECTANGLE_ENUM_VALUE, 1,
7677b6184c0b use new Qt::ImCursorRectangle enum value if available John W. Eaton <jwe@octave.org> parents: 29949 diff changeset	1966 [Define to 1 if you have the `Qt::ImCursorRectangle' enum value.])
7677b6184c0b use new Qt::ImCursorRectangle enum value if available John W. Eaton <jwe@octave.org> parents: 29949 diff changeset	1967 fi
7677b6184c0b use new Qt::ImCursorRectangle enum value if available John W. Eaton <jwe@octave.org> parents: 29949 diff changeset	1968 ])
7677b6184c0b use new Qt::ImCursorRectangle enum value if available John W. Eaton <jwe@octave.org> parents: 29949 diff changeset	1969 dnl
29367 8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1970 dnl Check whether the Qt::SplitBehavior enum exists and has
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1971 dnl Qt::KeepEmptyParts and Qt::SkipEmptyParts members. This enum
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1972 dnl was introduced or modified in Qt 5.14.
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1973 dnl
31749 0668557b8f30 * acinclude.m4: Update Qt version comments. John W. Eaton <jwe@octave.org> parents: 31748 diff changeset	1974 dnl FIXME: Delete this entirely when we drop support for Qt 5.13 or older.
0668557b8f30 * acinclude.m4: Update Qt version comments. John W. Eaton <jwe@octave.org> parents: 31748 diff changeset	1975 dnl
29367 8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1976 AC_DEFUN([OCTAVE_CHECK_QT_SPLITBEHAVIOR_ENUM], [
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1977 AC_CACHE_CHECK([for Qt::SplitBehavior enum],
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1978 [octave_cv_qt_splitbehavior_enum],
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1979 [AC_LANG_PUSH(C++)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1980 ac_octave_save_CPPFLAGS="$CPPFLAGS"
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1981 ac_octave_save_CXXFLAGS="$CXXFLAGS"
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1982 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1983 CXXFLAGS="$CXXPICFLAG $CXXFLAGS"
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1984 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1985 #include <Qt>
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1986 ]], [[
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1987 Qt::SplitBehavior sb_keep = Qt::KeepEmptyParts;
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1988 Qt::SplitBehavior sb_skip = Qt::SkipEmptyParts;
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1989 ]])],
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1990 octave_cv_qt_splitbehavior_enum=yes,
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1991 octave_cv_qt_splitbehavior_enum=no)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1992 CPPFLAGS="$ac_octave_save_CPPFLAGS"
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1993 CXXFLAGS="$ac_octave_save_CXXFLAGS"
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1994 AC_LANG_POP(C++)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1995 ])
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1996 if test $octave_cv_qt_splitbehavior_enum = yes; then
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1997 AC_DEFINE(HAVE_QT_SPLITBEHAVIOR_ENUM, 1,
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1998 [Define to 1 if you have the `Qt::SplitBehavior' enum.])
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	1999 fi
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2000 ])
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2001 dnl
25135 ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	2002 dnl OCTAVE_CHECK_QT_TOOL(TOOL)
ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	2003 dnl
ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	2004 AC_DEFUN([OCTAVE_CHECK_QT_TOOL], [
ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	2005 AC_CHECK_TOOLS(m4_toupper([$1])_QTVER, [$1-qt$qt_version])
ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	2006 if test -z "$m4_toupper([$1])_QTVER"; then
32356 0cdf8fe8533c build: Look for Qt6 tools also in QT_HOSTS_BINS directory. Markus Mützel <markus.muetzel@gmx.de> parents: 32355 diff changeset	2007 AC_PATH_TOOL(m4_toupper([$1]), [$1], [],
0cdf8fe8533c build: Look for Qt6 tools also in QT_HOSTS_BINS directory. Markus Mützel <markus.muetzel@gmx.de> parents: 32355 diff changeset	2008 [$QT_HOST_LIBEXECS$PATH_SEPARATOR$QT_HOST_BINS$PATH_SEPARATOR])
32349 16845da1ca42 build: Use qtpaths6 to get prefix for Qt6 tools. Markus Mützel <markus.muetzel@gmx.de> parents: 32289 diff changeset	2009 if test -z "$m4_toupper([$1])"; then
16845da1ca42 build: Use qtpaths6 to get prefix for Qt6 tools. Markus Mützel <markus.muetzel@gmx.de> parents: 32289 diff changeset	2010 AC_CHECK_TOOLS(m4_toupper([$1]), [$1])
16845da1ca42 build: Use qtpaths6 to get prefix for Qt6 tools. Markus Mützel <markus.muetzel@gmx.de> parents: 32289 diff changeset	2011 fi
25135 ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	2012 if test -n "$m4_toupper([$1])"; then
ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	2013 if test -n "$QTCHOOSER"; then
29069 c6796a1c35b2 Call Qt helper programs with flags "-qt=VERSION" (bug #59474). Rik <rik@octave.org> parents: 29053 diff changeset	2014 m4_toupper([$1])FLAGS="-qt=$qt_version"
25135 ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	2015 fi
ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	2016 QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE $1"
ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	2017 else
ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	2018 QT_TOOLS_MISSING="$QT_TOOLS_MISSING $1"
ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	2019 fi
ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	2020 else
ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	2021 m4_toupper([$1])="$m4_toupper([$1])_QTVER"
ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	2022 QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE $1"
ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	2023 fi
ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	2024 ])
ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	2025 dnl
31752 345a3f5890e7 assume QOpenGLWidget is available John W. Eaton <jwe@octave.org> parents: 31751 diff changeset	2026 dnl Check whether Qt VERSION is present, supports QScintilla,
345a3f5890e7 assume QOpenGLWidget is available John W. Eaton <jwe@octave.org> parents: 31751 diff changeset	2027 dnl and will work for Octave.
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2028 dnl
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2029 dnl OCTAVE_CHECK_QT_VERSION(VERSION)
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2030 dnl
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2031 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	2032
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2033 qt_version="$1";
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2034
22255 8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	2035 build_qt_gui=yes
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2036 win32_terminal=no
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2037
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2038 warn_qt_libraries=""
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2039 warn_qt_version=""
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2040 warn_qt_tools=""
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2041 warn_qt_setvbuf=""
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2042 warn_qt_lib_fcns=""
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2043 warn_qt_abstract_item_model=""
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2044 warn_qt_opengl=""
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2045
32367 aeed7db02016 build: Move check for C++ compiler capabilities closer to the start. Markus Mützel <markus.muetzel@gmx.de> parents: 32357 diff changeset	2046 if test $build_qt_gui = yes; then
aeed7db02016 build: Move check for C++ compiler capabilities closer to the start. Markus Mützel <markus.muetzel@gmx.de> parents: 32357 diff changeset	2047 ## Check for Qt libraries
aeed7db02016 build: Move check for C++ compiler capabilities closer to the start. Markus Mützel <markus.muetzel@gmx.de> parents: 32357 diff changeset	2048 case "$qt_version" in
aeed7db02016 build: Move check for C++ compiler capabilities closer to the start. Markus Mützel <markus.muetzel@gmx.de> parents: 32357 diff changeset	2049 5)
33443 f428a432ed4f build: Require Qt Widgets module when building the GUI (bug #65625). Markus Mützel <markus.muetzel@gmx.de> parents: 33393 diff changeset	2050 QT_MODULES="Qt5Core Qt5Gui Qt5Help Qt5Network Qt5OpenGL Qt5PrintSupport Qt5Widgets Qt5Xml"
32367 aeed7db02016 build: Move check for C++ compiler capabilities closer to the start. Markus Mützel <markus.muetzel@gmx.de> parents: 32357 diff changeset	2051 ;;
aeed7db02016 build: Move check for C++ compiler capabilities closer to the start. Markus Mützel <markus.muetzel@gmx.de> parents: 32357 diff changeset	2052 6)
33443 f428a432ed4f build: Require Qt Widgets module when building the GUI (bug #65625). Markus Mützel <markus.muetzel@gmx.de> parents: 33393 diff changeset	2053 QT_MODULES="Qt6Core Qt6Gui Qt6Help Qt6Network Qt6OpenGL Qt6OpenGLWidgets Qt6PrintSupport Qt6Widgets Qt6Xml"
32367 aeed7db02016 build: Move check for C++ compiler capabilities closer to the start. Markus Mützel <markus.muetzel@gmx.de> parents: 32357 diff changeset	2054 case $host_os in
aeed7db02016 build: Move check for C++ compiler capabilities closer to the start. Markus Mützel <markus.muetzel@gmx.de> parents: 32357 diff changeset	2055 mingw* \| msdosmsvc*)
aeed7db02016 build: Move check for C++ compiler capabilities closer to the start. Markus Mützel <markus.muetzel@gmx.de> parents: 32357 diff changeset	2056 ;;
aeed7db02016 build: Move check for C++ compiler capabilities closer to the start. Markus Mützel <markus.muetzel@gmx.de> parents: 32357 diff changeset	2057 *)
aeed7db02016 build: Move check for C++ compiler capabilities closer to the start. Markus Mützel <markus.muetzel@gmx.de> parents: 32357 diff changeset	2058 # FIXME: Remove Qt6Core5Compat when we no longer rely on classes that
aeed7db02016 build: Move check for C++ compiler capabilities closer to the start. Markus Mützel <markus.muetzel@gmx.de> parents: 32357 diff changeset	2059 # have been removed in Qt6:
aeed7db02016 build: Move check for C++ compiler capabilities closer to the start. Markus Mützel <markus.muetzel@gmx.de> parents: 32357 diff changeset	2060 # https://www.qt.io/blog/porting-from-qt-5-to-qt-6-using-qt5compat-library
aeed7db02016 build: Move check for C++ compiler capabilities closer to the start. Markus Mützel <markus.muetzel@gmx.de> parents: 32357 diff changeset	2061 # It is still needed for the terminal implementation in
aeed7db02016 build: Move check for C++ compiler capabilities closer to the start. Markus Mützel <markus.muetzel@gmx.de> parents: 32357 diff changeset	2062 # libgui/qterminal/libqterminal/unix
aeed7db02016 build: Move check for C++ compiler capabilities closer to the start. Markus Mützel <markus.muetzel@gmx.de> parents: 32357 diff changeset	2063 QT_MODULES="$QT_MODULES Qt6Core5Compat"
aeed7db02016 build: Move check for C++ compiler capabilities closer to the start. Markus Mützel <markus.muetzel@gmx.de> parents: 32357 diff changeset	2064 ;;
aeed7db02016 build: Move check for C++ compiler capabilities closer to the start. Markus Mützel <markus.muetzel@gmx.de> parents: 32357 diff changeset	2065 esac
aeed7db02016 build: Move check for C++ compiler capabilities closer to the start. Markus Mützel <markus.muetzel@gmx.de> parents: 32357 diff changeset	2066 ;;
aeed7db02016 build: Move check for C++ compiler capabilities closer to the start. Markus Mützel <markus.muetzel@gmx.de> parents: 32357 diff changeset	2067 *)
aeed7db02016 build: Move check for C++ compiler capabilities closer to the start. Markus Mützel <markus.muetzel@gmx.de> parents: 32357 diff changeset	2068 AC_MSG_ERROR([Unrecognized Qt version $qt_version])
aeed7db02016 build: Move check for C++ compiler capabilities closer to the start. Markus Mützel <markus.muetzel@gmx.de> parents: 32357 diff changeset	2069 ;;
aeed7db02016 build: Move check for C++ compiler capabilities closer to the start. Markus Mützel <markus.muetzel@gmx.de> parents: 32357 diff changeset	2070 esac
aeed7db02016 build: Move check for C++ compiler capabilities closer to the start. Markus Mützel <markus.muetzel@gmx.de> parents: 32357 diff changeset	2071 fi
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2072
32456 4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2073 if test $build_qt_gui = yes \
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2074 && test -n "$QT_CPPFLAGS" \
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2075 && test -n "$QT_LIBS"; then
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2076 ## Don't use pkg-config but assume the provided flags are correct
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2077 ## and match the --with-qt value.
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2078 AC_MSG_WARN("Using provided values for QT_CPPFLAGS, QT_LIBS, and QT_LDFLAGS for Qt$qt_version")
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2079 else
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2080 if test $build_qt_gui = yes; then
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2081 ## Use this check to get info in the log file.
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2082 PKG_CHECK_MODULES(QT, [$QT_MODULES],
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2083 [],
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2084 [build_qt_gui=no
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2085 warn_qt_libraries="Qt libraries not found; disabling Qt GUI"])
25097 cc21f66ecb1c display more info in configure summary about Qt version and missing features John W. Eaton <jwe@octave.org> parents: 25061 diff changeset	2086
32456 4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2087 ## Check the modules again individually to get lists of modules that
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2088 ## are available and/or missing
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2089 QT_MODULES_AVAILABLE=
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2090 QT_MODULES_MISSING=
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2091 for qt_mod in $QT_MODULES; do
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2092 if $PKG_CONFIG --exists $qt_mod; then
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2093 QT_MODULES_AVAILABLE="$QT_MODULES_AVAILABLE $qt_mod"
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2094 else
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2095 QT_MODULES_MISSING="$QT_MODULES_MISSING $qt_mod"
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2096 fi
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2097 done
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2098 fi
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2099
32456 4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2100 if test $build_qt_gui = yes; then
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2101 ## Retrieve Qt compilation and linker flags
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2102 QT_CPPFLAGS="$($PKG_CONFIG --cflags-only-I $QT_MODULES \| $SED -e 's/^ *$//')"
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2103 QT_LDFLAGS="$($PKG_CONFIG --libs-only-L $QT_MODULES \| $SED -e 's/^ *$//')"
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2104 QT_LIBS="$($PKG_CONFIG --libs-only-l $QT_MODULES \| $SED -e 's/^ *$//')"
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2105
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2106 case $host_os in
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2107 darwin)
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2108 ## Qt might be installed in framework
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2109 if test -z "$QT_LIBS"; then
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2110 QT_LDFLAGS="`$PKG_CONFIG --libs-only-other $QT_MODULES \| tr ' ' '\n' \| $GREP -e '-F' \| uniq \| tr '\n' ' '`"
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2111 QT_LIBS="`$PKG_CONFIG --libs-only-other $QT_MODULES \| tr ' ' '\n' \| $GREP -v -e '-F' \| uniq \| tr '\n' ' '`"
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2112 ## Enabling link_all_deps works around libtool's imperfect handling
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2113 ## of the -F flag
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2114 if test -n "$QT_LDFLAGS"; then
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2115 link_all_deps=yes
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2116 fi
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2117 AM_CONDITIONAL([AMCOND_LINK_ALL_DEPS], [test $link_all_deps = yes])
29663 5811df727e96 build: Don't try to expand Makefile variable in configure script. Markus Mützel <markus.muetzel@gmx.de> parents: 29661 diff changeset	2118 fi
32456 4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2119 ;;
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2120 esac
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2121 fi
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2122 fi
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2123
25119 14b9e2a1f3e1 if some Qt tools are instaslled, don't check for another version John W. Eaton <jwe@octave.org> parents: 25114 diff changeset	2124 QT_TOOLS_AVAILABLE=
14b9e2a1f3e1 if some Qt tools are instaslled, don't check for another version John W. Eaton <jwe@octave.org> parents: 25114 diff changeset	2125 QT_TOOLS_MISSING=
14b9e2a1f3e1 if some Qt tools are instaslled, don't check for another version John W. Eaton <jwe@octave.org> parents: 25114 diff changeset	2126
22255 8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	2127 if test $build_qt_gui = yes; then
32349 16845da1ca42 build: Use qtpaths6 to get prefix for Qt6 tools. Markus Mützel <markus.muetzel@gmx.de> parents: 32289 diff changeset	2128 case "$qt_version" in
16845da1ca42 build: Use qtpaths6 to get prefix for Qt6 tools. Markus Mützel <markus.muetzel@gmx.de> parents: 32289 diff changeset	2129 5)
16845da1ca42 build: Use qtpaths6 to get prefix for Qt6 tools. Markus Mützel <markus.muetzel@gmx.de> parents: 32289 diff changeset	2130 AC_CHECK_TOOLS(QTCHOOSER, [qtchooser])
16845da1ca42 build: Use qtpaths6 to get prefix for Qt6 tools. Markus Mützel <markus.muetzel@gmx.de> parents: 32289 diff changeset	2131 ;;
16845da1ca42 build: Use qtpaths6 to get prefix for Qt6 tools. Markus Mützel <markus.muetzel@gmx.de> parents: 32289 diff changeset	2132 6)
32351 469b078fe75b build: Fix errors in de6e2f546970 Markus Mützel <markus.muetzel@gmx.de> parents: 32350 diff changeset	2133 ac_octave_save_QT_HOST_LIBEXECS="$QT_HOST_LIBEXECS"
32349 16845da1ca42 build: Use qtpaths6 to get prefix for Qt6 tools. Markus Mützel <markus.muetzel@gmx.de> parents: 32289 diff changeset	2134 if test -z "$QT_HOST_LIBEXECS"; then
32350 de6e2f546970 build: Improve detection of Qt6 tools. Markus Mützel <markus.muetzel@gmx.de> parents: 32349 diff changeset	2135 AC_CHECK_TOOLS(QTPATHS6, [qtpaths6 qtpaths-qt6])
de6e2f546970 build: Improve detection of Qt6 tools. Markus Mützel <markus.muetzel@gmx.de> parents: 32349 diff changeset	2136 if test -n "$QTPATHS6"; then
32355 bf77e0f86f74 build: Double-quote strings assigned to variables. Markus Mützel <markus.muetzel@gmx.de> parents: 32353 diff changeset	2137 QT_HOST_LIBEXECS="`$QTPATHS6 --query QT_HOST_LIBEXECS`"
32350 de6e2f546970 build: Improve detection of Qt6 tools. Markus Mützel <markus.muetzel@gmx.de> parents: 32349 diff changeset	2138 fi
de6e2f546970 build: Improve detection of Qt6 tools. Markus Mützel <markus.muetzel@gmx.de> parents: 32349 diff changeset	2139 fi
de6e2f546970 build: Improve detection of Qt6 tools. Markus Mützel <markus.muetzel@gmx.de> parents: 32349 diff changeset	2140 if test -z "$QT_HOST_LIBEXECS"; then
de6e2f546970 build: Improve detection of Qt6 tools. Markus Mützel <markus.muetzel@gmx.de> parents: 32349 diff changeset	2141 AC_CHECK_TOOLS(QMAKE6, [qmake6 qmake-qt6])
de6e2f546970 build: Improve detection of Qt6 tools. Markus Mützel <markus.muetzel@gmx.de> parents: 32349 diff changeset	2142 if test -n "$QMAKE6"; then
32355 bf77e0f86f74 build: Double-quote strings assigned to variables. Markus Mützel <markus.muetzel@gmx.de> parents: 32353 diff changeset	2143 QT_HOST_LIBEXECS="`$QMAKE6 -query QT_HOST_LIBEXECS`"
32350 de6e2f546970 build: Improve detection of Qt6 tools. Markus Mützel <markus.muetzel@gmx.de> parents: 32349 diff changeset	2144 fi
32349 16845da1ca42 build: Use qtpaths6 to get prefix for Qt6 tools. Markus Mützel <markus.muetzel@gmx.de> parents: 32289 diff changeset	2145 fi
32353 9067c860e0f1 build: Avoid issue with AC_PATH_TOOL on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 32351 diff changeset	2146 if test -n "$QT_HOST_LIBEXECS"; then
9067c860e0f1 build: Avoid issue with AC_PATH_TOOL on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 32351 diff changeset	2147 case $host_os in
9067c860e0f1 build: Avoid issue with AC_PATH_TOOL on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 32351 diff changeset	2148 mingw*)
9067c860e0f1 build: Avoid issue with AC_PATH_TOOL on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 32351 diff changeset	2149 AC_CHECK_TOOL(CYGPATH, [cygpath])
9067c860e0f1 build: Avoid issue with AC_PATH_TOOL on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 32351 diff changeset	2150 if test -n "$CYGPATH"; then
32355 bf77e0f86f74 build: Double-quote strings assigned to variables. Markus Mützel <markus.muetzel@gmx.de> parents: 32353 diff changeset	2151 QT_HOST_LIBEXECS="`$CYGPATH -u $QT_HOST_LIBEXECS`"
32353 9067c860e0f1 build: Avoid issue with AC_PATH_TOOL on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 32351 diff changeset	2152 fi
9067c860e0f1 build: Avoid issue with AC_PATH_TOOL on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 32351 diff changeset	2153 ;;
9067c860e0f1 build: Avoid issue with AC_PATH_TOOL on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 32351 diff changeset	2154 esac
9067c860e0f1 build: Avoid issue with AC_PATH_TOOL on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 32351 diff changeset	2155 fi
32356 0cdf8fe8533c build: Look for Qt6 tools also in QT_HOSTS_BINS directory. Markus Mützel <markus.muetzel@gmx.de> parents: 32355 diff changeset	2156 ac_octave_save_QT_HOST_BINS="$QT_HOST_BINS"
0cdf8fe8533c build: Look for Qt6 tools also in QT_HOSTS_BINS directory. Markus Mützel <markus.muetzel@gmx.de> parents: 32355 diff changeset	2157 if test -z "$QT_HOST_BINS"; then
0cdf8fe8533c build: Look for Qt6 tools also in QT_HOSTS_BINS directory. Markus Mützel <markus.muetzel@gmx.de> parents: 32355 diff changeset	2158 AC_CHECK_TOOLS(QTPATHS6, [qtpaths6 qtpaths-qt6])
0cdf8fe8533c build: Look for Qt6 tools also in QT_HOSTS_BINS directory. Markus Mützel <markus.muetzel@gmx.de> parents: 32355 diff changeset	2159 if test -n "$QTPATHS6"; then
0cdf8fe8533c build: Look for Qt6 tools also in QT_HOSTS_BINS directory. Markus Mützel <markus.muetzel@gmx.de> parents: 32355 diff changeset	2160 QT_HOST_BINS="`$QTPATHS6 --query QT_HOST_BINS`"
0cdf8fe8533c build: Look for Qt6 tools also in QT_HOSTS_BINS directory. Markus Mützel <markus.muetzel@gmx.de> parents: 32355 diff changeset	2161 fi
0cdf8fe8533c build: Look for Qt6 tools also in QT_HOSTS_BINS directory. Markus Mützel <markus.muetzel@gmx.de> parents: 32355 diff changeset	2162 fi
0cdf8fe8533c build: Look for Qt6 tools also in QT_HOSTS_BINS directory. Markus Mützel <markus.muetzel@gmx.de> parents: 32355 diff changeset	2163 if test -z "$QT_HOST_BINS"; then
0cdf8fe8533c build: Look for Qt6 tools also in QT_HOSTS_BINS directory. Markus Mützel <markus.muetzel@gmx.de> parents: 32355 diff changeset	2164 AC_CHECK_TOOLS(QMAKE6, [qmake6 qmake-qt6])
0cdf8fe8533c build: Look for Qt6 tools also in QT_HOSTS_BINS directory. Markus Mützel <markus.muetzel@gmx.de> parents: 32355 diff changeset	2165 if test -n "$QMAKE6"; then
0cdf8fe8533c build: Look for Qt6 tools also in QT_HOSTS_BINS directory. Markus Mützel <markus.muetzel@gmx.de> parents: 32355 diff changeset	2166 QT_HOST_BINS="`$QMAKE6 -query QT_HOST_BINS`"
0cdf8fe8533c build: Look for Qt6 tools also in QT_HOSTS_BINS directory. Markus Mützel <markus.muetzel@gmx.de> parents: 32355 diff changeset	2167 fi
0cdf8fe8533c build: Look for Qt6 tools also in QT_HOSTS_BINS directory. Markus Mützel <markus.muetzel@gmx.de> parents: 32355 diff changeset	2168 fi
0cdf8fe8533c build: Look for Qt6 tools also in QT_HOSTS_BINS directory. Markus Mützel <markus.muetzel@gmx.de> parents: 32355 diff changeset	2169 if test -n "$QT_HOST_BINS"; then
0cdf8fe8533c build: Look for Qt6 tools also in QT_HOSTS_BINS directory. Markus Mützel <markus.muetzel@gmx.de> parents: 32355 diff changeset	2170 case $host_os in
0cdf8fe8533c build: Look for Qt6 tools also in QT_HOSTS_BINS directory. Markus Mützel <markus.muetzel@gmx.de> parents: 32355 diff changeset	2171 mingw*)
0cdf8fe8533c build: Look for Qt6 tools also in QT_HOSTS_BINS directory. Markus Mützel <markus.muetzel@gmx.de> parents: 32355 diff changeset	2172 AC_CHECK_TOOL(CYGPATH, [cygpath])
0cdf8fe8533c build: Look for Qt6 tools also in QT_HOSTS_BINS directory. Markus Mützel <markus.muetzel@gmx.de> parents: 32355 diff changeset	2173 if test -n "$CYGPATH"; then
0cdf8fe8533c build: Look for Qt6 tools also in QT_HOSTS_BINS directory. Markus Mützel <markus.muetzel@gmx.de> parents: 32355 diff changeset	2174 QT_HOST_BINS="`$CYGPATH -u $QT_HOST_BINS`"
0cdf8fe8533c build: Look for Qt6 tools also in QT_HOSTS_BINS directory. Markus Mützel <markus.muetzel@gmx.de> parents: 32355 diff changeset	2175 fi
0cdf8fe8533c build: Look for Qt6 tools also in QT_HOSTS_BINS directory. Markus Mützel <markus.muetzel@gmx.de> parents: 32355 diff changeset	2176 ;;
0cdf8fe8533c build: Look for Qt6 tools also in QT_HOSTS_BINS directory. Markus Mützel <markus.muetzel@gmx.de> parents: 32355 diff changeset	2177 esac
0cdf8fe8533c build: Look for Qt6 tools also in QT_HOSTS_BINS directory. Markus Mützel <markus.muetzel@gmx.de> parents: 32355 diff changeset	2178 fi
32349 16845da1ca42 build: Use qtpaths6 to get prefix for Qt6 tools. Markus Mützel <markus.muetzel@gmx.de> parents: 32289 diff changeset	2179 ;;
16845da1ca42 build: Use qtpaths6 to get prefix for Qt6 tools. Markus Mützel <markus.muetzel@gmx.de> parents: 32289 diff changeset	2180 esac
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2181
25135 ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	2182 OCTAVE_CHECK_QT_TOOL([moc])
ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	2183 OCTAVE_CHECK_QT_TOOL([uic])
ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	2184 OCTAVE_CHECK_QT_TOOL([rcc])
ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	2185 OCTAVE_CHECK_QT_TOOL([lrelease])
ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	2186 OCTAVE_CHECK_QT_TOOL([qhelpgenerator])
32349 16845da1ca42 build: Use qtpaths6 to get prefix for Qt6 tools. Markus Mützel <markus.muetzel@gmx.de> parents: 32289 diff changeset	2187 case "$qt_version" in
16845da1ca42 build: Use qtpaths6 to get prefix for Qt6 tools. Markus Mützel <markus.muetzel@gmx.de> parents: 32289 diff changeset	2188 5)
16845da1ca42 build: Use qtpaths6 to get prefix for Qt6 tools. Markus Mützel <markus.muetzel@gmx.de> parents: 32289 diff changeset	2189 OCTAVE_CHECK_QT_TOOL([qcollectiongenerator])
16845da1ca42 build: Use qtpaths6 to get prefix for Qt6 tools. Markus Mützel <markus.muetzel@gmx.de> parents: 32289 diff changeset	2190 ;;
16845da1ca42 build: Use qtpaths6 to get prefix for Qt6 tools. Markus Mützel <markus.muetzel@gmx.de> parents: 32289 diff changeset	2191 6)
32355 bf77e0f86f74 build: Double-quote strings assigned to variables. Markus Mützel <markus.muetzel@gmx.de> parents: 32353 diff changeset	2192 QCOLLECTIONGENERATOR="$QHELPGENERATOR"
32349 16845da1ca42 build: Use qtpaths6 to get prefix for Qt6 tools. Markus Mützel <markus.muetzel@gmx.de> parents: 32289 diff changeset	2193 ;;
16845da1ca42 build: Use qtpaths6 to get prefix for Qt6 tools. Markus Mützel <markus.muetzel@gmx.de> parents: 32289 diff changeset	2194 esac
24873 486bc22482ca Improve Doxygen generation. Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24837 diff changeset	2195
25119 14b9e2a1f3e1 if some Qt tools are instaslled, don't check for another version John W. Eaton <jwe@octave.org> parents: 25114 diff changeset	2196 if test -n "$QT_TOOLS_MISSING"; then
25029 91671d57817e configure: mention qcollectiongenerator and qhelpgenerator in diagnostics (bug #53474) Mike Miller <mtmiller@octave.org> parents: 24938 diff changeset	2197 warn_qt_tools="one or more of the Qt utilities moc, uic, rcc, lrelease, qcollectiongenerator, and qhelpgenerator not found; disabling Qt GUI"
22255 8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	2198 build_qt_gui=no
23154 80a2434ba83c refactor checks for Qt tools (bug #50214) John W. Eaton <jwe@octave.org> parents: 23088 diff changeset	2199 MOC_QTVER=
80a2434ba83c refactor checks for Qt tools (bug #50214) John W. Eaton <jwe@octave.org> parents: 23088 diff changeset	2200 UIC_QTVER=
80a2434ba83c refactor checks for Qt tools (bug #50214) John W. Eaton <jwe@octave.org> parents: 23088 diff changeset	2201 RCC_QTVER=
80a2434ba83c refactor checks for Qt tools (bug #50214) John W. Eaton <jwe@octave.org> parents: 23088 diff changeset	2202 LRELEASE_QTVER=
24875 7c7b60dd4d4c Generate Qt compressed help and collection files for the manual (bug #53006) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24873 diff changeset	2203 QCOLLECTIONGENERATOR_QTVER=
24873 486bc22482ca Improve Doxygen generation. Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24837 diff changeset	2204 QHELPGENERATOR_QTVER=
486bc22482ca Improve Doxygen generation. Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24837 diff changeset	2205 MOCFLAGS=
486bc22482ca Improve Doxygen generation. Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24837 diff changeset	2206 UICFLAGS=
486bc22482ca Improve Doxygen generation. Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24837 diff changeset	2207 RCCFLAGS=
486bc22482ca Improve Doxygen generation. Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24837 diff changeset	2208 LRELEASEFLAGS=
24938 4f1da669b610 build: export and use qcollectiongenerator command line options correctly Mike Miller <mtmiller@octave.org> parents: 24890 diff changeset	2209 QCOLLECTIONGENERATORFLAGS=
24873 486bc22482ca Improve Doxygen generation. Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24837 diff changeset	2210 QHELPGENERATORFLAGS=
32351 469b078fe75b build: Fix errors in de6e2f546970 Markus Mützel <markus.muetzel@gmx.de> parents: 32350 diff changeset	2211 QT_HOST_LIBEXECS="$ac_octave_save_QT_HOST_LIBEXECS"
32356 0cdf8fe8533c build: Look for Qt6 tools also in QT_HOSTS_BINS directory. Markus Mützel <markus.muetzel@gmx.de> parents: 32355 diff changeset	2212 QT_HOST_BINS="$ac_octave_save_QT_HOST_BINS"
23154 80a2434ba83c refactor checks for Qt tools (bug #50214) John W. Eaton <jwe@octave.org> parents: 23088 diff changeset	2213 $as_unset ac_cv_prog_MOC_QTVER
23198 8db35b1a4f63 build: Clear ac_cv_prog_ac_ct_XXXX qt variables if correct qt was not found (Bug #50214) John D parents: 23175 diff changeset	2214 $as_unset ac_cv_prog_ac_ct_MOC_QTVER
23154 80a2434ba83c refactor checks for Qt tools (bug #50214) John W. Eaton <jwe@octave.org> parents: 23088 diff changeset	2215 $as_unset ac_cv_prog_UIC_QTVER
23198 8db35b1a4f63 build: Clear ac_cv_prog_ac_ct_XXXX qt variables if correct qt was not found (Bug #50214) John D parents: 23175 diff changeset	2216 $as_unset ac_cv_prog_ac_ct_UIC_QTVER
23154 80a2434ba83c refactor checks for Qt tools (bug #50214) John W. Eaton <jwe@octave.org> parents: 23088 diff changeset	2217 $as_unset ac_cv_prog_RCC_QTVER
23198 8db35b1a4f63 build: Clear ac_cv_prog_ac_ct_XXXX qt variables if correct qt was not found (Bug #50214) John D parents: 23175 diff changeset	2218 $as_unset ac_cv_prog_ac_ct_RCC_QTVER
23154 80a2434ba83c refactor checks for Qt tools (bug #50214) John W. Eaton <jwe@octave.org> parents: 23088 diff changeset	2219 $as_unset ac_cv_prog_LRELEASE_QTVER
23198 8db35b1a4f63 build: Clear ac_cv_prog_ac_ct_XXXX qt variables if correct qt was not found (Bug #50214) John D parents: 23175 diff changeset	2220 $as_unset ac_cv_prog_ac_ct_LRELEASE_QTVER
24938 4f1da669b610 build: export and use qcollectiongenerator command line options correctly Mike Miller <mtmiller@octave.org> parents: 24890 diff changeset	2221 $as_unset ac_cv_prog_QCOLLECTIONGENERATOR_QTVER
4f1da669b610 build: export and use qcollectiongenerator command line options correctly Mike Miller <mtmiller@octave.org> parents: 24890 diff changeset	2222 $as_unset ac_cv_prog_ac_ct_QCOLLECTIONGENERATOR_QTVER
24873 486bc22482ca Improve Doxygen generation. Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24837 diff changeset	2223 $as_unset ac_cv_prog_QHELPGENERATOR_QTVER
486bc22482ca Improve Doxygen generation. Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24837 diff changeset	2224 $as_unset ac_cv_prog_ac_ct_QHELPGENERATOR_QTVER
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2225 fi
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2226 fi
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2227
22255 8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	2228 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	2229 case $host_os in
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2230 mingw* \| msdosmsvc*)
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2231 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	2232 [build_qt_gui=no
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2233 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	2234 ;;
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2235 *)
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2236 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	2237 AC_SEARCH_LIBS([openpty], [util],
24810 8a92f442c4a2 configure.ac: Overhaul file (bug #53186). Rik <rik@octave.org> parents: 24798 diff changeset	2238 [AC_DEFINE(HAVE_OPENPTY, 1, [Define to 1 if openpty exists])])
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2239 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	2240 [build_qt_gui=no
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2241 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	2242 ;;
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2243 esac
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2244 fi
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2245
22255 8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	2246 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	2247 ## 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	2248 ## 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	2249
8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	2250 AC_DEFINE(HAVE_QT, 1,
25029 91671d57817e configure: mention qcollectiongenerator and qhelpgenerator in diagnostics (bug #53474) Mike Miller <mtmiller@octave.org> parents: 24938 diff changeset	2251 [Define to 1 if Qt is available, with all required functions, libraries, developer header files, and utilities.])
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2252
24827 1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	2253 AC_LANG_PUSH(C++)
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	2254 ac_octave_save_CPPFLAGS="$CPPFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	2255 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	2256 AC_CHECK_HEADERS([QStandardPaths])
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	2257 CPPFLAGS="$ac_octave_save_CPPFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	2258 AC_LANG_POP(C++)
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	2259
22255 8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	2260 ## 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	2261 ## 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	2262 ## 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	2263
28846 2219027f5bd4 avoid deprecated Qt QFontMetrics::width function John W. Eaton <jwe@octave.org> parents: 28845 diff changeset	2264 OCTAVE_CHECK_FUNC_QFONTMETRICS_HORIZONTAL_ADVANCE
25061 5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	2265 OCTAVE_CHECK_FUNC_QHELPSEARCHQUERYWIDGET_SEARCHINPUT
29034 e3bc897115ed Change feature test to OCTAVE_CHECK_NEW_QHELPINDEXWIDGET_API in cset a0ff81c8b8e8. Rik <rik@octave.org> parents: 29031 diff changeset	2266 OCTAVE_CHECK_NEW_QHELPINDEXWIDGET_API
28835 2735fb9007e9 avoid QList deprecated function warnings John W. Eaton <jwe@octave.org> parents: 28527 diff changeset	2267 OCTAVE_CHECK_FUNC_QLIST_ITERATOR_CONSTRUCTOR
29053 0678fdb81efc avoid deprecated QHelpEngine::linksForIdentifier function John W. Eaton <jwe@octave.org> parents: 29049 diff changeset	2268 OCTAVE_CHECK_FUNC_QHELPENGINE_DOCUMENTSFORIDENTIFIER
29048 440ace36950e avoid warnings about deprecated QWheelEvent::pos method John W. Eaton <jwe@octave.org> parents: 29047 diff changeset	2269 OCTAVE_CHECK_FUNC_QWHEELEVENT_POSITION
31212 55415fa6a20f svgconvert: Use Lossless encoding of images when available (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 31134 diff changeset	2270 OCTAVE_CHECK_FUNC_QPAINTER_SETRENDERHINT_LOSSLESS
32005 8f9de7cb4e02 Use appropriate type for arguments of Color::getRgbF and QColor::getHslF. Markus Mützel <markus.muetzel@gmx.de> parents: 32004 diff changeset	2271 OCTAVE_CHECK_FUNC_QCOLOR_FLOAT_TYPE
32006 5724d89e9244 Use QStreamView if available. Markus Mützel <markus.muetzel@gmx.de> parents: 32005 diff changeset	2272 OCTAVE_CHECK_CLASS_QSTRINGVIEW
32008 4d15e1304a48 build: Check for Qt function QTextStream::setEncoding. Markus Mützel <markus.muetzel@gmx.de> parents: 32006 diff changeset	2273 OCTAVE_CHECK_FUNC_QTEXTSTREAM_SETENCODING
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2274
28845 50c112129700 avoid deprecated Qt QRegion::rects function John W. Eaton <jwe@octave.org> parents: 28835 diff changeset	2275 OCTAVE_CHECK_QREGION_ITERATORS
30005 7677b6184c0b use new Qt::ImCursorRectangle enum value if available John W. Eaton <jwe@octave.org> parents: 29949 diff changeset	2276 OCTAVE_CHECK_QT_IMCURSORRECTANGLE_ENUM_VALUE
29049 461bd8b9ce91 use Qt::SplitBehavior enum and values if available John W. Eaton <jwe@octave.org> parents: 29048 diff changeset	2277 OCTAVE_CHECK_QT_SPLITBEHAVIOR_ENUM
28845 50c112129700 avoid deprecated Qt QRegion::rects function John W. Eaton <jwe@octave.org> parents: 28835 diff changeset	2278
22823 e2afee0041bf new configure option, --without-qscintilla John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	2279 OCTAVE_CHECK_QSCINTILLA([$qt_version])
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2280
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2281 fi
32456 4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2282
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2283 if test $build_qt_gui = no; then
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2284 QT_CPPFLAGS=
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2285 QT_LDFLAGS=
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2286 QT_LIBS=
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2287 fi
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2288
4880c4a52bac build: Support setting Qt flags if pkg-config cannot be used. Markus Mützel <markus.muetzel@gmx.de> parents: 32427 diff changeset	2289
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2290 AC_SUBST(MOCFLAGS)
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2291 AC_SUBST(UICFLAGS)
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2292 AC_SUBST(RCCFLAGS)
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2293 AC_SUBST(LRELEASEFLAGS)
24938 4f1da669b610 build: export and use qcollectiongenerator command line options correctly Mike Miller <mtmiller@octave.org> parents: 24890 diff changeset	2294 AC_SUBST(QCOLLECTIONGENERATORFLAGS)
4f1da669b610 build: export and use qcollectiongenerator command line options correctly Mike Miller <mtmiller@octave.org> parents: 24890 diff changeset	2295 AC_SUBST(QHELPGENERATORFLAGS)
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2296 AC_SUBST(QT_CPPFLAGS)
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2297 AC_SUBST(QT_LDFLAGS)
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2298 AC_SUBST(QT_LIBS)
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2299 ])
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2300 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2301 dnl Check if the default Fortran INTEGER is 64 bits wide.
22986 21707d6a02c7 make --enable-64 the default John W. Eaton <jwe@octave.org> parents: 22899 diff changeset	2302 dnl If cross-compiling, assume 4 bytes unless the cache value
21707d6a02c7 make --enable-64 the default John W. Eaton <jwe@octave.org> parents: 22899 diff changeset	2303 dnl is already set.
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2304 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2305 AC_DEFUN([OCTAVE_CHECK_SIZEOF_FORTRAN_INTEGER], [
22986 21707d6a02c7 make --enable-64 the default John W. Eaton <jwe@octave.org> parents: 22899 diff changeset	2306 AC_CACHE_CHECK([default size of Fortran INTEGER],
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2307 [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	2308 [ac_octave_save_FFLAGS="$FFLAGS"
22986 21707d6a02c7 make --enable-64 the default John W. Eaton <jwe@octave.org> parents: 22899 diff changeset	2309 FFLAGS="$FFLAGS $F77_INTEGER_8_FLAG"
21707d6a02c7 make --enable-64 the default John W. Eaton <jwe@octave.org> parents: 22899 diff changeset	2310 AC_LANG_PUSH(Fortran 77)
21707d6a02c7 make --enable-64 the default John W. Eaton <jwe@octave.org> parents: 22899 diff changeset	2311 AC_RUN_IFELSE([AC_LANG_PROGRAM(,[[
21707d6a02c7 make --enable-64 the default John W. Eaton <jwe@octave.org> parents: 22899 diff changeset	2312 integer*8 n8
21707d6a02c7 make --enable-64 the default John W. Eaton <jwe@octave.org> parents: 22899 diff changeset	2313 integer n
21707d6a02c7 make --enable-64 the default John W. Eaton <jwe@octave.org> parents: 22899 diff changeset	2314 c Generate -2**33 + 1.
21707d6a02c7 make --enable-64 the default John W. Eaton <jwe@octave.org> parents: 22899 diff changeset	2315 n8 = 2
21707d6a02c7 make --enable-64 the default John W. Eaton <jwe@octave.org> parents: 22899 diff changeset	2316 n8 = -4 * (n8 ** 30)
21707d6a02c7 make --enable-64 the default John W. Eaton <jwe@octave.org> parents: 22899 diff changeset	2317 n8 = n8 + 1
21707d6a02c7 make --enable-64 the default John W. Eaton <jwe@octave.org> parents: 22899 diff changeset	2318 c Convert to default integer type. If the values are no longer equal,
21707d6a02c7 make --enable-64 the default John W. Eaton <jwe@octave.org> parents: 22899 diff changeset	2319 c assume the default integer size is 32-bits.
21707d6a02c7 make --enable-64 the default John W. Eaton <jwe@octave.org> parents: 22899 diff changeset	2320 n = n8
21707d6a02c7 make --enable-64 the default John W. Eaton <jwe@octave.org> parents: 22899 diff changeset	2321 if (n .ne. n8) stop 1
21707d6a02c7 make --enable-64 the default John W. Eaton <jwe@octave.org> parents: 22899 diff changeset	2322 ]])],
21707d6a02c7 make --enable-64 the default John W. Eaton <jwe@octave.org> parents: 22899 diff changeset	2323 octave_cv_sizeof_fortran_integer=8,
21707d6a02c7 make --enable-64 the default John W. Eaton <jwe@octave.org> parents: 22899 diff changeset	2324 octave_cv_sizeof_fortran_integer=4,
21707d6a02c7 make --enable-64 the default John W. Eaton <jwe@octave.org> parents: 22899 diff changeset	2325 octave_cv_sizeof_fortran_integer=4)
24022 84a52be0cf53 configure: fix restoring of FFLAGS when checking Fortran integer size Mike Miller <mtmiller@octave.org> parents: 23981 diff changeset	2326 AC_LANG_POP(Fortran 77)
84a52be0cf53 configure: fix restoring of FFLAGS when checking Fortran integer size Mike Miller <mtmiller@octave.org> parents: 23981 diff changeset	2327 FFLAGS="$ac_octave_save_FFLAGS"
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2328 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2329 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2330 dnl
33158 baf7621aa073 build: Improve checks for SUNDIALS 7 compatibility (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 33132 diff changeset	2331 dnl Check for library that exports SUNContext_Create.
baf7621aa073 build: Improve checks for SUNDIALS 7 compatibility (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 33132 diff changeset	2332 dnl
baf7621aa073 build: Improve checks for SUNDIALS 7 compatibility (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 33132 diff changeset	2333 AC_DEFUN([OCTAVE_CHECK_SUNDIALS_SUNCONTEXT_CREATE], [
33227 557fbfea93ab build: Avoid overriding save_* variables from outer scope (bug #65476). Markus Mützel <markus.muetzel@gmx.de> parents: 33158 diff changeset	2334 ac_octave_save_LIBS=$LIBS
33158 baf7621aa073 build: Improve checks for SUNDIALS 7 compatibility (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 33132 diff changeset	2335 LIBS="$SUNDIALS_IDA_LIBS $SUNDIALS_NVECSERIAL_LIBS $LIBS"
baf7621aa073 build: Improve checks for SUNDIALS 7 compatibility (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 33132 diff changeset	2336 dnl Check for SUNContext_Create without linking to libsundials_core.
baf7621aa073 build: Improve checks for SUNDIALS 7 compatibility (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 33132 diff changeset	2337 dnl That should succeed for SUNDIALS version 6.
baf7621aa073 build: Improve checks for SUNDIALS 7 compatibility (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 33132 diff changeset	2338 AC_CHECK_FUNC([SUNContext_Create])
33227 557fbfea93ab build: Avoid overriding save_* variables from outer scope (bug #65476). Markus Mützel <markus.muetzel@gmx.de> parents: 33158 diff changeset	2339 LIBS="$ac_octave_save_LIBS"
33158 baf7621aa073 build: Improve checks for SUNDIALS 7 compatibility (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 33132 diff changeset	2340 if test "x$ac_cv_func_SUNContext_Create" != xyes; then
baf7621aa073 build: Improve checks for SUNDIALS 7 compatibility (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 33132 diff changeset	2341 ## SUNDIALS version 7 exports SUNContext_Create from libsundials_core
33227 557fbfea93ab build: Avoid overriding save_* variables from outer scope (bug #65476). Markus Mützel <markus.muetzel@gmx.de> parents: 33158 diff changeset	2342 ac_octave_save_CPPFLAGS="$CPPFLAGS"
557fbfea93ab build: Avoid overriding save_* variables from outer scope (bug #65476). Markus Mützel <markus.muetzel@gmx.de> parents: 33158 diff changeset	2343 ac_octave_save_LDFLAGS="$LDFLAGS"
557fbfea93ab build: Avoid overriding save_* variables from outer scope (bug #65476). Markus Mützel <markus.muetzel@gmx.de> parents: 33158 diff changeset	2344 ac_octave_save_LIBS="$LIBS"
33158 baf7621aa073 build: Improve checks for SUNDIALS 7 compatibility (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 33132 diff changeset	2345 LIBS="$SUNDIALS_CORE_LIBS $LIBS"
baf7621aa073 build: Improve checks for SUNDIALS 7 compatibility (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 33132 diff changeset	2346 LDFLAGS="$SUNDIALS_CORE_LDFLAGS $LDFLAGS"
baf7621aa073 build: Improve checks for SUNDIALS 7 compatibility (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 33132 diff changeset	2347 CPPFLAGS="$SUNDIALS_CORE_CPPFLAGS $CPPFLAGS"
baf7621aa073 build: Improve checks for SUNDIALS 7 compatibility (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 33132 diff changeset	2348 ## Unset cache variable from previous check
baf7621aa073 build: Improve checks for SUNDIALS 7 compatibility (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 33132 diff changeset	2349 unset ac_cv_func_SUNContext_Create
baf7621aa073 build: Improve checks for SUNDIALS 7 compatibility (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 33132 diff changeset	2350 OCTAVE_CHECK_LIB(sundials_core, [SUNDIALS core], [],
baf7621aa073 build: Improve checks for SUNDIALS 7 compatibility (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 33132 diff changeset	2351 [sundials_core.h sundials/sundials_core.h], [SUNContext_Create],
baf7621aa073 build: Improve checks for SUNDIALS 7 compatibility (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 33132 diff changeset	2352 [], [])
33227 557fbfea93ab build: Avoid overriding save_* variables from outer scope (bug #65476). Markus Mützel <markus.muetzel@gmx.de> parents: 33158 diff changeset	2353 CPPFLAGS="$ac_octave_save_CPPFLAGS"
557fbfea93ab build: Avoid overriding save_* variables from outer scope (bug #65476). Markus Mützel <markus.muetzel@gmx.de> parents: 33158 diff changeset	2354 LDFLAGS="$ac_octave_save_LDFLAGS"
557fbfea93ab build: Avoid overriding save_* variables from outer scope (bug #65476). Markus Mützel <markus.muetzel@gmx.de> parents: 33158 diff changeset	2355 LIBS="$ac_octave_save_LIBS"
33158 baf7621aa073 build: Improve checks for SUNDIALS 7 compatibility (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 33132 diff changeset	2356 fi
baf7621aa073 build: Improve checks for SUNDIALS 7 compatibility (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 33132 diff changeset	2357 if test "x$ac_cv_func_SUNContext_Create" = xyes \
baf7621aa073 build: Improve checks for SUNDIALS 7 compatibility (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 33132 diff changeset	2358 \|\| test "x$octave_cv_lib_sundials_core" = xyes; then
baf7621aa073 build: Improve checks for SUNDIALS 7 compatibility (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 33132 diff changeset	2359 ## SUNDIALS prior to version 6 does not need SUNContext_Create
baf7621aa073 build: Improve checks for SUNDIALS 7 compatibility (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 33132 diff changeset	2360 AC_DEFINE(HAVE_SUNDIALS_SUNCONTEXT, 1,
baf7621aa073 build: Improve checks for SUNDIALS 7 compatibility (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 33132 diff changeset	2361 [Define to 1 if SUNDIALS API uses a SUNContext object.])
baf7621aa073 build: Improve checks for SUNDIALS 7 compatibility (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 33132 diff changeset	2362 fi
baf7621aa073 build: Improve checks for SUNDIALS 7 compatibility (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 33132 diff changeset	2363 ])
baf7621aa073 build: Improve checks for SUNDIALS 7 compatibility (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 33132 diff changeset	2364 dnl
26991 c188513f5496 configure: disable building with SUNDIALS when the API is too old (bug #55937) Mike Miller <mtmiller@octave.org> parents: 26938 diff changeset	2365 dnl Check whether SUNDIALS libraries provide a compatible interface.
c188513f5496 configure: disable building with SUNDIALS when the API is too old (bug #55937) Mike Miller <mtmiller@octave.org> parents: 26938 diff changeset	2366 dnl The current recommended interface was introduced in SUNDIALS version 4.
c188513f5496 configure: disable building with SUNDIALS when the API is too old (bug #55937) Mike Miller <mtmiller@octave.org> parents: 26938 diff changeset	2367 dnl The deprecated interface that Octave currently works to be compatible with
c188513f5496 configure: disable building with SUNDIALS when the API is too old (bug #55937) Mike Miller <mtmiller@octave.org> parents: 26938 diff changeset	2368 dnl was introduced in SUNDIALS version 3.
c188513f5496 configure: disable building with SUNDIALS when the API is too old (bug #55937) Mike Miller <mtmiller@octave.org> parents: 26938 diff changeset	2369 dnl
c188513f5496 configure: disable building with SUNDIALS when the API is too old (bug #55937) Mike Miller <mtmiller@octave.org> parents: 26938 diff changeset	2370 AC_DEFUN([OCTAVE_CHECK_SUNDIALS_COMPATIBLE_API], [
c188513f5496 configure: disable building with SUNDIALS when the API is too old (bug #55937) Mike Miller <mtmiller@octave.org> parents: 26938 diff changeset	2371 ac_octave_save_LIBS=$LIBS
27013 b37c1656aa42 configure: test all SUNKLU functions after core SUNDIALS features (bug #55937) Mike Miller <mtmiller@octave.org> parents: 26992 diff changeset	2372 LIBS="$SUNDIALS_IDA_LIBS $SUNDIALS_NVECSERIAL_LIBS $LIBS"
26991 c188513f5496 configure: disable building with SUNDIALS when the API is too old (bug #55937) Mike Miller <mtmiller@octave.org> parents: 26938 diff changeset	2373 dnl Current API functions present in SUNDIALS version 4
33158 baf7621aa073 build: Improve checks for SUNDIALS 7 compatibility (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 33132 diff changeset	2374 AC_CHECK_FUNCS([IDASetJacFn IDASetLinearSolver SUNLinSol_Dense SUNSparseMatrix_Reallocate])
26991 c188513f5496 configure: disable building with SUNDIALS when the API is too old (bug #55937) Mike Miller <mtmiller@octave.org> parents: 26938 diff changeset	2375 dnl FIXME: The purpose of the following tests is to detect the deprecated
c188513f5496 configure: disable building with SUNDIALS when the API is too old (bug #55937) Mike Miller <mtmiller@octave.org> parents: 26938 diff changeset	2376 dnl API from SUNDIALS version 3, which should only be used if the current
c188513f5496 configure: disable building with SUNDIALS when the API is too old (bug #55937) Mike Miller <mtmiller@octave.org> parents: 26938 diff changeset	2377 dnl API tests above failed. For now, always test for ida_direct.h.
c188513f5496 configure: disable building with SUNDIALS when the API is too old (bug #55937) Mike Miller <mtmiller@octave.org> parents: 26938 diff changeset	2378 AC_CHECK_HEADERS([ida/ida_direct.h ida_direct.h])
c188513f5496 configure: disable building with SUNDIALS when the API is too old (bug #55937) Mike Miller <mtmiller@octave.org> parents: 26938 diff changeset	2379 dnl Each of these is a deprecated analog to the functions listed above.
27013 b37c1656aa42 configure: test all SUNKLU functions after core SUNDIALS features (bug #55937) Mike Miller <mtmiller@octave.org> parents: 26992 diff changeset	2380 AC_CHECK_FUNCS([IDADlsSetJacFn IDADlsSetLinearSolver SUNDenseLinearSolver])
26991 c188513f5496 configure: disable building with SUNDIALS when the API is too old (bug #55937) Mike Miller <mtmiller@octave.org> parents: 26938 diff changeset	2381 LIBS=$ac_octave_save_LIBS
c188513f5496 configure: disable building with SUNDIALS when the API is too old (bug #55937) Mike Miller <mtmiller@octave.org> parents: 26938 diff changeset	2382 AC_MSG_CHECKING([whether SUNDIALS API provides the necessary functions])
c188513f5496 configure: disable building with SUNDIALS when the API is too old (bug #55937) Mike Miller <mtmiller@octave.org> parents: 26938 diff changeset	2383 if test "x$ac_cv_func_IDASetJacFn" = xyes \
c188513f5496 configure: disable building with SUNDIALS when the API is too old (bug #55937) Mike Miller <mtmiller@octave.org> parents: 26938 diff changeset	2384 && test "x$ac_cv_func_IDASetLinearSolver" = xyes \
c188513f5496 configure: disable building with SUNDIALS when the API is too old (bug #55937) Mike Miller <mtmiller@octave.org> parents: 26938 diff changeset	2385 && test "x$ac_cv_func_SUNLinSol_Dense" = xyes; then
c188513f5496 configure: disable building with SUNDIALS when the API is too old (bug #55937) Mike Miller <mtmiller@octave.org> parents: 26938 diff changeset	2386 octave_have_sundials_compatible_api=yes
c188513f5496 configure: disable building with SUNDIALS when the API is too old (bug #55937) Mike Miller <mtmiller@octave.org> parents: 26938 diff changeset	2387 elif test "x$ac_cv_func_IDADlsSetJacFn" = xyes \
c188513f5496 configure: disable building with SUNDIALS when the API is too old (bug #55937) Mike Miller <mtmiller@octave.org> parents: 26938 diff changeset	2388 && test "x$ac_cv_func_IDADlsSetLinearSolver" = xyes \
c188513f5496 configure: disable building with SUNDIALS when the API is too old (bug #55937) Mike Miller <mtmiller@octave.org> parents: 26938 diff changeset	2389 && test "x$ac_cv_func_SUNDenseLinearSolver" = xyes; then
c188513f5496 configure: disable building with SUNDIALS when the API is too old (bug #55937) Mike Miller <mtmiller@octave.org> parents: 26938 diff changeset	2390 octave_have_sundials_compatible_api=yes
c188513f5496 configure: disable building with SUNDIALS when the API is too old (bug #55937) Mike Miller <mtmiller@octave.org> parents: 26938 diff changeset	2391 else
c188513f5496 configure: disable building with SUNDIALS when the API is too old (bug #55937) Mike Miller <mtmiller@octave.org> parents: 26938 diff changeset	2392 octave_have_sundials_compatible_api=no
c188513f5496 configure: disable building with SUNDIALS when the API is too old (bug #55937) Mike Miller <mtmiller@octave.org> parents: 26938 diff changeset	2393 fi
c188513f5496 configure: disable building with SUNDIALS when the API is too old (bug #55937) Mike Miller <mtmiller@octave.org> parents: 26938 diff changeset	2394 AC_MSG_RESULT([$octave_have_sundials_compatible_api])
c188513f5496 configure: disable building with SUNDIALS when the API is too old (bug #55937) Mike Miller <mtmiller@octave.org> parents: 26938 diff changeset	2395 if test $octave_have_sundials_compatible_api = no; then
26992 05f389459461 configure: avoid excessive SUNDIALS warning messages when already disabled Mike Miller <mtmiller@octave.org> parents: 26991 diff changeset	2396 warn_sundials_disabled="SUNDIALS libraries do not provide an API that is compatible with Octave. The solvers ode15i and ode15s will be disabled."
05f389459461 configure: avoid excessive SUNDIALS warning messages when already disabled Mike Miller <mtmiller@octave.org> parents: 26991 diff changeset	2397 OCTAVE_CONFIGURE_WARNING([warn_sundials_disabled])
26991 c188513f5496 configure: disable building with SUNDIALS when the API is too old (bug #55937) Mike Miller <mtmiller@octave.org> parents: 26938 diff changeset	2398 fi
c188513f5496 configure: disable building with SUNDIALS when the API is too old (bug #55937) Mike Miller <mtmiller@octave.org> parents: 26938 diff changeset	2399 ])
c188513f5496 configure: disable building with SUNDIALS when the API is too old (bug #55937) Mike Miller <mtmiller@octave.org> parents: 26938 diff changeset	2400 dnl
33132 2c8ade2c7491 Fix compatibility with SUNDIALS 7 (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 32632 diff changeset	2401 dnl Check whether SUNDIALS IDA uses sunrealtype.
2c8ade2c7491 Fix compatibility with SUNDIALS 7 (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 32632 diff changeset	2402 dnl
2c8ade2c7491 Fix compatibility with SUNDIALS 7 (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 32632 diff changeset	2403 AC_DEFUN([OCTAVE_CHECK_SUNDIALS_SUNREALTYPE], [
2c8ade2c7491 Fix compatibility with SUNDIALS 7 (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 32632 diff changeset	2404 AC_CACHE_CHECK([whether SUNDIALS IDA uses sunrealtype],
2c8ade2c7491 Fix compatibility with SUNDIALS 7 (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 32632 diff changeset	2405 [octave_cv_sundials_has_sunrealtype],
2c8ade2c7491 Fix compatibility with SUNDIALS 7 (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 32632 diff changeset	2406 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
2c8ade2c7491 Fix compatibility with SUNDIALS 7 (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 32632 diff changeset	2407 #if defined (HAVE_IDA_IDA_H)
2c8ade2c7491 Fix compatibility with SUNDIALS 7 (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 32632 diff changeset	2408 # include <ida/ida.h>
2c8ade2c7491 Fix compatibility with SUNDIALS 7 (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 32632 diff changeset	2409 #endif
2c8ade2c7491 Fix compatibility with SUNDIALS 7 (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 32632 diff changeset	2410 ]], [[
2c8ade2c7491 Fix compatibility with SUNDIALS 7 (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 32632 diff changeset	2411 sunrealtype test;
2c8ade2c7491 Fix compatibility with SUNDIALS 7 (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 32632 diff changeset	2412 ]])],
2c8ade2c7491 Fix compatibility with SUNDIALS 7 (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 32632 diff changeset	2413 octave_cv_sundials_has_sunrealtype=yes,
2c8ade2c7491 Fix compatibility with SUNDIALS 7 (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 32632 diff changeset	2414 octave_cv_sundials_has_sunrealtype=no)
2c8ade2c7491 Fix compatibility with SUNDIALS 7 (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 32632 diff changeset	2415 ])
2c8ade2c7491 Fix compatibility with SUNDIALS 7 (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 32632 diff changeset	2416 if test $octave_cv_sundials_has_sunrealtype = no; then
2c8ade2c7491 Fix compatibility with SUNDIALS 7 (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 32632 diff changeset	2417 OCTAVE_SUNREALTYPE=realtype
2c8ade2c7491 Fix compatibility with SUNDIALS 7 (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 32632 diff changeset	2418 else
2c8ade2c7491 Fix compatibility with SUNDIALS 7 (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 32632 diff changeset	2419 OCTAVE_SUNREALTYPE=sunrealtype
2c8ade2c7491 Fix compatibility with SUNDIALS 7 (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 32632 diff changeset	2420 fi
2c8ade2c7491 Fix compatibility with SUNDIALS 7 (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 32632 diff changeset	2421 AC_SUBST(OCTAVE_SUNREALTYPE)
2c8ade2c7491 Fix compatibility with SUNDIALS 7 (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 32632 diff changeset	2422 AC_DEFINE_UNQUOTED(OCTAVE_SUNREALTYPE, [$OCTAVE_SUNREALTYPE],
2c8ade2c7491 Fix compatibility with SUNDIALS 7 (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 32632 diff changeset	2423 [Define to the type used for real numbers by SUNDIALS.])
2c8ade2c7491 Fix compatibility with SUNDIALS 7 (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 32632 diff changeset	2424 ])
2c8ade2c7491 Fix compatibility with SUNDIALS 7 (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 32632 diff changeset	2425 dnl
23981 6420142ff32c configure: fix capitalization of SUNDIALS, reword related terms Mike Miller <mtmiller@octave.org> parents: 23980 diff changeset	2426 dnl Check whether SUNDIALS IDA library is configured with double
23021 6094018f5e72 refactor configure checks for Sundials (bug #50003) John W. Eaton <jwe@octave.org> parents: 23017 diff changeset	2427 dnl precision realtype.
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2428 dnl
23980 eb6602171d59 configure: make SUNDIALS double precision test cross-compile-safe (bug #51904) Mike Miller <mtmiller@octave.org> parents: 23836 diff changeset	2429 AC_DEFUN([OCTAVE_CHECK_SUNDIALS_SIZEOF_REALTYPE], [
23981 6420142ff32c configure: fix capitalization of SUNDIALS, reword related terms Mike Miller <mtmiller@octave.org> parents: 23980 diff changeset	2430 AC_CACHE_CHECK([whether SUNDIALS IDA is configured with double precision realtype],
23980 eb6602171d59 configure: make SUNDIALS double precision test cross-compile-safe (bug #51904) Mike Miller <mtmiller@octave.org> parents: 23836 diff changeset	2431 [octave_cv_sundials_realtype_is_double],
eb6602171d59 configure: make SUNDIALS double precision test cross-compile-safe (bug #51904) Mike Miller <mtmiller@octave.org> parents: 23836 diff changeset	2432 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
22899 31bd8a50d44c Add Sundials library support Francesco Faccio <francesco.faccio@mail.polimi.it> parents: 22890 diff changeset	2433 #if defined (HAVE_IDA_IDA_H)
26900 ebe7e12765ba fix sundials configure warnings (bug #55911) John W. Eaton <jwe@octave.org> parents: 26898 diff changeset	2434 # include <ida/ida.h>
22899 31bd8a50d44c Add Sundials library support Francesco Faccio <francesco.faccio@mail.polimi.it> parents: 22890 diff changeset	2435 #endif
31bd8a50d44c Add Sundials library support Francesco Faccio <francesco.faccio@mail.polimi.it> parents: 22890 diff changeset	2436 #include <assert.h>
31bd8a50d44c Add Sundials library support Francesco Faccio <francesco.faccio@mail.polimi.it> parents: 22890 diff changeset	2437 ]], [[
33132 2c8ade2c7491 Fix compatibility with SUNDIALS 7 (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 32632 diff changeset	2438 static_assert (sizeof (OCTAVE_SUNREALTYPE) == sizeof (double),
23980 eb6602171d59 configure: make SUNDIALS double precision test cross-compile-safe (bug #51904) Mike Miller <mtmiller@octave.org> parents: 23836 diff changeset	2439 "SUNDIALS is not configured for double precision");
22899 31bd8a50d44c Add Sundials library support Francesco Faccio <francesco.faccio@mail.polimi.it> parents: 22890 diff changeset	2440 ]])],
23980 eb6602171d59 configure: make SUNDIALS double precision test cross-compile-safe (bug #51904) Mike Miller <mtmiller@octave.org> parents: 23836 diff changeset	2441 octave_cv_sundials_realtype_is_double=yes,
eb6602171d59 configure: make SUNDIALS double precision test cross-compile-safe (bug #51904) Mike Miller <mtmiller@octave.org> parents: 23836 diff changeset	2442 octave_cv_sundials_realtype_is_double=no)
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2443 ])
23980 eb6602171d59 configure: make SUNDIALS double precision test cross-compile-safe (bug #51904) Mike Miller <mtmiller@octave.org> parents: 23836 diff changeset	2444 if test $octave_cv_sundials_realtype_is_double = no; then
26992 05f389459461 configure: avoid excessive SUNDIALS warning messages when already disabled Mike Miller <mtmiller@octave.org> parents: 26991 diff changeset	2445 warn_sundials_disabled="SUNDIALS IDA library not configured with double precision realtype. The solvers ode15i and ode15s will be disabled."
05f389459461 configure: avoid excessive SUNDIALS warning messages when already disabled Mike Miller <mtmiller@octave.org> parents: 26991 diff changeset	2446 OCTAVE_CONFIGURE_WARNING([warn_sundials_disabled])
23021 6094018f5e72 refactor configure checks for Sundials (bug #50003) John W. Eaton <jwe@octave.org> parents: 23017 diff changeset	2447 fi
6094018f5e72 refactor configure checks for Sundials (bug #50003) John W. Eaton <jwe@octave.org> parents: 23017 diff changeset	2448 ])
6094018f5e72 refactor configure checks for Sundials (bug #50003) John W. Eaton <jwe@octave.org> parents: 23017 diff changeset	2449 dnl
29367 8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2450 dnl Check whether SUNDIALS IDA library has the SUNLINSOL_DENSE linear solver.
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2451 dnl
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2452 AC_DEFUN([OCTAVE_CHECK_SUNDIALS_SUNLINSOL_DENSE], [
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2453 AC_CHECK_HEADERS([sunlinsol/sunlinsol_dense.h],
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2454 octave_cv_sundials_sunlinsol_dense=yes,
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2455 octave_cv_sundials_sunlinsol_dense=no)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2456 ])
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2457 if test $octave_cv_sundials_sunlinsol_dense = yes; then
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2458 AC_DEFINE(HAVE_SUNDIALS_SUNLINSOL_DENSE, 1,
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2459 [Define to 1 if SUNDIALS IDA includes the SUNLINSOL_DENSE linear solver.])
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2460 else
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2461 warn_sundials_disabled="SUNDIALS IDA library does not include the SUNLINSOL_DENSE linear solver. The solvers ode15i and ode15s will be disabled."
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2462 OCTAVE_CONFIGURE_WARNING([warn_sundials_disabled])
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2463 fi
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2464 ])
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2465 dnl
26894 ee6300e77c92 Update detection of sundials in the build system (bug #52475). Carlo de Falco <carlo.defalco@polimi.it> parents: 26889 diff changeset	2466 dnl Check whether SUNDIALS IDA library is configured with SUNLINSOL_KLU
23021 6094018f5e72 refactor configure checks for Sundials (bug #50003) John W. Eaton <jwe@octave.org> parents: 23017 diff changeset	2467 dnl enabled.
6094018f5e72 refactor configure checks for Sundials (bug #50003) John W. Eaton <jwe@octave.org> parents: 23017 diff changeset	2468 dnl
26894 ee6300e77c92 Update detection of sundials in the build system (bug #52475). Carlo de Falco <carlo.defalco@polimi.it> parents: 26889 diff changeset	2469 AC_DEFUN([OCTAVE_CHECK_SUNDIALS_SUNLINSOL_KLU], [
26938 58e300954518 search for klu.h in more places (bug #55950) John W. Eaton <jwe@octave.org> parents: 26937 diff changeset	2470 ## Including <sunlinsol/sunlinsol_klu.h> may depend on including klu.h
58e300954518 search for klu.h in more places (bug #55950) John W. Eaton <jwe@octave.org> parents: 26937 diff changeset	2471 ## first. So perform the check as follows using several different
58e300954518 search for klu.h in more places (bug #55950) John W. Eaton <jwe@octave.org> parents: 26937 diff changeset	2472 ## possible locations for klu.h instead of using OCTAVE_CHECK_LIB to
58e300954518 search for klu.h in more places (bug #55950) John W. Eaton <jwe@octave.org> parents: 26937 diff changeset	2473 ## check for sunlinsol_klu.h.
58e300954518 search for klu.h in more places (bug #55950) John W. Eaton <jwe@octave.org> parents: 26937 diff changeset	2474 AC_CHECK_HEADERS([klu.h klu/klu.h suitesparse/klu.h ufsparse/klu.h])
26937 cfa2a65c9fdc fix sunlinsol_klu.h detection with sundials 4.x (bug #55950) John W. Eaton <jwe@octave.org> parents: 26923 diff changeset	2475 AC_CHECK_HEADERS([sunlinsol/sunlinsol_klu.h], [], [],
26938 58e300954518 search for klu.h in more places (bug #55950) John W. Eaton <jwe@octave.org> parents: 26937 diff changeset	2476 [#if defined (HAVE_KLU_H)
58e300954518 search for klu.h in more places (bug #55950) John W. Eaton <jwe@octave.org> parents: 26937 diff changeset	2477 # include <klu.h>
58e300954518 search for klu.h in more places (bug #55950) John W. Eaton <jwe@octave.org> parents: 26937 diff changeset	2478 #elif defined (HAVE_KLU_KLU_H)
58e300954518 search for klu.h in more places (bug #55950) John W. Eaton <jwe@octave.org> parents: 26937 diff changeset	2479 # include <klu/klu.h>
58e300954518 search for klu.h in more places (bug #55950) John W. Eaton <jwe@octave.org> parents: 26937 diff changeset	2480 #elif defined (HAVE_SUITESPARSE_KLU_H)
58e300954518 search for klu.h in more places (bug #55950) John W. Eaton <jwe@octave.org> parents: 26937 diff changeset	2481 # include <suitesparse/klu.h>
58e300954518 search for klu.h in more places (bug #55950) John W. Eaton <jwe@octave.org> parents: 26937 diff changeset	2482 #elif defined (HAVE_UFSPARSE_KLU_H)
58e300954518 search for klu.h in more places (bug #55950) John W. Eaton <jwe@octave.org> parents: 26937 diff changeset	2483 # include <ufsparse/klu.h>
26937 cfa2a65c9fdc fix sunlinsol_klu.h detection with sundials 4.x (bug #55950) John W. Eaton <jwe@octave.org> parents: 26923 diff changeset	2484 #endif
cfa2a65c9fdc fix sunlinsol_klu.h detection with sundials 4.x (bug #55950) John W. Eaton <jwe@octave.org> parents: 26923 diff changeset	2485 ])
33158 baf7621aa073 build: Improve checks for SUNDIALS 7 compatibility (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 33132 diff changeset	2486 ## Check for library that exports SUNContext_Create
baf7621aa073 build: Improve checks for SUNDIALS 7 compatibility (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 33132 diff changeset	2487 OCTAVE_CHECK_SUNDIALS_SUNCONTEXT_CREATE
30547 b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 30543 diff changeset	2488 ## Check for current KLU function name first.
33227 557fbfea93ab build: Avoid overriding save_* variables from outer scope (bug #65476). Markus Mützel <markus.muetzel@gmx.de> parents: 33158 diff changeset	2489 ac_octave_save_CPPFLAGS="$CPPFLAGS"
557fbfea93ab build: Avoid overriding save_* variables from outer scope (bug #65476). Markus Mützel <markus.muetzel@gmx.de> parents: 33158 diff changeset	2490 ac_octave_save_LDFLAGS="$LDFLAGS"
557fbfea93ab build: Avoid overriding save_* variables from outer scope (bug #65476). Markus Mützel <markus.muetzel@gmx.de> parents: 33158 diff changeset	2491 ac_octave_save_LIBS="$LIBS"
33158 baf7621aa073 build: Improve checks for SUNDIALS 7 compatibility (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 33132 diff changeset	2492 CPPFLAGS="$SUNDIALS_CORE_CPPFLAGS $CPPFLAGS"
baf7621aa073 build: Improve checks for SUNDIALS 7 compatibility (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 33132 diff changeset	2493 LDFLAGS="$SUNDIALS_CORE_LDFLAGS $LDFLAGS"
baf7621aa073 build: Improve checks for SUNDIALS 7 compatibility (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 33132 diff changeset	2494 LIBS="$SUNDIALS_CORE_LIBS $LIBS"
26910 075c4d3bf1de use OCTAVE_CHECK_LIB to check for sundials_sunlinsolklu library John W. Eaton <jwe@octave.org> parents: 26909 diff changeset	2495 OCTAVE_CHECK_LIB(sundials_sunlinsolklu, SUNLINSOL_KLU, [],
30547 b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 30543 diff changeset	2496 [], [SUNLinSol_KLU], [],
26992 05f389459461 configure: avoid excessive SUNDIALS warning messages when already disabled Mike Miller <mtmiller@octave.org> parents: 26991 diff changeset	2497 [don't use SUNDIALS SUNLINSOL_KLU library, disable ode15i and ode15s sparse Jacobian],
30547 b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 30543 diff changeset	2498 [AC_CHECK_FUNCS([SUNLinSol_KLU])
b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 30543 diff changeset	2499 AC_CACHE_CHECK([whether compiling a program that calls SUNLinSol_KLU works],
26910 075c4d3bf1de use OCTAVE_CHECK_LIB to check for sundials_sunlinsolklu library John W. Eaton <jwe@octave.org> parents: 26909 diff changeset	2500 [octave_cv_sundials_sunlinsol_klu],
075c4d3bf1de use OCTAVE_CHECK_LIB to check for sundials_sunlinsolklu library John W. Eaton <jwe@octave.org> parents: 26909 diff changeset	2501 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
26894 ee6300e77c92 Update detection of sundials in the build system (bug #52475). Carlo de Falco <carlo.defalco@polimi.it> parents: 26889 diff changeset	2502 #if defined (HAVE_IDA_IDA_H)
ee6300e77c92 Update detection of sundials in the build system (bug #52475). Carlo de Falco <carlo.defalco@polimi.it> parents: 26889 diff changeset	2503 #include <ida/ida.h>
ee6300e77c92 Update detection of sundials in the build system (bug #52475). Carlo de Falco <carlo.defalco@polimi.it> parents: 26889 diff changeset	2504 #endif
26895 a1acd11bad19 Directly include klu.h in __ode15__.cc (bug #52475). Carlo de Falco <carlo.defalco@polimi.it> parents: 26894 diff changeset	2505 #if defined (HAVE_KLU_H)
a1acd11bad19 Directly include klu.h in __ode15__.cc (bug #52475). Carlo de Falco <carlo.defalco@polimi.it> parents: 26894 diff changeset	2506 #include <klu.h>
a1acd11bad19 Directly include klu.h in __ode15__.cc (bug #52475). Carlo de Falco <carlo.defalco@polimi.it> parents: 26894 diff changeset	2507 #endif
a1acd11bad19 Directly include klu.h in __ode15__.cc (bug #52475). Carlo de Falco <carlo.defalco@polimi.it> parents: 26894 diff changeset	2508 #if defined (HAVE_KLU_KLU_H)
a1acd11bad19 Directly include klu.h in __ode15__.cc (bug #52475). Carlo de Falco <carlo.defalco@polimi.it> parents: 26894 diff changeset	2509 #include <klu/klu.h>
a1acd11bad19 Directly include klu.h in __ode15__.cc (bug #52475). Carlo de Falco <carlo.defalco@polimi.it> parents: 26894 diff changeset	2510 #endif
a1acd11bad19 Directly include klu.h in __ode15__.cc (bug #52475). Carlo de Falco <carlo.defalco@polimi.it> parents: 26894 diff changeset	2511 #if defined (HAVE_SUITESPARSE_KLU_H)
a1acd11bad19 Directly include klu.h in __ode15__.cc (bug #52475). Carlo de Falco <carlo.defalco@polimi.it> parents: 26894 diff changeset	2512 #include <suitesparse/klu.h>
a1acd11bad19 Directly include klu.h in __ode15__.cc (bug #52475). Carlo de Falco <carlo.defalco@polimi.it> parents: 26894 diff changeset	2513 #endif
a1acd11bad19 Directly include klu.h in __ode15__.cc (bug #52475). Carlo de Falco <carlo.defalco@polimi.it> parents: 26894 diff changeset	2514 #if defined (HAVE_UFPARSE_KLU_H)
a1acd11bad19 Directly include klu.h in __ode15__.cc (bug #52475). Carlo de Falco <carlo.defalco@polimi.it> parents: 26894 diff changeset	2515 #include <ufsparse/klu.h>
a1acd11bad19 Directly include klu.h in __ode15__.cc (bug #52475). Carlo de Falco <carlo.defalco@polimi.it> parents: 26894 diff changeset	2516 #endif
26894 ee6300e77c92 Update detection of sundials in the build system (bug #52475). Carlo de Falco <carlo.defalco@polimi.it> parents: 26889 diff changeset	2517 #if defined (HAVE_SUNLINSOL_SUNLINSOL_KLU_H)
ee6300e77c92 Update detection of sundials in the build system (bug #52475). Carlo de Falco <carlo.defalco@polimi.it> parents: 26889 diff changeset	2518 #include <sunlinsol/sunlinsol_klu.h>
23021 6094018f5e72 refactor configure checks for Sundials (bug #50003) John W. Eaton <jwe@octave.org> parents: 23017 diff changeset	2519 #endif
6094018f5e72 refactor configure checks for Sundials (bug #50003) John W. Eaton <jwe@octave.org> parents: 23017 diff changeset	2520 ]], [[
33158 baf7621aa073 build: Improve checks for SUNDIALS 7 compatibility (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 33132 diff changeset	2521 #if defined (HAVE_SUNDIALS_SUNCONTEXT)
baf7621aa073 build: Improve checks for SUNDIALS 7 compatibility (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 33132 diff changeset	2522 # if ! defined (SUN_COMM_NULL)
baf7621aa073 build: Improve checks for SUNDIALS 7 compatibility (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 33132 diff changeset	2523 # define SUN_COMM_NULL NULL
baf7621aa073 build: Improve checks for SUNDIALS 7 compatibility (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 33132 diff changeset	2524 # endif
30547 b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 30543 diff changeset	2525 SUNContext *sunContext;
33158 baf7621aa073 build: Improve checks for SUNDIALS 7 compatibility (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 33132 diff changeset	2526 if (SUNContext_Create (SUN_COMM_NULL, sunContext) < 0)
30547 b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 30543 diff changeset	2527 1/0; // provoke an error
b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 30543 diff changeset	2528 SUNLinSol_KLU (0, 0, *sunContext);
b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 30543 diff changeset	2529 SUNContext_Free (sunContext);
b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 30543 diff changeset	2530 #else
b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 30543 diff changeset	2531 SUNLinSol_KLU (0, 0);
b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 30543 diff changeset	2532 #endif
23021 6094018f5e72 refactor configure checks for Sundials (bug #50003) John W. Eaton <jwe@octave.org> parents: 23017 diff changeset	2533 ]])],
26894 ee6300e77c92 Update detection of sundials in the build system (bug #52475). Carlo de Falco <carlo.defalco@polimi.it> parents: 26889 diff changeset	2534 octave_cv_sundials_sunlinsol_klu=yes,
ee6300e77c92 Update detection of sundials in the build system (bug #52475). Carlo de Falco <carlo.defalco@polimi.it> parents: 26889 diff changeset	2535 octave_cv_sundials_sunlinsol_klu=no)
26910 075c4d3bf1de use OCTAVE_CHECK_LIB to check for sundials_sunlinsolklu library John W. Eaton <jwe@octave.org> parents: 26909 diff changeset	2536 ])])
30547 b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 30543 diff changeset	2537 if test "x$octave_cv_sundials_sunlinsol_klu" = xno; then
b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 30543 diff changeset	2538 ## Check for deprecated KLU function name second.
b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 30543 diff changeset	2539 OCTAVE_CHECK_LIB(sundials_sunlinsolklu, SUNLINSOL_KLU, [],
b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 30543 diff changeset	2540 [], [SUNKLU], [],
b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 30543 diff changeset	2541 [don't use SUNDIALS SUNLINSOL_KLU library, disable ode15i and ode15s sparse Jacobian],
b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 30543 diff changeset	2542 [AC_CHECK_FUNCS([SUNKLU])
33158 baf7621aa073 build: Improve checks for SUNDIALS 7 compatibility (bug #65392). Markus Mützel <markus.muetzel@gmx.de> parents: 33132 diff changeset	2543 AC_CACHE_CHECK([whether compiling a program that calls SUNKLU works],
30547 b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 30543 diff changeset	2544 [octave_cv_sundials_sunlinsol_klu],
b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 30543 diff changeset	2545 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 30543 diff changeset	2546 #if defined (HAVE_IDA_IDA_H)
b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 30543 diff changeset	2547 #include <ida/ida.h>
b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 30543 diff changeset	2548 #endif
b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 30543 diff changeset	2549 #if defined (HAVE_KLU_H)
b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 30543 diff changeset	2550 #include <klu.h>
b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 30543 diff changeset	2551 #endif
b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 30543 diff changeset	2552 #if defined (HAVE_KLU_KLU_H)
b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 30543 diff changeset	2553 #include <klu/klu.h>
b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 30543 diff changeset	2554 #endif
b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 30543 diff changeset	2555 #if defined (HAVE_SUITESPARSE_KLU_H)
b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 30543 diff changeset	2556 #include <suitesparse/klu.h>
b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 30543 diff changeset	2557 #endif
b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 30543 diff changeset	2558 #if defined (HAVE_UFPARSE_KLU_H)
b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 30543 diff changeset	2559 #include <ufsparse/klu.h>
b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 30543 diff changeset	2560 #endif
b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 30543 diff changeset	2561 #if defined (HAVE_SUNLINSOL_SUNLINSOL_KLU_H)
b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 30543 diff changeset	2562 #include <sunlinsol/sunlinsol_klu.h>
b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 30543 diff changeset	2563 #endif
b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 30543 diff changeset	2564 ]], [[
b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 30543 diff changeset	2565 SUNKLU (0, 0);
b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 30543 diff changeset	2566 ]])],
b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 30543 diff changeset	2567 octave_cv_sundials_sunlinsol_klu=yes,
b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 30543 diff changeset	2568 octave_cv_sundials_sunlinsol_klu=no)
b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 30543 diff changeset	2569 ])])
b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 30543 diff changeset	2570 fi
26923 c81b471cdb28 build: avoid test syntax error in sundials configuration (bug #55926) Mike Miller <mtmiller@octave.org> parents: 26910 diff changeset	2571 if test "x$ac_cv_header_sunlinsol_sunlinsol_klu_h" = xyes \
c81b471cdb28 build: avoid test syntax error in sundials configuration (bug #55926) Mike Miller <mtmiller@octave.org> parents: 26910 diff changeset	2572 && test "x$octave_cv_sundials_sunlinsol_klu" = xyes; then
26894 ee6300e77c92 Update detection of sundials in the build system (bug #52475). Carlo de Falco <carlo.defalco@polimi.it> parents: 26889 diff changeset	2573 AC_DEFINE(HAVE_SUNDIALS_SUNLINSOL_KLU, 1,
ee6300e77c92 Update detection of sundials in the build system (bug #52475). Carlo de Falco <carlo.defalco@polimi.it> parents: 26889 diff changeset	2574 [Define to 1 if SUNDIALS IDA is configured with SUNLINSOL_KLU enabled.])
23021 6094018f5e72 refactor configure checks for Sundials (bug #50003) John W. Eaton <jwe@octave.org> parents: 23017 diff changeset	2575 else
31324 1c4e017664fd build: Fix typo in warning message about missing SUNLinSol-KLU feature. Markus Mützel <markus.muetzel@gmx.de> parents: 31212 diff changeset	2576 warn_sundials_sunlinsol_klu="SUNDIALS IDA library not configured with SUNLINSOL_KLU or sunlinsol_klu.h is not usable. The solvers ode15i and ode15s will not support the sparse Jacobian feature."
26894 ee6300e77c92 Update detection of sundials in the build system (bug #52475). Carlo de Falco <carlo.defalco@polimi.it> parents: 26889 diff changeset	2577 OCTAVE_CONFIGURE_WARNING([warn_sundials_sunlinsol_klu])
22899 31bd8a50d44c Add Sundials library support Francesco Faccio <francesco.faccio@mail.polimi.it> parents: 22890 diff changeset	2578 fi
33227 557fbfea93ab build: Avoid overriding save_* variables from outer scope (bug #65476). Markus Mützel <markus.muetzel@gmx.de> parents: 33158 diff changeset	2579 CPPFLAGS="$ac_octave_save_CPPFLAGS"
557fbfea93ab build: Avoid overriding save_* variables from outer scope (bug #65476). Markus Mützel <markus.muetzel@gmx.de> parents: 33158 diff changeset	2580 LDFLAGS="$ac_octave_save_LDFLAGS"
557fbfea93ab build: Avoid overriding save_* variables from outer scope (bug #65476). Markus Mützel <markus.muetzel@gmx.de> parents: 33158 diff changeset	2581 LIBS="$ac_octave_save_LIBS"
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2582 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2583 dnl
29367 8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2584 dnl Like AC_CONFIG_FILES, but don't touch the output file if it already
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2585 dnl exists and hasn't changed.
28938 8592190176a8 build: Re-instate configure test for SUNLinSol_Dense header (bug #59248). Markus Mützel <markus.muetzel@gmx.de> parents: 28933 diff changeset	2586 dnl
29367 8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2587 AC_DEFUN([OCTAVE_CONFIG_MOVE_IF_CHANGE_FILES], [
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2588 m4_foreach_w([elt], [$1], [
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2589 AC_CONFIG_FILES(elt[-tmp:]patsubst(elt, [.sh$], [.in.sh]))
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2590 AC_CONFIG_COMMANDS(elt,
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2591 [$SHELL $srcdir/build-aux/move-if-change ]elt[-tmp ]elt)])])
28938 8592190176a8 build: Re-instate configure test for SUNLinSol_Dense header (bug #59248). Markus Mützel <markus.muetzel@gmx.de> parents: 28933 diff changeset	2592 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2593 dnl Add warning to final summary.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2594 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2595 AC_DEFUN([OCTAVE_CONFIGURE_WARNING], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2596 AC_MSG_WARN([$][$1])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2597 m4_set_add([summary_warning_list], [$1])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2598 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2599 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2600 dnl Print final summary.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2601 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2602 AC_DEFUN([OCTAVE_CONFIGURE_WARNING_SUMMARY], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2603 m4_set_foreach([summary_warning_list], [elt], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2604 if test -n "[$]elt"; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2605 AC_MSG_WARN([$]elt)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2606 warn_msg_printed=true
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2607 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	2608 ])
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	2609 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2610 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	2611 dnl templates defined.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2612 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2613 AC_DEFUN([OCTAVE_CXX_BITWISE_OP_TEMPLATES], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2614 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	2615 [octave_cv_cxx_bitwise_op_templates],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2616 [AC_LANG_PUSH(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2617 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2618 #include <functional>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2619 ]], [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2620 int x = 0;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2621 int y = 1;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2622 int z1 = std::bit_and<int>() (x, y);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2623 int z2 = std::bit_or<int>() (x, y);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2624 int z3 = std::bit_xor<int>() (x, y);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2625 ]])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2626 octave_cv_cxx_bitwise_op_templates=yes,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2627 octave_cv_cxx_bitwise_op_templates=no)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2628 AC_LANG_POP(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2629 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2630 if test $octave_cv_cxx_bitwise_op_templates = yes; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2631 AC_DEFINE(HAVE_CXX_BITWISE_OP_TEMPLATES, 1,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2632 [Define to 1 if C++ library has templated bitwise operators.])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2633 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2634 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2635 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2636 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	2637 dnl parts of complex numbers independently via references.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2638 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2639 AC_DEFUN([OCTAVE_CXX_COMPLEX_REFERENCE_ACCESSORS], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2640 AC_CACHE_CHECK([whether complex class can reference components independently],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2641 [octave_cv_cxx_complex_reference_accessors],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2642 [AC_LANG_PUSH(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2643 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2644 #include <complex>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2645 ]], [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2646 std::complex<double> x;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2647 x.real () = 1.0;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2648 x.imag () = 1.0;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2649 ]])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2650 octave_cv_cxx_complex_reference_accessors=yes,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2651 octave_cv_cxx_complex_reference_accessors=no)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2652 AC_LANG_POP(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2653 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2654 if test $octave_cv_cxx_complex_reference_accessors = yes; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2655 AC_DEFINE(HAVE_CXX_COMPLEX_REFERENCE_ACCESSORS, 1,
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31754 diff changeset	2656 [Define to 1 if C++ complex class has T& real () and T& imag () methods.])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2657 fi
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 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	2661 dnl parts of complex numbers independently.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2662 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2663 AC_DEFUN([OCTAVE_CXX_COMPLEX_SETTERS], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2664 AC_CACHE_CHECK([whether complex class can set components independently],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2665 [octave_cv_cxx_complex_setters],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2666 [AC_LANG_PUSH(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2667 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2668 #include <complex>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2669 ]], [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2670 std::complex<double> x;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2671 x.real (1.0);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2672 x.imag (2.0);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2673 ]])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2674 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	2675 AC_LANG_POP(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2676 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2677 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	2678 AC_DEFINE(HAVE_CXX_COMPLEX_SETTERS, 1,
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2679 [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	2680 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2681 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2682 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2683 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	2684 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2685 AC_DEFUN([OCTAVE_CXX_DYNAMIC_AUTO_ARRAYS], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2686 AC_CACHE_CHECK([whether C++ supports dynamic auto arrays],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2687 [octave_cv_cxx_dynamic_auto_arrays],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2688 [AC_LANG_PUSH(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2689 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2690 void test(char *);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2691 int length();
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2692 char x[length()];
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2693 test(x);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2694 ]])],
17034 8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	2695 octave_cv_cxx_dynamic_auto_arrays=yes,
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2696 octave_cv_cxx_dynamic_auto_arrays=no)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2697 AC_LANG_POP(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2698 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2699 if test $octave_cv_cxx_dynamic_auto_arrays = yes; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2700 AC_DEFINE(HAVE_DYNAMIC_AUTO_ARRAYS, 1,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2701 [Define to 1 if C++ supports dynamic auto arrays.])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2702 fi
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 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2705 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	2706 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	2707 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	2708 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2709 AC_DEFUN([OCTAVE_CXX_FLAG], [
17661 1978a6c76aa9 Use user-specified SED during build process (bug #40273). Rik <rik@octave.org> parents: 17615 diff changeset	2710 ac_safe=`echo "$1" \| $SED 'y%./+-:=%__p___%'`
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2711 AC_MSG_CHECKING([whether ${CXX-g++} accepts $1])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2712 AC_CACHE_VAL([octave_cv_cxx_flag_$ac_safe],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2713 [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	2714 ac_octave_save_CXXFLAGS="$CXXFLAGS"
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2715 CXXFLAGS="$CXXFLAGS $1"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2716 AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2717 eval "octave_cv_cxx_flag_$ac_safe=yes",
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2718 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	2719 CXXFLAGS="$ac_octave_save_CXXFLAGS"
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2720 AC_LANG_POP(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2721 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2722 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	2723 AC_MSG_RESULT([yes])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2724 ifelse([$2], ,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2725 [CXXFLAGS="$CXXFLAGS $1"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2726 AC_MSG_RESULT([adding $1 to CXXFLAGS])], [$2])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2727 else
15319 daf74ce2afdc m4/acinclude.m4: Use more consistent m4 quoting of arguments to macros. Rik <rik@octave.org> parents: 15302 diff changeset	2728 AC_MSG_RESULT([no])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2729 ifelse([$3], , , [$3])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2730 fi
10471 bcabc1c4f20c Add detection of OpenMP support to configure. Disabled by default David Bateman <dbateman@free.fr> parents: 10380 diff changeset	2731 ])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2732 dnl
29367 8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2733 dnl OCTAVE_DEFINE_MKOCTFILE_DYNAMIC_LINK_OPTIONS
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2734 dnl
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2735 dnl Requires the following variables to already be set:
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2736 dnl
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2737 dnl AR
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2738 dnl CFLAGS
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2739 dnl CXX
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2740 dnl CXXFLAGS
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2741 dnl EXEEXT
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2742 dnl GCC
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2743 dnl GREP
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2744 dnl GXX
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2745 dnl LDFLAGS
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2746 dnl ac_cv_f77_compiler_gnu
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2747 dnl canonical_host_type
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2748 dnl have_msvc
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2749 dnl
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2750 AC_DEFUN_ONCE([OCTAVE_DEFINE_MKOCTFILE_DYNAMIC_LINK_OPTIONS], [
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2751 ### Set system-dependent options for building shared libraries.
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2752 ### These are used by mkoctfile to create dynamically loadable
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2753 ### .oct and .mex files. It would be great if we could somehow
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2754 ### use libtool to get this information.
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2755
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2756 CPICFLAG=-fPIC
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2757 CXXPICFLAG=-fPIC
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2758 FPICFLAG=-fPIC
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2759 SH_LDFLAGS=-shared
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2760 DL_LDFLAGS="${SH_LDFLAGS}"
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2761 MKOCTFILE_DL_LDFLAGS="${DL_LDFLAGS}"
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2762 NO_OCT_FILE_STRIP=false
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2763 TEMPLATE_AR="${AR}"
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2764 TEMPLATE_ARFLAGS="${ARFLAGS}"
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2765 library_path_var=LD_LIBRARY_PATH
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2766 ldpreloadsep=" "
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2767 case $canonical_host_type in
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2768 --386bsd* \| --netbsd*)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2769 SH_LDFLAGS=-Bshareable
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2770 ;;
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2771 --openbsd*)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2772 SH_LDFLAGS="-shared -fPIC"
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2773 ;;
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2774 --freebsd*)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2775 SH_LDFLAGS="-shared -Wl,-x"
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2776 ;;
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2777 alpha-dec-osf)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2778 CPICFLAG=
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2779 CXXPICFLAG=
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2780 FPICFLAG=
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2781 SH_LDFLAGS="-shared -Wl,-expect_unresolved -Wl,'*'"
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2782 ;;
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2783 --darwin*)
31491 212e9ad58f69 build: Fix building .mex files in build tree on macOS. Markus Mützel <markus.muetzel@gmx.de> parents: 31424 diff changeset	2784 dnl Contains variables that are defined and undefined at this point,
212e9ad58f69 build: Fix building .mex files in build tree on macOS. Markus Mützel <markus.muetzel@gmx.de> parents: 31424 diff changeset	2785 dnl so use appropriate quoting to defer expansion of
212e9ad58f69 build: Fix building .mex files in build tree on macOS. Markus Mützel <markus.muetzel@gmx.de> parents: 31424 diff changeset	2786 dnl ${abs_top_builddir}, ${bindir}, and ${version}.
212e9ad58f69 build: Fix building .mex files in build tree on macOS. Markus Mützel <markus.muetzel@gmx.de> parents: 31424 diff changeset	2787 DL_LDFLAGS='-bundle -undefined dynamic_lookup -bind_at_load -bundle_loader ${abs_top_builddir}/src/octave'"${EXEEXT} ${LDFLAGS}"
29588 b4cb9d04f3cf build: Use dynamic symbol lookup for functions in libraries on macOS (bug #53627). Andrew Janke <andrew@apjanke.net> parents: 29560 diff changeset	2788 MKOCTFILE_DL_LDFLAGS='-bundle -undefined dynamic_lookup -bind_at_load -bundle_loader ${bindir}/octave-${version}'"${EXEEXT}"
29367 8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2789 SH_LDFLAGS="-dynamiclib -single_module ${LDFLAGS}"
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2790 case $canonical_host_type in
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2791 powerpc-*)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2792 CXXPICFLAG=
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2793 CPICFLAG=
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2794 FPICFLAG=
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2795 ;;
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2796 esac
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2797 NO_OCT_FILE_STRIP=true
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2798 library_path_var=DYLD_LIBRARY_PATH
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2799 ;;
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2800 --cygwin*)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2801 CPICFLAG=
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2802 CXXPICFLAG=
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2803 FPICFLAG=
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2804 DL_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc"
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2805 SH_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-auto-image-base"
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2806 ldpreloadsep=":"
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2807 ;;
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2808 --mingw*)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2809 if test $have_msvc = yes; then
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2810 DL_LDFLAGS="-shared"
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2811 CPICFLAG=
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2812 CXXPICFLAG=
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2813 FPICFLAG=
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2814 SH_LDFLAGS="-shared"
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2815 if test -n "`echo $CFLAGS \| $GREP -e '-g'`" \|\| test -n "`echo $CXXFLAGS \| $GREP -e '-g'`"; then
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2816 DL_LDFLAGS="$DL_LDFLAGS -g"
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2817 SH_LDFLAGS="$SH_LDFLAGS -g"
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2818 fi
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2819 NO_OCT_FILE_STRIP=true
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2820 library_path_var=PATH
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2821 else
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2822 CPICFLAG=
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2823 CXXPICFLAG=
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2824 FPICFLAG=
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2825 DL_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc"
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2826 SH_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-auto-image-base"
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2827 library_path_var=PATH
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2828 fi
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2829 ;;
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2830 --msdosmsvc)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2831 DL_LDFLAGS="-shared"
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2832 CPICFLAG=
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2833 CXXPICFLAG=
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2834 FPICFLAG=
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2835 SH_LDFLAGS="-shared"
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2836 if test -n "`echo $CFLAGS \| $GREP -e '-g'`" \|\| test -n "`echo $CXXFLAGS \| $GREP -e '-g'`"; then
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2837 DL_LDFLAGS="$DL_LDFLAGS -g"
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2838 SH_LDFLAGS="$SH_LDFLAGS -g"
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2839 fi
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2840 NO_OCT_FILE_STRIP=true
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2841 library_path_var=PATH
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2842 ;;
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2843 --linux* \| --gnu*)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2844 MKOCTFILE_DL_LDFLAGS="-shared -Wl,-Bsymbolic"
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2845 ;;
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2846 i[[3456]]86--sco3.2v5)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2847 SH_LDFLAGS=-G
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2848 ;;
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2849 rs6000-ibm-aix* \| powerpc-ibm-aix*)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2850 CPICFLAG=
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2851 CXXPICFLAG=
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2852 FPICFLAG=
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2853 library_path_var=LIBPATH
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2854 ;;
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2855 hppa-hp-hpux)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2856 if test $ac_cv_f77_compiler_gnu = yes; then
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2857 FPICFLAG=-fPIC
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2858 else
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2859 FPICFLAG=+Z
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2860 fi
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2861 SH_LDFLAGS="-shared -fPIC"
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2862 library_path_var=SHLIB_PATH
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2863 ;;
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2864 ia64-hp-hpux)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2865 if test $ac_cv_f77_compiler_gnu = yes; then
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2866 FPICFLAG=-fPIC
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2867 else
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2868 FPICFLAG=+Z
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2869 fi
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2870 SH_LDFLAGS="-shared -fPIC"
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2871 ;;
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2872 -sgi-)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2873 CPICFLAG=
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2874 CXXPICFLAG=
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2875 FPICFLAG=
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2876 ;;
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2877 sparc-sun-sunos4*)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2878 if test $ac_cv_f77_compiler_gnu = yes; then
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2879 FPICFLAG=-fPIC
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2880 else
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2881 FPICFLAG=-PIC
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2882 fi
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2883 SH_LDFLAGS="-assert nodefinitions"
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2884 ;;
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2885 sparc-sun-solaris2* \| i386-pc-solaris2*)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2886 if test $ac_cv_f77_compiler_gnu = yes; then
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2887 FPICFLAG=-fPIC
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2888 else
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2889 FPICFLAG=-KPIC
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2890 fi
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2891 if test "$GCC" = yes; then
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2892 CPICFLAG=-fPIC
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2893 else
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2894 CPICFLAG=-KPIC
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2895 fi
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2896 if test "$GXX" = yes; then
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2897 CXXPICFLAG=-fPIC
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2898 SH_LDFLAGS=-shared
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2899 else
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2900 CXXPICFLAG=-KPIC
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2901 SH_LDFLAGS=-G
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2902 fi
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2903 ## Template closures in archive libraries need a different mechanism.
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2904 if test "$GXX" != yes; then
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2905 TEMPLATE_AR="${CXX}"
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2906 TEMPLATE_ARFLAGS="-xar -o"
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2907 fi
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2908 ;;
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2909 esac
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2910
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2911 AC_MSG_NOTICE([defining FPICFLAG to be $FPICFLAG])
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2912 AC_MSG_NOTICE([defining CPICFLAG to be $CPICFLAG])
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2913 AC_MSG_NOTICE([defining CXXPICFLAG to be $CXXPICFLAG])
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2914 AC_MSG_NOTICE([defining SH_LDFLAGS to be $SH_LDFLAGS])
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2915 AC_MSG_NOTICE([defining DL_LDFLAGS to be $DL_LDFLAGS])
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2916 AC_MSG_NOTICE([defining MKOCTFILE_DL_LDFLAGS to be $MKOCTFILE_DL_LDFLAGS])
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2917 AC_MSG_NOTICE([defining NO_OCT_FILE_STRIP to be $NO_OCT_FILE_STRIP])
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2918 AC_MSG_NOTICE([defining TEMPLATE_AR to be $TEMPLATE_AR])
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2919 AC_MSG_NOTICE([defining TEMPLATE_ARFLAGS to be $TEMPLATE_ARFLAGS])
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2920 AC_MSG_NOTICE([defining library_path_var to be $library_path_var])
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2921 AC_SUBST(FPICFLAG)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2922 AC_SUBST(CPICFLAG)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2923 AC_SUBST(CXXPICFLAG)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2924 AC_SUBST(SH_LDFLAGS)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2925 AC_SUBST(DL_LDFLAGS)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2926 AC_SUBST(MKOCTFILE_DL_LDFLAGS)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2927 AC_SUBST(NO_OCT_FILE_STRIP)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2928 AC_SUBST(TEMPLATE_AR)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2929 AC_SUBST(TEMPLATE_ARFLAGS)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2930 AC_SUBST(library_path_var)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2931 AC_SUBST(ldpreloadsep)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2932 AM_SUBST_NOTMAKE(ldpreloadsep)
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2933 ])
8608b7e50720 maint: sort m4 macros alphabetically in acinclude.m4. Rik <rik@octave.org> parents: 29366 diff changeset	2934 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2935 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	2936 dnl readline.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2937 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2938 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	2939 USE_READLINE=yes
15319 daf74ce2afdc m4/acinclude.m4: Use more consistent m4 quoting of arguments to macros. Rik <rik@octave.org> parents: 15302 diff changeset	2940 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	2941 [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	2942 [do not use readline library])],
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2943 [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	2944 USE_READLINE=no
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2945 warn_readline="command editing and history features require GNU Readline"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2946 fi])
16068 b309a5da17f5 use yes/no instead of true/false in confgure scripts John W. Eaton <jwe@octave.org> parents: 16012 diff changeset	2947 if test $USE_READLINE = yes; then
31415 00e2eafd1c0f build: Use gnulib module to get readline libraries. Markus Mützel <markus.muetzel@gmx.de> parents: 31345 diff changeset	2948 gl_FUNC_READLINE
00e2eafd1c0f build: Use gnulib module to get readline libraries. Markus Mützel <markus.muetzel@gmx.de> parents: 31345 diff changeset	2949 if test "$gl_cv_lib_readline" != no; then
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2950 AC_DEFINE(USE_READLINE, 1, [Define to 1 to use the readline library.])
31415 00e2eafd1c0f build: Use gnulib module to get readline libraries. Markus Mützel <markus.muetzel@gmx.de> parents: 31345 diff changeset	2951 else
00e2eafd1c0f build: Use gnulib module to get readline libraries. Markus Mützel <markus.muetzel@gmx.de> parents: 31345 diff changeset	2952 AC_MSG_WARN([I need GNU Readline 4.2 or later])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2953 AC_MSG_ERROR([this is fatal unless you specify --disable-readline])
31415 00e2eafd1c0f build: Use gnulib module to get readline libraries. Markus Mützel <markus.muetzel@gmx.de> parents: 31345 diff changeset	2954 fi
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2955 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2956 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2957 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2958 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	2959 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	2960 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	2961 dnl the flag.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2962 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2963 AC_DEFUN([OCTAVE_F77_FLAG], [
17661 1978a6c76aa9 Use user-specified SED during build process (bug #40273). Rik <rik@octave.org> parents: 17615 diff changeset	2964 ac_safe=`echo "$1" \| $SED 'y%./+-:=%__p___%'`
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2965 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	2966 AC_CACHE_VAL([octave_cv_f77_flag_$ac_safe], [
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2967 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	2968 ac_octave_save_FFLAGS="$FFLAGS"
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2969 FFLAGS="$FFLAGS $1"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2970 AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2971 eval "octave_cv_f77_flag_$ac_safe=yes",
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2972 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	2973 FFLAGS="$ac_octave_save_FFLAGS"
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2974 AC_LANG_POP(Fortran 77)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2975 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2976 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	2977 AC_MSG_RESULT([yes])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2978 ifelse([$2], ,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2979 [FFLAGS="$FFLAGS $1"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2980 AC_MSG_RESULT([adding $1 to FFLAGS])], [$2])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2981 else
15319 daf74ce2afdc m4/acinclude.m4: Use more consistent m4 quoting of arguments to macros. Rik <rik@octave.org> parents: 15302 diff changeset	2982 AC_MSG_RESULT([no])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2983 ifelse([$3], , , [$3])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2984 fi
10471 bcabc1c4f20c Add detection of OpenMP support to configure. Disabled by default David Bateman <dbateman@free.fr> parents: 10380 diff changeset	2985 ])
bcabc1c4f20c Add detection of OpenMP support to configure. Disabled by default David Bateman <dbateman@free.fr> parents: 10380 diff changeset	2986 dnl
8595 dee5d60257e4 Use Carbon framework to determine ScreenSize on Mac. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8169 diff changeset	2987 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	2988 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	2989 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	2990 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	2991 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	2992 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	2993 dnl
9654 a307a6f77fb3 aclocal.m4: consistently quote first arg to AC_DEFUN John W. Eaton <jwe@octave.org> parents: 9645 diff changeset	2994 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	2995 AC_MSG_CHECKING([whether ${LD-ld} accepts -framework $1])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2996 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	2997 [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	2998 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	2999 AC_LANG_PUSH(C++)
8595 dee5d60257e4 Use Carbon framework to determine ScreenSize on Mac. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8169 diff changeset	3000 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	3001 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	3002 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	3003 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	3004 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	3005 ])
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	3006 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	3007 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	3008 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	3009 [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	3010 [don't use framework $1])],
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3011 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	3012 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	3013 [$4]
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	3014 :
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	3015 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	3016 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	3017 [$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	3018 fi
8595 dee5d60257e4 Use Carbon framework to determine ScreenSize on Mac. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8169 diff changeset	3019 else
15319 daf74ce2afdc m4/acinclude.m4: Use more consistent m4 quoting of arguments to macros. Rik <rik@octave.org> parents: 15302 diff changeset	3020 AC_MSG_RESULT([no])
8595 dee5d60257e4 Use Carbon framework to determine ScreenSize on Mac. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8169 diff changeset	3021 [$5]
dee5d60257e4 Use Carbon framework to determine ScreenSize on Mac. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8169 diff changeset	3022 fi
dee5d60257e4 Use Carbon framework to determine ScreenSize on Mac. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8169 diff changeset	3023 ])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3024 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3025 dnl Check for IEEE 754 data format.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3026 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3027 AC_DEFUN([OCTAVE_IEEE754_DATA_FORMAT], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3028 AC_MSG_CHECKING([for IEEE 754 data format])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3029 AC_CACHE_VAL([octave_cv_ieee754_data_format],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3030 [AC_RUN_IFELSE([AC_LANG_SOURCE([[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3031 int
17034 8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	3032 main (void)
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3033 {
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3034 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	3035
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3036 ieeebytes l = {0x1c, 0xbc, 0x6e, 0xf2, 0x54, 0x8b, 0x11, 0x43};
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3037 ieeebytes b = {0x43, 0x11, 0x8b, 0x54, 0xf2, 0x6e, 0xbc, 0x1c};
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3038
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3039 return l.d != 1234567891234567.0 && b.d != 1234567891234567.0;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3040 }
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3041 ]])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3042 octave_cv_ieee754_data_format=yes,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3043 octave_cv_ieee754_data_format=no,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3044 octave_cv_ieee754_data_format=yes)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3045 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3046 if test "$cross_compiling" = yes; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3047 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	3048 else
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3049 AC_MSG_RESULT([$octave_cv_ieee754_data_format])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3050 fi
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	3051 if test $octave_cv_ieee754_data_format = yes; then
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3052 AC_DEFINE(HAVE_IEEE754_DATA_FORMAT, 1,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3053 [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	3054 else
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3055 ## 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	3056 ## useful system, so we will abort here. Anyone wishing to
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3057 ## experiment with building Octave on a system without IEEE
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3058 ## floating point should be capable of removing this check and
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3059 ## 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	3060 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	3061 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3062 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3063 dnl
29365 e9b7ac7031fb Compute with NA correctly on MIPS architecture (bug #59830). Rik <rik@octave.org> parents: 29358 diff changeset	3064 dnl Check if MIPS processor is target and quiet signalling NaN value is
e9b7ac7031fb Compute with NA correctly on MIPS architecture (bug #59830). Rik <rik@octave.org> parents: 29358 diff changeset	3065 dnl opposite of IEEE 754-2008 standard used by all other architectures.
e9b7ac7031fb Compute with NA correctly on MIPS architecture (bug #59830). Rik <rik@octave.org> parents: 29358 diff changeset	3066 dnl
e9b7ac7031fb Compute with NA correctly on MIPS architecture (bug #59830). Rik <rik@octave.org> parents: 29358 diff changeset	3067 AC_DEFUN([OCTAVE_MIPS_NAN], [
e9b7ac7031fb Compute with NA correctly on MIPS architecture (bug #59830). Rik <rik@octave.org> parents: 29358 diff changeset	3068 AC_CACHE_CHECK([whether MIPS processor is using non-standard NaN encoding],
e9b7ac7031fb Compute with NA correctly on MIPS architecture (bug #59830). Rik <rik@octave.org> parents: 29358 diff changeset	3069 [octave_cv_mips_nan],
e9b7ac7031fb Compute with NA correctly on MIPS architecture (bug #59830). Rik <rik@octave.org> parents: 29358 diff changeset	3070 [AC_LANG_PUSH(C++)
e9b7ac7031fb Compute with NA correctly on MIPS architecture (bug #59830). Rik <rik@octave.org> parents: 29358 diff changeset	3071 AC_RUN_IFELSE([AC_LANG_PROGRAM([[
e9b7ac7031fb Compute with NA correctly on MIPS architecture (bug #59830). Rik <rik@octave.org> parents: 29358 diff changeset	3072 #include <cmath>
e9b7ac7031fb Compute with NA correctly on MIPS architecture (bug #59830). Rik <rik@octave.org> parents: 29358 diff changeset	3073 #include <limits>
e9b7ac7031fb Compute with NA correctly on MIPS architecture (bug #59830). Rik <rik@octave.org> parents: 29358 diff changeset	3074 ]], [[
e9b7ac7031fb Compute with NA correctly on MIPS architecture (bug #59830). Rik <rik@octave.org> parents: 29358 diff changeset	3075 /* FIXME: Only test is that MIPS is the target architecture.
e9b7ac7031fb Compute with NA correctly on MIPS architecture (bug #59830). Rik <rik@octave.org> parents: 29358 diff changeset	3076 * This should be AND'ed with a test for whether the actual NaN
e9b7ac7031fb Compute with NA correctly on MIPS architecture (bug #59830). Rik <rik@octave.org> parents: 29358 diff changeset	3077 * value for the high word (LO_IEEE_NA_HW) has the value
e9b7ac7031fb Compute with NA correctly on MIPS architecture (bug #59830). Rik <rik@octave.org> parents: 29358 diff changeset	3078 * 0x7FF840F4 (normal) or 0x7FF040F4 (non-standard). Template code
e9b7ac7031fb Compute with NA correctly on MIPS architecture (bug #59830). Rik <rik@octave.org> parents: 29358 diff changeset	3079 * that could work is in liboctave/utils/lo-ieee.cc but it also
e9b7ac7031fb Compute with NA correctly on MIPS architecture (bug #59830). Rik <rik@octave.org> parents: 29358 diff changeset	3080 * depends on knowing whether the architecture is big-endian or
e9b7ac7031fb Compute with NA correctly on MIPS architecture (bug #59830). Rik <rik@octave.org> parents: 29358 diff changeset	3081 * little-endian. */
e9b7ac7031fb Compute with NA correctly on MIPS architecture (bug #59830). Rik <rik@octave.org> parents: 29358 diff changeset	3082 #if defined (__mips__)
e9b7ac7031fb Compute with NA correctly on MIPS architecture (bug #59830). Rik <rik@octave.org> parents: 29358 diff changeset	3083 return (0);
e9b7ac7031fb Compute with NA correctly on MIPS architecture (bug #59830). Rik <rik@octave.org> parents: 29358 diff changeset	3084 #else
e9b7ac7031fb Compute with NA correctly on MIPS architecture (bug #59830). Rik <rik@octave.org> parents: 29358 diff changeset	3085 return (1);
29366 8224cb664385 maint: merge stable to default. Rik <rik@octave.org> parents: 29359 29365 diff changeset	3086 #endif
29365 e9b7ac7031fb Compute with NA correctly on MIPS architecture (bug #59830). Rik <rik@octave.org> parents: 29358 diff changeset	3087 ]])],
e9b7ac7031fb Compute with NA correctly on MIPS architecture (bug #59830). Rik <rik@octave.org> parents: 29358 diff changeset	3088 octave_cv_mips_nan=yes,
29370 8e549734531e Add default value to OCTAVE_MIPS_NAN configure macro for cross-compiling (bug #59830) Rik <rik@octave.org> parents: 29365 diff changeset	3089 octave_cv_mips_nan=no,
29365 e9b7ac7031fb Compute with NA correctly on MIPS architecture (bug #59830). Rik <rik@octave.org> parents: 29358 diff changeset	3090 octave_cv_mips_nan=no)
e9b7ac7031fb Compute with NA correctly on MIPS architecture (bug #59830). Rik <rik@octave.org> parents: 29358 diff changeset	3091 AC_LANG_POP(C++)
e9b7ac7031fb Compute with NA correctly on MIPS architecture (bug #59830). Rik <rik@octave.org> parents: 29358 diff changeset	3092 ])
e9b7ac7031fb Compute with NA correctly on MIPS architecture (bug #59830). Rik <rik@octave.org> parents: 29358 diff changeset	3093 if test $octave_cv_mips_nan = yes; then
e9b7ac7031fb Compute with NA correctly on MIPS architecture (bug #59830). Rik <rik@octave.org> parents: 29358 diff changeset	3094 AC_DEFINE(HAVE_MIPS_NAN, 1,
e9b7ac7031fb Compute with NA correctly on MIPS architecture (bug #59830). Rik <rik@octave.org> parents: 29358 diff changeset	3095 [Define to 1 if MIPS processor is using non-standard NaN encoding.])
e9b7ac7031fb Compute with NA correctly on MIPS architecture (bug #59830). Rik <rik@octave.org> parents: 29358 diff changeset	3096 fi
e9b7ac7031fb Compute with NA correctly on MIPS architecture (bug #59830). Rik <rik@octave.org> parents: 29358 diff changeset	3097 ])
e9b7ac7031fb Compute with NA correctly on MIPS architecture (bug #59830). Rik <rik@octave.org> parents: 29358 diff changeset	3098 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3099 dnl Check for ar.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3100 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3101 AC_DEFUN([OCTAVE_PROG_AR], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3102 if test -z "$AR"; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3103 AR=ar
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3104 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3105 AC_SUBST(AR)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3106
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3107 if test -z "$ARFLAGS"; then
23402 1fadf480a63b maint: tweak ARFLAGS and AR_FLAGS defaults and comments Mike Miller <mtmiller@octave.org> parents: 23400 diff changeset	3108 ARFLAGS="cr"
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3109 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3110 AC_SUBST(ARFLAGS)
23400 b5ee9b985a82 Silence compile warning about 'u' modifier to ar. Rik <rik@octave.org> parents: 23329 diff changeset	3111
23402 1fadf480a63b maint: tweak ARFLAGS and AR_FLAGS defaults and comments Mike Miller <mtmiller@octave.org> parents: 23400 diff changeset	3112 dnl FIXME: Remove when libtool updated (placed 4/15/2017).
23400 b5ee9b985a82 Silence compile warning about 'u' modifier to ar. Rik <rik@octave.org> parents: 23329 diff changeset	3113 dnl This silences the following unnecessary warning during compile:
b5ee9b985a82 Silence compile warning about 'u' modifier to ar. Rik <rik@octave.org> parents: 23329 diff changeset	3114 dnl ar: `u' modifier ignored since `D' is the default (see `U')
b5ee9b985a82 Silence compile warning about 'u' modifier to ar. Rik <rik@octave.org> parents: 23329 diff changeset	3115 if test -z "$AR_FLAGS"; then
23402 1fadf480a63b maint: tweak ARFLAGS and AR_FLAGS defaults and comments Mike Miller <mtmiller@octave.org> parents: 23400 diff changeset	3116 AR_FLAGS="$ARFLAGS"
23400 b5ee9b985a82 Silence compile warning about 'u' modifier to ar. Rik <rik@octave.org> parents: 23329 diff changeset	3117 fi
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3118 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3119 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3120 dnl Check for bison.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3121 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3122 AC_DEFUN([OCTAVE_PROG_BISON], [
30170 72adc88bc674 modernize bison rules John W. Eaton <jwe@octave.org> parents: 30005 diff changeset	3123 dnl FIXME: What is our actual required minimum version for Bison?
72adc88bc674 modernize bison rules John W. Eaton <jwe@octave.org> parents: 30005 diff changeset	3124 gl_PROG_BISON([BISON], [3.0])
72adc88bc674 modernize bison rules John W. Eaton <jwe@octave.org> parents: 30005 diff changeset	3125 WARN_BISONFLAGS=
16784 0fabe0f49f38 use better method to determine whether we are using flex and bison John W. Eaton <jwe@octave.org> parents: 16733 diff changeset	3126
30170 72adc88bc674 modernize bison rules John W. Eaton <jwe@octave.org> parents: 30005 diff changeset	3127 case "`$BISON --version`" in
17197 fbee0d312af5 acinclude.m4: Remove some unnecessary double quotes around variables. Rik <rik@octave.org> parents: 17196 diff changeset	3128 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	3129 *) 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	3130 esac
0fabe0f49f38 use better method to determine whether we are using flex and bison John W. Eaton <jwe@octave.org> parents: 16733 diff changeset	3131
17197 fbee0d312af5 acinclude.m4: Remove some unnecessary double quotes around variables. Rik <rik@octave.org> parents: 17196 diff changeset	3132 if test $tmp_have_bison = yes; then
30170 72adc88bc674 modernize bison rules John W. Eaton <jwe@octave.org> parents: 30005 diff changeset	3133 WARN_BISONFLAGS="-Wno-yacc"
26672 df42ea23502f build: support GNU bison 3.3, silence POSIX compatibility warning (bug #55613) Mike Miller <mtmiller@octave.org> parents: 26541 diff changeset	3134
18974 d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18973 diff changeset	3135 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	3136 [octave_cv_bison_api_prefix_decl_style], [
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18973 diff changeset	3137 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	3138 quote="quote brace"
18974 d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18973 diff changeset	3139 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	3140 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	3141 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	3142 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	3143 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	3144 else
6b4dfb1e5afb allow building with old versions of bison again (bug #43023) John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	3145 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	3146 fi
6b4dfb1e5afb allow building with old versions of bison again (bug #43023) John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	3147 else
6b4dfb1e5afb allow building with old versions of bison again (bug #43023) John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	3148 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	3149 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	3150 else
6b4dfb1e5afb allow building with old versions of bison again (bug #43023) John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	3151 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	3152 fi
6b4dfb1e5afb allow building with old versions of bison again (bug #43023) John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	3153 fi
6b4dfb1e5afb allow building with old versions of bison again (bug #43023) John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	3154 cat << EOF > conftest.yy
18974 d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18973 diff changeset	3155 $def
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18973 diff changeset	3156 %start input
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18973 diff changeset	3157 %%
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18973 diff changeset	3158 input:;
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18973 diff changeset	3159 %%
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18973 diff changeset	3160 EOF
19105 6b4dfb1e5afb allow building with old versions of bison again (bug #43023) John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	3161 ## Older versions of bison only warn and exit with success.
30170 72adc88bc674 modernize bison rules John W. Eaton <jwe@octave.org> parents: 30005 diff changeset	3162 octave_bison_output=`$BISON $WARN_BISONFLAGS conftest.yy 2>&1`
19105 6b4dfb1e5afb allow building with old versions of bison again (bug #43023) John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	3163 ac_status=$?
6b4dfb1e5afb allow building with old versions of bison again (bug #43023) John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	3164 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	3165 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	3166 break
6b4dfb1e5afb allow building with old versions of bison again (bug #43023) John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	3167 fi
6b4dfb1e5afb allow building with old versions of bison again (bug #43023) John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	3168 done
6b4dfb1e5afb allow building with old versions of bison again (bug #43023) John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	3169 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	3170 break
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18973 diff changeset	3171 fi
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18973 diff changeset	3172 done
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18973 diff changeset	3173 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	3174 ])
29746 7f339da6cabd avoid possible gcc warning about C++ one definition rule (bug #60586) John W. Eaton <jwe@octave.org> parents: 29663 diff changeset	3175
7f339da6cabd avoid possible gcc warning about C++ one definition rule (bug #60586) John W. Eaton <jwe@octave.org> parents: 29663 diff changeset	3176 AC_CACHE_CHECK([whether api.prefix applies to yysymbol_kind_t],
7f339da6cabd avoid possible gcc warning about C++ one definition rule (bug #60586) John W. Eaton <jwe@octave.org> parents: 29663 diff changeset	3177 [octave_cv_bison_api_prefix_applies_to_yysymbol_kind_t], [
7f339da6cabd avoid possible gcc warning about C++ one definition rule (bug #60586) John W. Eaton <jwe@octave.org> parents: 29663 diff changeset	3178 [case "$octave_cv_bison_api_prefix_decl_style" in
7f339da6cabd avoid possible gcc warning about C++ one definition rule (bug #60586) John W. Eaton <jwe@octave.org> parents: 29663 diff changeset	3179 "api brace")
7f339da6cabd avoid possible gcc warning about C++ one definition rule (bug #60586) John W. Eaton <jwe@octave.org> parents: 29663 diff changeset	3180 def='%define api.prefix {PREFIX_}'
7f339da6cabd avoid possible gcc warning about C++ one definition rule (bug #60586) John W. Eaton <jwe@octave.org> parents: 29663 diff changeset	3181 ;;
7f339da6cabd avoid possible gcc warning about C++ one definition rule (bug #60586) John W. Eaton <jwe@octave.org> parents: 29663 diff changeset	3182 "api quote")
7f339da6cabd avoid possible gcc warning about C++ one definition rule (bug #60586) John W. Eaton <jwe@octave.org> parents: 29663 diff changeset	3183 def='%define api.prefix "PREFIX_"'
7f339da6cabd avoid possible gcc warning about C++ one definition rule (bug #60586) John W. Eaton <jwe@octave.org> parents: 29663 diff changeset	3184 ;;
7f339da6cabd avoid possible gcc warning about C++ one definition rule (bug #60586) John W. Eaton <jwe@octave.org> parents: 29663 diff changeset	3185 "name brace")
7f339da6cabd avoid possible gcc warning about C++ one definition rule (bug #60586) John W. Eaton <jwe@octave.org> parents: 29663 diff changeset	3186 def='%define name-prefix {PREFIX_}'
7f339da6cabd avoid possible gcc warning about C++ one definition rule (bug #60586) John W. Eaton <jwe@octave.org> parents: 29663 diff changeset	3187 ;;
7f339da6cabd avoid possible gcc warning about C++ one definition rule (bug #60586) John W. Eaton <jwe@octave.org> parents: 29663 diff changeset	3188 "name quote")
7f339da6cabd avoid possible gcc warning about C++ one definition rule (bug #60586) John W. Eaton <jwe@octave.org> parents: 29663 diff changeset	3189 def='%define name-prefix "PREFIX_"'
7f339da6cabd avoid possible gcc warning about C++ one definition rule (bug #60586) John W. Eaton <jwe@octave.org> parents: 29663 diff changeset	3190 ;;
7f339da6cabd avoid possible gcc warning about C++ one definition rule (bug #60586) John W. Eaton <jwe@octave.org> parents: 29663 diff changeset	3191 esac]
7f339da6cabd avoid possible gcc warning about C++ one definition rule (bug #60586) John W. Eaton <jwe@octave.org> parents: 29663 diff changeset	3192 cat << EOF > conftest.yy
7f339da6cabd avoid possible gcc warning about C++ one definition rule (bug #60586) John W. Eaton <jwe@octave.org> parents: 29663 diff changeset	3193 $def
7f339da6cabd avoid possible gcc warning about C++ one definition rule (bug #60586) John W. Eaton <jwe@octave.org> parents: 29663 diff changeset	3194 %start input
7f339da6cabd avoid possible gcc warning about C++ one definition rule (bug #60586) John W. Eaton <jwe@octave.org> parents: 29663 diff changeset	3195 %%
7f339da6cabd avoid possible gcc warning about C++ one definition rule (bug #60586) John W. Eaton <jwe@octave.org> parents: 29663 diff changeset	3196 input:;
7f339da6cabd avoid possible gcc warning about C++ one definition rule (bug #60586) John W. Eaton <jwe@octave.org> parents: 29663 diff changeset	3197 %%
7f339da6cabd avoid possible gcc warning about C++ one definition rule (bug #60586) John W. Eaton <jwe@octave.org> parents: 29663 diff changeset	3198 EOF
7f339da6cabd avoid possible gcc warning about C++ one definition rule (bug #60586) John W. Eaton <jwe@octave.org> parents: 29663 diff changeset	3199 ## Older versions of bison only warn and exit with success.
30170 72adc88bc674 modernize bison rules John W. Eaton <jwe@octave.org> parents: 30005 diff changeset	3200 $BISON $WARN_BISONFLAGS --defines --output conftest.cc conftest.yy
72adc88bc674 modernize bison rules John W. Eaton <jwe@octave.org> parents: 30005 diff changeset	3201 if grep PREFIX_symbol_kind_t conftest.cc > /dev/null; then
29746 7f339da6cabd avoid possible gcc warning about C++ one definition rule (bug #60586) John W. Eaton <jwe@octave.org> parents: 29663 diff changeset	3202 octave_cv_bison_api_prefix_applies_to_yysymbol_kind_t=yes
7f339da6cabd avoid possible gcc warning about C++ one definition rule (bug #60586) John W. Eaton <jwe@octave.org> parents: 29663 diff changeset	3203 else
7f339da6cabd avoid possible gcc warning about C++ one definition rule (bug #60586) John W. Eaton <jwe@octave.org> parents: 29663 diff changeset	3204 octave_cv_bison_api_prefix_applies_to_yysymbol_kind_t=no
7f339da6cabd avoid possible gcc warning about C++ one definition rule (bug #60586) John W. Eaton <jwe@octave.org> parents: 29663 diff changeset	3205 fi
30170 72adc88bc674 modernize bison rules John W. Eaton <jwe@octave.org> parents: 30005 diff changeset	3206 rm -f conftest.yy y.tab.h conftest.cc
29746 7f339da6cabd avoid possible gcc warning about C++ one definition rule (bug #60586) John W. Eaton <jwe@octave.org> parents: 29663 diff changeset	3207 ])
18974 d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18973 diff changeset	3208 fi
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18973 diff changeset	3209
25637 e1c3d1c6e896 don't substitute api.prefix style in bison input files John W. Eaton <jwe@octave.org> parents: 25559 diff changeset	3210 if test -z "$octave_cv_bison_api_prefix_decl_style" \
e1c3d1c6e896 don't substitute api.prefix style in bison input files John W. Eaton <jwe@octave.org> parents: 25559 diff changeset	3211 \|\| test "$octave_cv_bison_api_prefix_decl_style" != "api brace"; then
19105 6b4dfb1e5afb allow building with old versions of bison again (bug #43023) John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	3212 tmp_have_bison=no
18974 d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18973 diff changeset	3213 warn_bison_api_prefix_decl_style="
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18973 diff changeset	3214
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18973 diff changeset	3215 I wasn't able to find a suitable style for declaring the api prefix
25637 e1c3d1c6e896 don't substitute api.prefix style in bison input files John W. Eaton <jwe@octave.org> parents: 25559 diff changeset	3216 in a bison input file so I'm disabling bison. We expect bison to
e1c3d1c6e896 don't substitute api.prefix style in bison input files John W. Eaton <jwe@octave.org> parents: 25559 diff changeset	3217 understand the '%define api.prefix { PREFIX }' syntax.
18974 d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18973 diff changeset	3218 "
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18973 diff changeset	3219 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	3220 fi
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18973 diff changeset	3221
17197 fbee0d312af5 acinclude.m4: Remove some unnecessary double quotes around variables. Rik <rik@octave.org> parents: 17196 diff changeset	3222 if test $tmp_have_bison = no; then
30170 72adc88bc674 modernize bison rules John W. Eaton <jwe@octave.org> parents: 30005 diff changeset	3223 BISON='${top_srcdir}/build-aux/missing bison'
16784 0fabe0f49f38 use better method to determine whether we are using flex and bison John W. Eaton <jwe@octave.org> parents: 16733 diff changeset	3224 warn_bison="
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3225
19105 6b4dfb1e5afb allow building with old versions of bison again (bug #43023) John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	3226 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	3227 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	3228 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	3229 building from VCS sources.
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3230 "
16784 0fabe0f49f38 use better method to determine whether we are using flex and bison John W. Eaton <jwe@octave.org> parents: 16733 diff changeset	3231 OCTAVE_CONFIGURE_WARNING([warn_bison])
29746 7f339da6cabd avoid possible gcc warning about C++ one definition rule (bug #60586) John W. Eaton <jwe@octave.org> parents: 29663 diff changeset	3232
16784 0fabe0f49f38 use better method to determine whether we are using flex and bison John W. Eaton <jwe@octave.org> parents: 16733 diff changeset	3233 fi
29746 7f339da6cabd avoid possible gcc warning about C++ one definition rule (bug #60586) John W. Eaton <jwe@octave.org> parents: 29663 diff changeset	3234 if test "$octave_cv_bison_api_prefix_applies_to_yysymbol_kind_t" = no; then
7f339da6cabd avoid possible gcc warning about C++ one definition rule (bug #60586) John W. Eaton <jwe@octave.org> parents: 29663 diff changeset	3235 OCTAVE_PARSER_CPPFLAGS="-Dyysymbol_kind_t=octave_symbol_kind_t"
7f339da6cabd avoid possible gcc warning about C++ one definition rule (bug #60586) John W. Eaton <jwe@octave.org> parents: 29663 diff changeset	3236 OCTAVE_TEX_PARSER_CPPFLAGS="-Dyysymbol_kind_t=octave_tex_symbol_kind_t"
7f339da6cabd avoid possible gcc warning about C++ one definition rule (bug #60586) John W. Eaton <jwe@octave.org> parents: 29663 diff changeset	3237 fi
7f339da6cabd avoid possible gcc warning about C++ one definition rule (bug #60586) John W. Eaton <jwe@octave.org> parents: 29663 diff changeset	3238 AC_SUBST(OCTAVE_PARSER_CPPFLAGS)
7f339da6cabd avoid possible gcc warning about C++ one definition rule (bug #60586) John W. Eaton <jwe@octave.org> parents: 29663 diff changeset	3239 AC_SUBST(OCTAVE_TEX_PARSER_CPPFLAGS)
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3240 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3241 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3242 dnl Find find program.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3243 dnl
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	3244 ## Prefer GNU find if found.
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3245 AN_MAKEVAR([FIND], [OCTAVE_PROG_FIND])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3246 AN_PROGRAM([gfind], [OCTAVE_PROG_FIND])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3247 AN_PROGRAM([find], [OCTAVE_PROG_FIND])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3248 AC_DEFUN([OCTAVE_PROG_FIND], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3249 AC_CHECK_PROGS(FIND, [gfind find])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3250 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3251 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3252 dnl Check for flex.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3253 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3254 AC_DEFUN([OCTAVE_PROG_FLEX], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3255 ## 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	3256 ## it, and it might not be installed.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3257 ##
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3258 ## 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	3259 ## using flex.
29661 9e670ec38513 * acinclude.m4 (OCTAVE_PROG_FLEX): Pass noyywrap to AC_PROG_LEX. (bug #60601) John W. Eaton <jwe@octave.org> parents: 29647 diff changeset	3260 dnl We declare %noyywrap in the lexer files so we use the noyywrap
9e670ec38513 * acinclude.m4 (OCTAVE_PROG_FLEX): Pass noyywrap to AC_PROG_LEX. (bug #60601) John W. Eaton <jwe@octave.org> parents: 29647 diff changeset	3261 dnl option here to skip the search for that function.
9e670ec38513 * acinclude.m4 (OCTAVE_PROG_FLEX): Pass noyywrap to AC_PROG_LEX. (bug #60601) John W. Eaton <jwe@octave.org> parents: 29647 diff changeset	3262 AC_PROG_LEX([noyywrap])
16784 0fabe0f49f38 use better method to determine whether we are using flex and bison John W. Eaton <jwe@octave.org> parents: 16733 diff changeset	3263 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	3264 flex)
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3265 LFLAGS="-I"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3266 AC_MSG_RESULT([defining LFLAGS to be $LFLAGS])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3267 LEXLIB=
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3268 ;;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3269 *)
25310 0b253ba6eb91 avoid syntax errors in build-aux/subst scripts John W. Eaton <jwe@octave.org> parents: 25299 diff changeset	3270 LEX='${top_srcdir}/build-aux/missing flex'
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3271 warn_flex="
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3272
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3273 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	3274 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	3275 "
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3276 OCTAVE_CONFIGURE_WARNING([warn_flex])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3277 ;;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3278 esac
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3279 AC_SUBST(LFLAGS)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3280 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3281 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3282 dnl Check for ghostscript.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3283 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3284 AC_DEFUN([OCTAVE_PROG_GHOSTSCRIPT], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3285 case "$canonical_host_type" in
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3286 --mingw* \| --msdosmsvc)
30832 d87406970676 build: Synchronize ghostscript binary names in configure check with .m file usage. Markus Mützel <markus.muetzel@gmx.de> parents: 30796 diff changeset	3287 ac_octave_gs_names="gs gswin32c gswin64c mgs"
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3288 ;;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3289 *)
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	3290 ac_octave_gs_names="gs"
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3291 ;;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3292 esac
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	3293 AC_CHECK_PROGS(GHOSTSCRIPT, [$ac_octave_gs_names])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3294 if test -z "$GHOSTSCRIPT"; then
25310 0b253ba6eb91 avoid syntax errors in build-aux/subst scripts John W. Eaton <jwe@octave.org> parents: 25299 diff changeset	3295 GHOSTSCRIPT='${top_srcdir}/build-aux/missing gs'
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3296 warn_ghostscript="
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3297
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3298 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	3299 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	3300 using Octave
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3301 "
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3302 OCTAVE_CONFIGURE_WARNING([warn_ghostscript])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3303 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3304 AC_SUBST(GHOSTSCRIPT)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3305 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3306 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3307 dnl Check for gnuplot.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3308 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3309 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	3310 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	3311 ac_octave_gp_default="gnuplot"
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3312 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	3313 GNUPLOT="$ac_octave_gp_default"
26071 658153e1976d Fix failing BIST tests and oddities when gnuplot is not present (bug #55023). Rik <rik@octave.org> parents: 25843 diff changeset	3314 GNUPLOT_BINARY=$GNUPLOT
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3315 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	3316 else
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	3317 AC_CHECK_PROGS(GNUPLOT, [$ac_octave_gp_names])
26071 658153e1976d Fix failing BIST tests and oddities when gnuplot is not present (bug #55023). Rik <rik@octave.org> parents: 25843 diff changeset	3318 GNUPLOT_BINARY=$GNUPLOT
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3319 if test -z "$GNUPLOT"; then
26071 658153e1976d Fix failing BIST tests and oddities when gnuplot is not present (bug #55023). Rik <rik@octave.org> parents: 25843 diff changeset	3320 GNUPLOT="$ac_octave_gp_default"
658153e1976d Fix failing BIST tests and oddities when gnuplot is not present (bug #55023). Rik <rik@octave.org> parents: 25843 diff changeset	3321 GNUPLOT_BINARY=""
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3322 warn_gnuplot="
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3323
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3324 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	3325 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	3326 Octave's plotting commands.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3327 "
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3328 OCTAVE_CONFIGURE_WARNING([warn_gnuplot])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3329 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3330 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3331 AC_SUBST(GNUPLOT)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3332 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3333 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3334 dnl Check for gperf.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3335 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3336 AC_DEFUN([OCTAVE_PROG_GPERF], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3337 AC_CHECK_PROG(GPERF, gperf, gperf, [])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3338 if test -z "$GPERF"; then
25310 0b253ba6eb91 avoid syntax errors in build-aux/subst scripts John W. Eaton <jwe@octave.org> parents: 25299 diff changeset	3339 GPERF='${top_srcdir}/build-aux/missing gperf'
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3340 warn_gperf="
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3341
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3342 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	3343 reconstruct oct-gperf.h
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3344 "
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3345 OCTAVE_CONFIGURE_WARNING([warn_gperf])
25310 0b253ba6eb91 avoid syntax errors in build-aux/subst scripts John W. Eaton <jwe@octave.org> parents: 25299 diff changeset	3346 GPERF='${top_srcdir}/build-aux/missing gperf'
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3347 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3348 AC_SUBST(GPERF)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3349 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3350 dnl
19744 1687269e31e4 build: Generate Octave logo icons from SVG source (bug #37062) Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	3351 dnl Find icotool program.
1687269e31e4 build: Generate Octave logo icons from SVG source (bug #37062) Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	3352 dnl
1687269e31e4 build: Generate Octave logo icons from SVG source (bug #37062) Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	3353 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	3354 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	3355 if test -z "$ICOTOOL"; then
25310 0b253ba6eb91 avoid syntax errors in build-aux/subst scripts John W. Eaton <jwe@octave.org> parents: 25299 diff changeset	3356 ICOTOOL='${top_srcdir}/build-aux/missing icotool'
19753 bc2a8db22831 build: Use the missing script for icotool and rsvg-convert Mike Miller <mtmiller@ieee.org> parents: 19744 diff changeset	3357 warn_icotool="
bc2a8db22831 build: Use the missing script for icotool and rsvg-convert Mike Miller <mtmiller@ieee.org> parents: 19744 diff changeset	3358
bc2a8db22831 build: Use the missing script for icotool and rsvg-convert Mike Miller <mtmiller@ieee.org> parents: 19744 diff changeset	3359 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	3360 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	3361 VCS sources.
bc2a8db22831 build: Use the missing script for icotool and rsvg-convert Mike Miller <mtmiller@ieee.org> parents: 19744 diff changeset	3362 "
bc2a8db22831 build: Use the missing script for icotool and rsvg-convert Mike Miller <mtmiller@ieee.org> parents: 19744 diff changeset	3363 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	3364 fi
19744 1687269e31e4 build: Generate Octave logo icons from SVG source (bug #37062) Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	3365 AC_SUBST(ICOTOOL)
1687269e31e4 build: Generate Octave logo icons from SVG source (bug #37062) Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	3366 ])
1687269e31e4 build: Generate Octave logo icons from SVG source (bug #37062) Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	3367 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3368 dnl Check for makeinfo.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3369 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3370 AC_DEFUN([OCTAVE_PROG_MAKEINFO], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3371 dnl use MKINFO, not MAKEINFO, for variable name because Automake
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3372 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	3373 dnl exist which will then fool the 'test -z' line.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3374 AC_CHECK_PROG(MKINFO, makeinfo, makeinfo, [])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3375 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	3376 warn_makeinfo="
ca37c6023a79 don't abort configure if makeinfo is missing John W. Eaton <jwe@octave.org> parents: 15969 diff changeset	3377
ca37c6023a79 don't abort configure if makeinfo is missing John W. Eaton <jwe@octave.org> parents: 15969 diff changeset	3378 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	3379 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	3380 "
ca37c6023a79 don't abort configure if makeinfo is missing John W. Eaton <jwe@octave.org> parents: 15969 diff changeset	3381 OCTAVE_CONFIGURE_WARNING([warn_makeinfo])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3382 fi
24623 f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3383 dnl If we have a GNU makeinfo program, see if it supports the @sortas command
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3384 dnl for defining a custom sort key for an index entry.
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3385 if test -n "$MKINFO"; then
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3386 AC_CACHE_CHECK([for makeinfo support for @sortas command],
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3387 [octave_cv_makeinfo_sortas_command],
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3388 [cat << EOF > conftest.texi
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3389 \input texinfo
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3390 @node Top
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3391 @top Document
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3392 @menu
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3393 * Chapter::
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3394 * Index::
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3395 @end menu
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3396 @node Chapter
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3397 @chapter Chapter
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3398 @cindex @sortas{a} foo
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3399 @node Index
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3400 @unnumbered Index
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3401 @printindex cp
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3402 @bye
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3403 EOF
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3404 if $MKINFO --no-warn conftest.texi 2>/dev/null; then
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3405 octave_cv_makeinfo_sortas_command=yes
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3406 else
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3407 octave_cv_makeinfo_sortas_command=no
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3408 fi
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3409 rm -f conftest.info conftest.texi
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3410 ])
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3411 if test $octave_cv_makeinfo_sortas_command = no; then
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3412 warn_makeinfo="
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3413
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3414 I wasn't able to find a version of GNU makeinfo that supports the
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3415 @sortas command, but it's only a problem if you need to build the
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3416 manual, which is the case if you're building from VCS sources.
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3417 "
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3418 OCTAVE_CONFIGURE_WARNING([warn_makeinfo])
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3419 fi
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3420 fi
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3421 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3422 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3423 dnl What pager should we use?
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3424 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3425 AC_DEFUN([OCTAVE_PROG_PAGER], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3426 if test "$cross_compiling" = yes; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3427 DEFAULT_PAGER=less
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3428 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	3429 AC_SUBST(DEFAULT_PAGER)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3430 else
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	3431 ac_octave_possible_pagers="less more page pg"
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3432 case "$canonical_host_type" in
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3433 --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	3434 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	3435 ;;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3436 esac
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3437
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	3438 AC_CHECK_PROGS(DEFAULT_PAGER, [$ac_octave_possible_pagers], [])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3439 if test -z "$DEFAULT_PAGER"; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3440 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	3441 OCTAVE_CONFIGURE_WARNING([warn_less])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3442 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3443 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3444 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3445 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3446 dnl Find Perl program.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3447 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3448 AC_DEFUN([OCTAVE_PROG_PERL], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3449 AC_CHECK_PROG(PERL, perl, perl, [])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3450 AC_SUBST(PERL)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3451 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3452 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3453 dnl Find Python program.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3454 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3455 AC_DEFUN([OCTAVE_PROG_PYTHON], [
31130 0c637fa9529a build: Search for python executable with multiple names (bug #62372) Rik <rik@octave.org> parents: 31124 diff changeset	3456 AC_CHECK_PROGS(PYTHON, [python3 python], python, [])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3457 AC_SUBST(PYTHON)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3458 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3459 dnl
19744 1687269e31e4 build: Generate Octave logo icons from SVG source (bug #37062) Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	3460 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	3461 dnl
1687269e31e4 build: Generate Octave logo icons from SVG source (bug #37062) Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	3462 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	3463 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	3464 if test -z "$RSVG_CONVERT"; then
25310 0b253ba6eb91 avoid syntax errors in build-aux/subst scripts John W. Eaton <jwe@octave.org> parents: 25299 diff changeset	3465 RSVG_CONVERT='${top_srcdir}/build-aux/missing rsvg-convert'
19753 bc2a8db22831 build: Use the missing script for icotool and rsvg-convert Mike Miller <mtmiller@ieee.org> parents: 19744 diff changeset	3466 warn_rsvg_convert="
bc2a8db22831 build: Use the missing script for icotool and rsvg-convert Mike Miller <mtmiller@ieee.org> parents: 19744 diff changeset	3467
bc2a8db22831 build: Use the missing script for icotool and rsvg-convert Mike Miller <mtmiller@ieee.org> parents: 19744 diff changeset	3468 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	3469 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	3470 from VCS sources.
bc2a8db22831 build: Use the missing script for icotool and rsvg-convert Mike Miller <mtmiller@ieee.org> parents: 19744 diff changeset	3471 "
bc2a8db22831 build: Use the missing script for icotool and rsvg-convert Mike Miller <mtmiller@ieee.org> parents: 19744 diff changeset	3472 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	3473 fi
19744 1687269e31e4 build: Generate Octave logo icons from SVG source (bug #37062) Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	3474 AC_SUBST(RSVG_CONVERT)
1687269e31e4 build: Generate Octave logo icons from SVG source (bug #37062) Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	3475 ])
1687269e31e4 build: Generate Octave logo icons from SVG source (bug #37062) Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	3476 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3477 dnl Find sed program.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3478 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3479 # Check for a fully-functional sed program, that truncates
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3480 # as few characters as possible and that supports "$X\\|Y$"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3481 # style regular expression alternation. Prefer GNU sed if found.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3482 AC_DEFUN([OCTAVE_PROG_SED], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3483 AC_MSG_CHECKING([for a usable sed])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3484 if test -z "$SED"; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3485 AC_CACHE_VAL([octave_cv_prog_sed],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3486 [# 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	3487 # Next, test potential sed programs in list for truncation.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3488 _AS_PATH_WALK([$PATH],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3489 [for ac_prog in sed gsed; do
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3490 for ac_exec_ext in '' $ac_executable_extensions; do
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3491 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	3492 _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	3493 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3494 done
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3495 done
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3496 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3497 AS_TMPDIR(sed)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3498 _max=0
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3499 _count=0
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3500 # 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	3501 # along with /bin/sed that truncates output.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3502 for _sed in $_sed_list /usr/xpg4/bin/sed; do
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3503 test ! -f ${_sed} && break
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3504 cat /dev/null > "$tmp/sed.in"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3505 _count=0
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3506 echo $ECHO_N "0123456789$ECHO_C" >"$tmp/sed.in"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3507 # Check for GNU sed and select it if it is found.
31344 989ebec75ff0 build: Use Autoconf macro to find egrep executable. Rik <rik@octave.org> parents: 30796 diff changeset	3508 if "${_sed}" --version 2>&1 < /dev/null \| $EGREP '(GNU)' > /dev/null; then
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3509 octave_cv_prog_sed=${_sed}
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3510 break;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3511 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3512 # Reject if RE alternation is not handled.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3513 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	3514 continue;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3515 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3516 while true; do
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3517 cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3518 mv "$tmp/sed.tmp" "$tmp/sed.in"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3519 cp "$tmp/sed.in" "$tmp/sed.nl"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3520 echo >>"$tmp/sed.nl"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3521 ${_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	3522 cmp -s "$tmp/sed.out" "$tmp/sed.nl" \|\| break
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3523 # 10000 chars as input seems more than enough
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3524 test $_count -gt 10 && break
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3525 _count=`expr $_count + 1`
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3526 if test $_count -gt $_max; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3527 _max=$_count
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3528 octave_cv_prog_sed=$_sed
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3529 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3530 done
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3531 done
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3532 rm -rf "$tmp"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3533 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3534 SED=$octave_cv_prog_sed
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3535 if test -z "$SED"; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3536 AC_MSG_ERROR([no usable version of sed found])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3537 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3538 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3539 AC_SUBST(SED)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3540 AC_MSG_RESULT([$SED])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3541 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3542 dnl
24077 e483dcb5777d build the source distribution archives reproducibly Mike Miller <mtmiller@octave.org> parents: 24022 diff changeset	3543 dnl Check for options that can be passed to tar to make archives reproducible.
e483dcb5777d build the source distribution archives reproducibly Mike Miller <mtmiller@octave.org> parents: 24022 diff changeset	3544 dnl
e483dcb5777d build the source distribution archives reproducibly Mike Miller <mtmiller@octave.org> parents: 24022 diff changeset	3545 AC_DEFUN([OCTAVE_PROG_TAR_REPRODUCIBLE], [
e483dcb5777d build the source distribution archives reproducibly Mike Miller <mtmiller@octave.org> parents: 24022 diff changeset	3546 AC_MSG_CHECKING([for options to make reproducible archives with GNU tar])
31124 441aa6226223 build: cache REPRODUCIBLE_TAR_FLAGS in configure (bug #62715) Rik <rik@octave.org> parents: 31121 diff changeset	3547 AC_CACHE_VAL([octave_cv_tar_flags],
441aa6226223 build: cache REPRODUCIBLE_TAR_FLAGS in configure (bug #62715) Rik <rik@octave.org> parents: 31121 diff changeset	3548 [octave_cv_tar_flags=
441aa6226223 build: cache REPRODUCIBLE_TAR_FLAGS in configure (bug #62715) Rik <rik@octave.org> parents: 31121 diff changeset	3549 dnl This uses Automake's logic for finding GNU tar under various names
441aa6226223 build: cache REPRODUCIBLE_TAR_FLAGS in configure (bug #62715) Rik <rik@octave.org> parents: 31121 diff changeset	3550 for octave_tar in tar gnutar gtar :; do
441aa6226223 build: cache REPRODUCIBLE_TAR_FLAGS in configure (bug #62715) Rik <rik@octave.org> parents: 31121 diff changeset	3551 $octave_tar --version >/dev/null 2>&1 && break
24077 e483dcb5777d build the source distribution archives reproducibly Mike Miller <mtmiller@octave.org> parents: 24022 diff changeset	3552 done
31124 441aa6226223 build: cache REPRODUCIBLE_TAR_FLAGS in configure (bug #62715) Rik <rik@octave.org> parents: 31121 diff changeset	3553 dnl If we have a valid GNU tar program, see if it supports sets of options
441aa6226223 build: cache REPRODUCIBLE_TAR_FLAGS in configure (bug #62715) Rik <rik@octave.org> parents: 31121 diff changeset	3554 if test x"$octave_tar" != x:; then
441aa6226223 build: cache REPRODUCIBLE_TAR_FLAGS in configure (bug #62715) Rik <rik@octave.org> parents: 31121 diff changeset	3555 echo > conftest.txt
441aa6226223 build: cache REPRODUCIBLE_TAR_FLAGS in configure (bug #62715) Rik <rik@octave.org> parents: 31121 diff changeset	3556 for octave_tar_flag in --owner=0 --group=0 --numeric-owner --sort=name; do
441aa6226223 build: cache REPRODUCIBLE_TAR_FLAGS in configure (bug #62715) Rik <rik@octave.org> parents: 31121 diff changeset	3557 $octave_tar -cf conftest.tar $octave_cv_tar_flags $octave_tar_flag conftest.txt 2>/dev/null
441aa6226223 build: cache REPRODUCIBLE_TAR_FLAGS in configure (bug #62715) Rik <rik@octave.org> parents: 31121 diff changeset	3558 if test $? -eq 0; then
441aa6226223 build: cache REPRODUCIBLE_TAR_FLAGS in configure (bug #62715) Rik <rik@octave.org> parents: 31121 diff changeset	3559 octave_cv_tar_flags="${octave_cv_tar_flags:+$octave_cv_tar_flags }$octave_tar_flag"
441aa6226223 build: cache REPRODUCIBLE_TAR_FLAGS in configure (bug #62715) Rik <rik@octave.org> parents: 31121 diff changeset	3560 fi
441aa6226223 build: cache REPRODUCIBLE_TAR_FLAGS in configure (bug #62715) Rik <rik@octave.org> parents: 31121 diff changeset	3561 done
441aa6226223 build: cache REPRODUCIBLE_TAR_FLAGS in configure (bug #62715) Rik <rik@octave.org> parents: 31121 diff changeset	3562 rm -f conftest.tar conftest.txt
441aa6226223 build: cache REPRODUCIBLE_TAR_FLAGS in configure (bug #62715) Rik <rik@octave.org> parents: 31121 diff changeset	3563 fi
441aa6226223 build: cache REPRODUCIBLE_TAR_FLAGS in configure (bug #62715) Rik <rik@octave.org> parents: 31121 diff changeset	3564 ])
441aa6226223 build: cache REPRODUCIBLE_TAR_FLAGS in configure (bug #62715) Rik <rik@octave.org> parents: 31121 diff changeset	3565
441aa6226223 build: cache REPRODUCIBLE_TAR_FLAGS in configure (bug #62715) Rik <rik@octave.org> parents: 31121 diff changeset	3566 REPRODUCIBLE_TAR_FLAGS="$octave_cv_tar_flags"
24077 e483dcb5777d build the source distribution archives reproducibly Mike Miller <mtmiller@octave.org> parents: 24022 diff changeset	3567 AC_SUBST(REPRODUCIBLE_TAR_FLAGS)
e483dcb5777d build the source distribution archives reproducibly Mike Miller <mtmiller@octave.org> parents: 24022 diff changeset	3568 AC_MSG_RESULT([$REPRODUCIBLE_TAR_FLAGS])
e483dcb5777d build the source distribution archives reproducibly Mike Miller <mtmiller@octave.org> parents: 24022 diff changeset	3569 ])
e483dcb5777d build the source distribution archives reproducibly Mike Miller <mtmiller@octave.org> parents: 24022 diff changeset	3570 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3571 dnl Check for texi2dvi.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3572 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3573 AC_DEFUN([OCTAVE_PROG_TEXI2DVI], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3574 AC_CHECK_PROG(TEXI2DVI, texi2dvi, texi2dvi, [])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3575 if test -z "$TEXI2DVI"; then
25310 0b253ba6eb91 avoid syntax errors in build-aux/subst scripts John W. Eaton <jwe@octave.org> parents: 25299 diff changeset	3576 TEXI2DVI='${top_srcdir}/build-aux/missing texi2dvi'
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3577 warn_texi2dvi="
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3578
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3579 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	3580 reconstruct the DVI version of the manual
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3581 "
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3582 OCTAVE_CONFIGURE_WARNING([warn_texi2dvi])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3583 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3584 AC_SUBST(TEXI2DVI)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3585 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3586 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3587 dnl Check for texi2pdf.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3588 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3589 AC_DEFUN([OCTAVE_PROG_TEXI2PDF], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3590 AC_REQUIRE([OCTAVE_PROG_TEXI2DVI])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3591 AC_CHECK_PROG(TEXI2PDF, texi2pdf, texi2pdf, [])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3592 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	3593 ac_octave_texi2pdf_missing=yes;
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3594 if test -n "$TEXI2DVI"; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3595 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	3596 ac_octave_texi2pdf_missing=no;
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3597 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3598 else
16068 b309a5da17f5 use yes/no instead of true/false in confgure scripts John W. Eaton <jwe@octave.org> parents: 16012 diff changeset	3599 ac_octave_texi2pdf_missing=no;
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3600 fi
16068 b309a5da17f5 use yes/no instead of true/false in confgure scripts John W. Eaton <jwe@octave.org> parents: 16012 diff changeset	3601 if test $ac_octave_texi2pdf_missing = yes; then
25310 0b253ba6eb91 avoid syntax errors in build-aux/subst scripts John W. Eaton <jwe@octave.org> parents: 25299 diff changeset	3602 TEXI2PDF='${top_srcdir}/build-aux/missing texi2pdf'
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3603 warn_texi2pdf="
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3604
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3605 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	3606 reconstruct the PDF version of the manual
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3607 "
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3608 OCTAVE_CONFIGURE_WARNING([warn_texi2pdf])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3609 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3610 AC_SUBST(TEXI2PDF)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3611 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3612 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3613 dnl Set default value for a variable and substitute it.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3614 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3615 AC_DEFUN([OCTAVE_SET_DEFAULT], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3616 ifelse($#, 2, [: ${$1=$2}
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3617 ])dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3618 AC_MSG_RESULT([defining $1 to be $$1])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3619 AC_SUBST($1)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3620 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3621 dnl
15144 9cc337ced51a build: Update OCTAVE_UMFPACK_SEPARATE_SPLIT macro to look for SuiteSparse header file. Rik <rik@octave.org> parents: 15141 diff changeset	3622 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	3623 dnl
15144 9cc337ced51a build: Update OCTAVE_UMFPACK_SEPARATE_SPLIT macro to look for SuiteSparse header file. Rik <rik@octave.org> parents: 15141 diff changeset	3624 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	3625 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3626 AC_DEFUN([OCTAVE_UMFPACK_SEPARATE_SPLIT], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3627 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	3628 AC_CACHE_VAL([octave_cv_umfpack_separate_split],
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3629 [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	3630 #include <stdint.h>
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3631 #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	3632 #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	3633 #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	3634 # include <suitesparse/umfpack.h>
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3635 #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	3636 # include <umfpack/umfpack.h>
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3637 #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	3638 # include <umfpack.h>
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3639 #endif
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21604 diff changeset	3640 #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	3641 typedef uint64_t idx_type;
eb572251b7c6 check for correct SuiteSparse functions if --enable-64 John W. Eaton <jwe@octave.org> parents: 16313 diff changeset	3642 #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	3643 #else
eb572251b7c6 check for correct SuiteSparse functions if --enable-64 John W. Eaton <jwe@octave.org> parents: 16313 diff changeset	3644 typedef int idx_type;
eb572251b7c6 check for correct SuiteSparse functions if --enable-64 John W. Eaton <jwe@octave.org> parents: 16313 diff changeset	3645 #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	3646 #endif
eb572251b7c6 check for correct SuiteSparse functions if --enable-64 John W. Eaton <jwe@octave.org> parents: 16313 diff changeset	3647 idx_type n = 5;
eb572251b7c6 check for correct SuiteSparse functions if --enable-64 John W. Eaton <jwe@octave.org> parents: 16313 diff changeset	3648 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	3649 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	3650 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	3651 -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	3652 double br[] = {8., 45., -3., 3., 19.};
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3653 double bi[] = {0., 0., 0., 0., 0.};
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3654 int main (void)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3655 {
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3656 double null = (double ) NULL ;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3657 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	3658 idx_type i ;
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3659 void Symbolic, Numeric ;
16318 eb572251b7c6 check for correct SuiteSparse functions if --enable-64 John W. Eaton <jwe@octave.org> parents: 16313 diff changeset	3660 (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	3661 (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	3662 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	3663 (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	3664 Numeric, null, null) ;
16318 eb572251b7c6 check for correct SuiteSparse functions if --enable-64 John W. Eaton <jwe@octave.org> parents: 16313 diff changeset	3665 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	3666 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	3667 if (fabs (*x - i - 1.) > 1.e-13)
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3668 return (1);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3669 return (0) ;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3670 }
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3671 ]])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3672 octave_cv_umfpack_separate_split=yes,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3673 octave_cv_umfpack_separate_split=no,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3674 octave_cv_umfpack_separate_split=yes)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3675 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3676 if test "$cross_compiling" = yes; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3677 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	3678 else
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3679 AC_MSG_RESULT([$octave_cv_umfpack_separate_split])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3680 fi
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	3681 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	3682 AC_DEFINE(UMFPACK_SEPARATE_SPLIT, 1,
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3683 [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	3684 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3685 ])

Mercurial > octave

annotate m4/acinclude.m4 @ 33589:f07a7fe7bd51 default tip @