octave: m4/acinclude.m4 annotate

annotate m4/acinclude.m4 @ 24124:9182a640afbe

* acinclude.m4: Also search for qt4-specific qscintilla lib names.

author	John W. Eaton <jwe@octave.org>
date	Thu, 05 Oct 2017 16:12:50 -0400
parents	7d9ba57201b4
children	ed746cbfce24

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

Mercurial > octave

annotate m4/acinclude.m4 @ 24124:9182a640afbe