octave: m4/acinclude.m4 annotate

annotate m4/acinclude.m4 @ 25931:332be8be16eb

dynamically load qt graphics * configure.ac (QT_OPENGL_LIBS): New variable. (LIBOCTGUI_LINK_DEPS): Delete $OPENGL_LIBS from the list. * acinclude.m4 (OCTAVE_CHECK_QT_VERSION): Check for Qt OpenGL module separately from other Qt modules. * subst-cross-config-vals.in.sh, subst-config-vals.in.sh: Substitute it. * build-env.h, build-env.in.cc, toplev.cc: Include QT_OPENGL_LIBS in build info. * libgui/src/module.mk (%canon_reldir%_%canon_reldir%_la_CPPFLAGS): Delete -I$(srcdir)/libgui/graphics from the list. * __init_qt__.cc: Use DEFUN_DLD and DEFMETHOD_DLD macros. Include comment to register qt toolkit using PKG_ADD file. * libgui/graphics/module.mk: Build __init_qt__.oct. * libgui/module.mk (%canon_reldir%_liboctgui_la_LIBADD): Delete $(LIBOCTGUI_GRAPHICS_LIB) from the list. Use $(QT_LIBS) instead of $(LIBOCTGUI_LINK_DEPS). * main-window.cc: (octave_interpreter::octave_interpreter): Don't call install___init_qt___functions or register qt graphics toolkit. * run-octave.in: Add $builddir/libgui/graphics directory to LOADPATH.

author	John W. Eaton <jwe@octave.org>
date	Fri, 28 Sep 2018 18:18:09 -0400
parents	4e108574385c
children	98d7a111786a

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
25054 6652d3823428 maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 25047 diff changeset	3 dnl Copyright (C) 1995-2018 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
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24446 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
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24446 diff changeset	9 dnl the Free Software Foundation, either version 3 of the License, or
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22509 diff changeset	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
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24446 diff changeset	19 dnl <https://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
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24446 diff changeset	122 // <https://www.gnu.org/licenses/>.
17965 1d58abc740c0 acinclude.m4: Place new macro CHECK_BROKEN_STL_ALGO_H in alphabetical ordering. Rik <rik@octave.org> parents: 17888 diff changeset	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.
18973 625e3bb65885 don't require Qt 4.7 (bug #42657) John W. Eaton <jwe@octave.org> parents: 18141 diff changeset	301 dnl
24093 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
25046 a4c687fec320 gui: set Qt Application and Desktop metadata for desktop integration (bug #53102) Mike Miller <mtmiller@octave.org> parents: 25042 diff changeset	347 dnl Check whether the Qt QGuiApplication class has the setDesktopFileName
a4c687fec320 gui: set Qt Application and Desktop metadata for desktop integration (bug #53102) Mike Miller <mtmiller@octave.org> parents: 25042 diff changeset	348 dnl static member function. This function was introduced in Qt 5.7.
a4c687fec320 gui: set Qt Application and Desktop metadata for desktop integration (bug #53102) Mike Miller <mtmiller@octave.org> parents: 25042 diff changeset	349 dnl
a4c687fec320 gui: set Qt Application and Desktop metadata for desktop integration (bug #53102) Mike Miller <mtmiller@octave.org> parents: 25042 diff changeset	350 dnl FIXME: Delete this entirely when we drop support for Qt 5.6 or older.
a4c687fec320 gui: set Qt Application and Desktop metadata for desktop integration (bug #53102) Mike Miller <mtmiller@octave.org> parents: 25042 diff changeset	351 dnl
a4c687fec320 gui: set Qt Application and Desktop metadata for desktop integration (bug #53102) Mike Miller <mtmiller@octave.org> parents: 25042 diff changeset	352 AC_DEFUN([OCTAVE_CHECK_FUNC_QGUIAPPLICATION_SETDESKTOPFILENAME], [
a4c687fec320 gui: set Qt Application and Desktop metadata for desktop integration (bug #53102) Mike Miller <mtmiller@octave.org> parents: 25042 diff changeset	353 AC_CACHE_CHECK([for QGuiApplication::setDesktopFileName],
a4c687fec320 gui: set Qt Application and Desktop metadata for desktop integration (bug #53102) Mike Miller <mtmiller@octave.org> parents: 25042 diff changeset	354 [octave_cv_func_qguiapplication_setdesktopfilename],
a4c687fec320 gui: set Qt Application and Desktop metadata for desktop integration (bug #53102) Mike Miller <mtmiller@octave.org> parents: 25042 diff changeset	355 [AC_LANG_PUSH(C++)
a4c687fec320 gui: set Qt Application and Desktop metadata for desktop integration (bug #53102) Mike Miller <mtmiller@octave.org> parents: 25042 diff changeset	356 ac_octave_save_CPPFLAGS="$CPPFLAGS"
a4c687fec320 gui: set Qt Application and Desktop metadata for desktop integration (bug #53102) Mike Miller <mtmiller@octave.org> parents: 25042 diff changeset	357 ac_octave_save_CXXFLAGS="$CXXFLAGS"
a4c687fec320 gui: set Qt Application and Desktop metadata for desktop integration (bug #53102) Mike Miller <mtmiller@octave.org> parents: 25042 diff changeset	358 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
a4c687fec320 gui: set Qt Application and Desktop metadata for desktop integration (bug #53102) Mike Miller <mtmiller@octave.org> parents: 25042 diff changeset	359 CXXFLAGS="$CXXPICFLAG $CPPFLAGS"
a4c687fec320 gui: set Qt Application and Desktop metadata for desktop integration (bug #53102) Mike Miller <mtmiller@octave.org> parents: 25042 diff changeset	360 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
a4c687fec320 gui: set Qt Application and Desktop metadata for desktop integration (bug #53102) Mike Miller <mtmiller@octave.org> parents: 25042 diff changeset	361 #include <QGuiApplication>
a4c687fec320 gui: set Qt Application and Desktop metadata for desktop integration (bug #53102) Mike Miller <mtmiller@octave.org> parents: 25042 diff changeset	362 ]], [[
a4c687fec320 gui: set Qt Application and Desktop metadata for desktop integration (bug #53102) Mike Miller <mtmiller@octave.org> parents: 25042 diff changeset	363 QGuiApplication::setDesktopFileName ("com.example.Example.desktop");
a4c687fec320 gui: set Qt Application and Desktop metadata for desktop integration (bug #53102) Mike Miller <mtmiller@octave.org> parents: 25042 diff changeset	364 ]])],
a4c687fec320 gui: set Qt Application and Desktop metadata for desktop integration (bug #53102) Mike Miller <mtmiller@octave.org> parents: 25042 diff changeset	365 octave_cv_func_qguiapplication_setdesktopfilename=yes,
a4c687fec320 gui: set Qt Application and Desktop metadata for desktop integration (bug #53102) Mike Miller <mtmiller@octave.org> parents: 25042 diff changeset	366 octave_cv_func_qguiapplication_setdesktopfilename=no)
a4c687fec320 gui: set Qt Application and Desktop metadata for desktop integration (bug #53102) Mike Miller <mtmiller@octave.org> parents: 25042 diff changeset	367 CPPFLAGS="$ac_octave_save_CPPFLAGS"
a4c687fec320 gui: set Qt Application and Desktop metadata for desktop integration (bug #53102) Mike Miller <mtmiller@octave.org> parents: 25042 diff changeset	368 CXXFLAGS="$ac_octave_save_CXXFLAGS"
a4c687fec320 gui: set Qt Application and Desktop metadata for desktop integration (bug #53102) Mike Miller <mtmiller@octave.org> parents: 25042 diff changeset	369 AC_LANG_POP(C++)
a4c687fec320 gui: set Qt Application and Desktop metadata for desktop integration (bug #53102) Mike Miller <mtmiller@octave.org> parents: 25042 diff changeset	370 ])
a4c687fec320 gui: set Qt Application and Desktop metadata for desktop integration (bug #53102) Mike Miller <mtmiller@octave.org> parents: 25042 diff changeset	371 if test $octave_cv_func_qguiapplication_setdesktopfilename = yes; then
a4c687fec320 gui: set Qt Application and Desktop metadata for desktop integration (bug #53102) Mike Miller <mtmiller@octave.org> parents: 25042 diff changeset	372 AC_DEFINE(HAVE_QGUIAPPLICATION_SETDESKTOPFILENAME, 1,
a4c687fec320 gui: set Qt Application and Desktop metadata for desktop integration (bug #53102) Mike Miller <mtmiller@octave.org> parents: 25042 diff changeset	373 [Define to 1 if you have the `QGuiApplication::setDesktopFileName' member function.])
a4c687fec320 gui: set Qt Application and Desktop metadata for desktop integration (bug #53102) Mike Miller <mtmiller@octave.org> parents: 25042 diff changeset	374 fi
a4c687fec320 gui: set Qt Application and Desktop metadata for desktop integration (bug #53102) Mike Miller <mtmiller@octave.org> parents: 25042 diff changeset	375 ])
a4c687fec320 gui: set Qt Application and Desktop metadata for desktop integration (bug #53102) Mike Miller <mtmiller@octave.org> parents: 25042 diff changeset	376 dnl
24827 1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	377 dnl Check whether the Qt QHeaderView class has the setSectionResizeMode
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	378 dnl function. This function was introduced in Qt 5.
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	379 dnl
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	380 dnl FIXME: Delete this entirely when we drop support for Qt 4.
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	381 dnl
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	382 AC_DEFUN([OCTAVE_CHECK_FUNC_QHEADERVIEW_SETSECTIONRESIZEMODE], [
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	383 AC_CACHE_CHECK([for QHeaderView::setSectionResizeMode],
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	384 [octave_cv_func_qheaderview_setsectionresizemode],
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	385 [AC_LANG_PUSH(C++)
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	386 ac_octave_save_CPPFLAGS="$CPPFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	387 ac_octave_save_CXXFLAGS="$CXXFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	388 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	389 CXXFLAGS="$CXXPICFLAG $CPPFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	390 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	391 #include <QHeaderView>
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	392 ]], [[
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	393 QHeaderView header_view (Qt::Horizontal);
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	394 header_view.setSectionResizeMode (QHeaderView::Interactive);
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	395 ]])],
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	396 octave_cv_func_qheaderview_setsectionresizemode=yes,
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	397 octave_cv_func_qheaderview_setsectionresizemode=no)
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	398 CPPFLAGS="$ac_octave_save_CPPFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	399 CXXFLAGS="$ac_octave_save_CXXFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	400 AC_LANG_POP(C++)
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	401 ])
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	402 if test $octave_cv_func_qheaderview_setsectionresizemode = yes; then
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	403 AC_DEFINE(HAVE_QHEADERVIEW_SETSECTIONRESIZEMODE, 1,
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	404 [Define to 1 if you have the `QHeaderView::setSectionResizeMode' member function.])
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	405 fi
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	406 ])
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	407 dnl
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	408 dnl Check whether the Qt QHeaderView class has the setSectionsClickable
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	409 dnl function. This function was introduced in Qt 5.
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	410 dnl
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	411 dnl FIXME: Delete this entirely when we drop support for Qt 4.
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	412 dnl
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	413 AC_DEFUN([OCTAVE_CHECK_FUNC_QHEADERVIEW_SETSECTIONSCLICKABLE], [
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	414 AC_CACHE_CHECK([for QHeaderView::setSectionsClickable],
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	415 [octave_cv_func_qheaderview_setsectionsclickable],
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	416 [AC_LANG_PUSH(C++)
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	417 ac_octave_save_CPPFLAGS="$CPPFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	418 ac_octave_save_CXXFLAGS="$CXXFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	419 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	420 CXXFLAGS="$CXXPICFLAG $CPPFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	421 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	422 #include <QHeaderView>
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	423 ]], [[
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	424 QHeaderView header_view (Qt::Horizontal);
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	425 header_view.setSectionsClickable (true);
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	426 ]])],
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	427 octave_cv_func_qheaderview_setsectionsclickable=yes,
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	428 octave_cv_func_qheaderview_setsectionsclickable=no)
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	429 CPPFLAGS="$ac_octave_save_CPPFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	430 CXXFLAGS="$ac_octave_save_CXXFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	431 AC_LANG_POP(C++)
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	432 ])
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	433 if test $octave_cv_func_qheaderview_setsectionsclickable = yes; then
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	434 AC_DEFINE(HAVE_QHEADERVIEW_SETSECTIONSCLICKABLE, 1,
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	435 [Define to 1 if you have the `QHeaderView::setSectionsClickable' member function.])
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	436 fi
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	437 ])
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	438 dnl
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	439 dnl Check whether the Qt QHeaderView class has the setSectionsMovable
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	440 dnl function. This function was introduced in Qt 5.
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	441 dnl
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	442 dnl FIXME: Delete this entirely when we drop support for Qt 4.
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	443 dnl
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	444 AC_DEFUN([OCTAVE_CHECK_FUNC_QHEADERVIEW_SETSECTIONSMOVABLE], [
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	445 AC_CACHE_CHECK([for QHeaderView::setSectionsMovable],
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	446 [octave_cv_func_qheaderview_setsectionsmovable],
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	447 [AC_LANG_PUSH(C++)
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	448 ac_octave_save_CPPFLAGS="$CPPFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	449 ac_octave_save_CXXFLAGS="$CXXFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	450 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	451 CXXFLAGS="$CXXPICFLAG $CPPFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	452 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	453 #include <QHeaderView>
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	454 ]], [[
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	455 QHeaderView header_view (Qt::Horizontal);
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	456 header_view.setSectionsMovable (true);
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	457 ]])],
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	458 octave_cv_func_qheaderview_setsectionsmovable=yes,
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	459 octave_cv_func_qheaderview_setsectionsmovable=no)
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	460 CPPFLAGS="$ac_octave_save_CPPFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	461 CXXFLAGS="$ac_octave_save_CXXFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	462 AC_LANG_POP(C++)
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	463 ])
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	464 if test $octave_cv_func_qheaderview_setsectionsmovable = yes; then
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	465 AC_DEFINE(HAVE_QHEADERVIEW_SETSECTIONSMOVABLE, 1,
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	466 [Define to 1 if you have the `QHeaderView::setSectionsMovable' member function.])
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	467 fi
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	468 ])
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	469 dnl
25061 5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	470 dnl Check whether the Qt QHelpSearchQueryWidget class has the searchInput
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	471 dnl member function. This function was introduced in Qt 5.9.
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	472 dnl
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	473 dnl FIXME: Delete this entirely when we drop support for Qt 5.8 or older.
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	474 dnl
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	475 AC_DEFUN([OCTAVE_CHECK_FUNC_QHELPSEARCHQUERYWIDGET_SEARCHINPUT], [
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	476 AC_CACHE_CHECK([for QHelpSearchQueryWidget::searchInput],
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	477 [octave_cv_func_qhelpsearchquerywidget_searchinput],
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	478 [AC_LANG_PUSH(C++)
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	479 ac_octave_save_CPPFLAGS="$CPPFLAGS"
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	480 ac_octave_save_CXXFLAGS="$CXXFLAGS"
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	481 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	482 CXXFLAGS="$CXXPICFLAG $CPPFLAGS"
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	483 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	484 #include <QHelpSearchQueryWidget>
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	485 #include <QString>
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	486 ]], [[
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	487 QHelpSearchQueryWidget *query_widget = new QHelpSearchQueryWidget ();
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	488 QString search_input = query_widget->searchInput ();
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	489 ]])],
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	490 octave_cv_func_qhelpsearchquerywidget_searchinput=yes,
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	491 octave_cv_func_qhelpsearchquerywidget_searchinput=no)
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	492 CPPFLAGS="$ac_octave_save_CPPFLAGS"
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	493 CXXFLAGS="$ac_octave_save_CXXFLAGS"
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	494 AC_LANG_POP(C++)
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	495 ])
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	496 if test $octave_cv_func_qhelpsearchquerywidget_searchinput = yes; then
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	497 AC_DEFINE(HAVE_QHELPSEARCHQUERYWIDGET_SEARCHINPUT, 1,
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	498 [Define to 1 if you have the `QHelpSearchQueryWidget::searchInput' member function.])
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	499 fi
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	500 ])
5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	501 dnl
24827 1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	502 dnl Check whether the Qt function qInstallMessageHandler is available.
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	503 dnl This function was introduced in Qt 5.
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	504 dnl
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	505 dnl FIXME: Delete this entirely when we drop support for Qt 4.
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	506 dnl
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	507 AC_DEFUN([OCTAVE_CHECK_FUNC_QINSTALLMESSAGEHANDLER], [
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	508 AC_CACHE_CHECK([for qInstallMessageHandler],
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	509 [octave_cv_func_qinstallmessagehandler],
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	510 [AC_LANG_PUSH(C++)
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	511 ac_octave_save_CPPFLAGS="$CPPFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	512 ac_octave_save_CXXFLAGS="$CXXFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	513 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	514 CXXFLAGS="$CXXPICFLAG $CPPFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	515 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	516 #include <QtGlobal>
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	517 ]], [[
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	518 qInstallMessageHandler (nullptr);
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	519 ]])],
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	520 octave_cv_func_qinstallmessagehandler=yes,
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	521 octave_cv_func_qinstallmessagehandler=no)
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	522 CPPFLAGS="$ac_octave_save_CPPFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	523 CXXFLAGS="$ac_octave_save_CXXFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	524 AC_LANG_POP(C++)
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	525 ])
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	526 if test $octave_cv_func_qinstallmessagehandler = yes; then
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	527 AC_DEFINE(HAVE_QINSTALLMESSAGEHANDLER, 1,
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	528 [Define to 1 if you have the `qInstallMessageHandler' function.])
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	529 fi
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	530 ])
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	531 dnl
24093 7d9ba57201b4 configure: improve Qt feature tests for functionality and consistency Mike Miller <mtmiller@octave.org> parents: 24077 diff changeset	532 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	533 dnl function. This member function was introduced in Qt 4.7.
18216 e54cfaae830b Make editor tabs draggable if feature is available Richard Crozier richard dot crozier(at)yahoo.co.uk parents: 18141 diff changeset	534 dnl
24093 7d9ba57201b4 configure: improve Qt feature tests for functionality and consistency Mike Miller <mtmiller@octave.org> parents: 24077 diff changeset	535 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	536 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	537 dnl
7d9ba57201b4 configure: improve Qt feature tests for functionality and consistency Mike Miller <mtmiller@octave.org> parents: 24077 diff changeset	538 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	539 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	540 [octave_cv_func_qlineedit_setplaceholdertext],
18216 e54cfaae830b Make editor tabs draggable if feature is available Richard Crozier richard dot crozier(at)yahoo.co.uk parents: 18141 diff changeset	541 [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	542 ac_octave_save_CPPFLAGS="$CPPFLAGS"
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	543 ac_octave_save_CXXFLAGS="$CXXFLAGS"
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	544 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
24093 7d9ba57201b4 configure: improve Qt feature tests for functionality and consistency Mike Miller <mtmiller@octave.org> parents: 24077 diff changeset	545 CXXFLAGS="$CXXPICFLAG $CPPFLAGS"
18216 e54cfaae830b Make editor tabs draggable if feature is available Richard Crozier richard dot crozier(at)yahoo.co.uk parents: 18141 diff changeset	546 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
24093 7d9ba57201b4 configure: improve Qt feature tests for functionality and consistency Mike Miller <mtmiller@octave.org> parents: 24077 diff changeset	547 #include <QLineEdit>
18216 e54cfaae830b Make editor tabs draggable if feature is available Richard Crozier richard dot crozier(at)yahoo.co.uk parents: 18141 diff changeset	548 ]], [[
24093 7d9ba57201b4 configure: improve Qt feature tests for functionality and consistency Mike Miller <mtmiller@octave.org> parents: 24077 diff changeset	549 QLineEdit line_edit;
7d9ba57201b4 configure: improve Qt feature tests for functionality and consistency Mike Miller <mtmiller@octave.org> parents: 24077 diff changeset	550 line_edit.setPlaceholderText ("placeholder text");
18216 e54cfaae830b Make editor tabs draggable if feature is available Richard Crozier richard dot crozier(at)yahoo.co.uk parents: 18141 diff changeset	551 ]])],
24093 7d9ba57201b4 configure: improve Qt feature tests for functionality and consistency Mike Miller <mtmiller@octave.org> parents: 24077 diff changeset	552 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	553 octave_cv_func_qlineedit_setplaceholdertext=no)
18216 e54cfaae830b Make editor tabs draggable if feature is available Richard Crozier richard dot crozier(at)yahoo.co.uk parents: 18141 diff changeset	554 CPPFLAGS="$ac_octave_save_CPPFLAGS"
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	555 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	556 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	557 ])
24093 7d9ba57201b4 configure: improve Qt feature tests for functionality and consistency Mike Miller <mtmiller@octave.org> parents: 24077 diff changeset	558 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	559 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	560 [Define to 1 if you have the `QLineEdit::setPlaceholderText' member function.])
18216 e54cfaae830b Make editor tabs draggable if feature is available Richard Crozier richard dot crozier(at)yahoo.co.uk parents: 18141 diff changeset	561 fi
e54cfaae830b Make editor tabs draggable if feature is available Richard Crozier richard dot crozier(at)yahoo.co.uk parents: 18141 diff changeset	562 ])
e54cfaae830b Make editor tabs draggable if feature is available Richard Crozier richard dot crozier(at)yahoo.co.uk parents: 18141 diff changeset	563 dnl
24827 1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	564 dnl Check whether the Qt QMouseEvent class has the localPos function.
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	565 dnl This function was introduced in Qt 5.
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	566 dnl
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	567 dnl FIXME: Delete this entirely when we drop support for Qt 4.
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	568 dnl
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	569 AC_DEFUN([OCTAVE_CHECK_FUNC_QMOUSEEVENT_LOCALPOS], [
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	570 AC_CACHE_CHECK([for QMouseEvent::localPos],
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	571 [octave_cv_func_qmouseevent_localpos],
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	572 [AC_LANG_PUSH(C++)
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	573 ac_octave_save_CPPFLAGS="$CPPFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	574 ac_octave_save_CXXFLAGS="$CXXFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	575 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	576 CXXFLAGS="$CXXPICFLAG $CPPFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	577 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	578 #include <QMouseEvent>
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	579 ]], [[
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	580 QMouseEvent *event;
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	581 event->localPos ();
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	582 ]])],
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	583 octave_cv_func_qmouseevent_localpos=yes,
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	584 octave_cv_func_qmouseevent_localpos=no)
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	585 CPPFLAGS="$ac_octave_save_CPPFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	586 CXXFLAGS="$ac_octave_save_CXXFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	587 AC_LANG_POP(C++)
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	588 ])
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	589 if test $octave_cv_func_qmouseevent_localpos = yes; then
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	590 AC_DEFINE(HAVE_QMOUSEEVENT_LOCALPOS, 1,
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	591 [Define to 1 if you have the `QMouseEvent::localPos' member function.])
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	592 fi
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	593 ])
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	594 dnl
24093 7d9ba57201b4 configure: improve Qt feature tests for functionality and consistency Mike Miller <mtmiller@octave.org> parents: 24077 diff changeset	595 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	596 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	597 dnl in QScintilla 2.7.
7d9ba57201b4 configure: improve Qt feature tests for functionality and consistency Mike Miller <mtmiller@octave.org> parents: 24077 diff changeset	598 dnl
7d9ba57201b4 configure: improve Qt feature tests for functionality and consistency Mike Miller <mtmiller@octave.org> parents: 24077 diff changeset	599 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	600 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	601 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	602 dnl
0a66861d8069 implementation of search in selection in gui editor (bbug #41196) Torsten <ttl@justmail.de> parents: 18216 diff changeset	603 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	604 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	605 [octave_cv_func_qsci_findfirstinselection],
0a66861d8069 implementation of search in selection in gui editor (bbug #41196) Torsten <ttl@justmail.de> parents: 18216 diff changeset	606 [AC_LANG_PUSH(C++)
0a66861d8069 implementation of search in selection in gui editor (bbug #41196) Torsten <ttl@justmail.de> parents: 18216 diff changeset	607 ac_octave_save_CPPFLAGS="$CPPFLAGS"
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	608 ac_octave_save_CXXFLAGS="$CXXFLAGS"
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	609 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	610 CXXFLAGS="$CXXPICFLAG $CXXFLAGS"
18854 0a66861d8069 implementation of search in selection in gui editor (bbug #41196) Torsten <ttl@justmail.de> parents: 18216 diff changeset	611 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	612 #include <Qsci/qsciscintilla.h>
0a66861d8069 implementation of search in selection in gui editor (bbug #41196) Torsten <ttl@justmail.de> parents: 18216 diff changeset	613 class qsci : public QsciScintilla
0a66861d8069 implementation of search in selection in gui editor (bbug #41196) Torsten <ttl@justmail.de> parents: 18216 diff changeset	614 {
0a66861d8069 implementation of search in selection in gui editor (bbug #41196) Torsten <ttl@justmail.de> parents: 18216 diff changeset	615 public:
0a66861d8069 implementation of search in selection in gui editor (bbug #41196) Torsten <ttl@justmail.de> parents: 18216 diff changeset	616 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	617 { 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	618 ~qsci () {}
0a66861d8069 implementation of search in selection in gui editor (bbug #41196) Torsten <ttl@justmail.de> parents: 18216 diff changeset	619 };
0a66861d8069 implementation of search in selection in gui editor (bbug #41196) Torsten <ttl@justmail.de> parents: 18216 diff changeset	620 ]], [[
0a66861d8069 implementation of search in selection in gui editor (bbug #41196) Torsten <ttl@justmail.de> parents: 18216 diff changeset	621 qsci edit;
0a66861d8069 implementation of search in selection in gui editor (bbug #41196) Torsten <ttl@justmail.de> parents: 18216 diff changeset	622 ]])],
0a66861d8069 implementation of search in selection in gui editor (bbug #41196) Torsten <ttl@justmail.de> parents: 18216 diff changeset	623 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	624 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	625 CPPFLAGS="$ac_octave_save_CPPFLAGS"
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	626 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	627 AC_LANG_POP(C++)
0a66861d8069 implementation of search in selection in gui editor (bbug #41196) Torsten <ttl@justmail.de> parents: 18216 diff changeset	628 ])
0a66861d8069 implementation of search in selection in gui editor (bbug #41196) Torsten <ttl@justmail.de> parents: 18216 diff changeset	629 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	630 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	631 [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	632 fi
0a66861d8069 implementation of search in selection in gui editor (bbug #41196) Torsten <ttl@justmail.de> parents: 18216 diff changeset	633 ])
0a66861d8069 implementation of search in selection in gui editor (bbug #41196) Torsten <ttl@justmail.de> parents: 18216 diff changeset	634 dnl
24823 53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	635 dnl Check whether QObject::findChildren accepts Qt::FindChildOptions
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	636 dnl argument.
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	637 dnl
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	638 dnl FIXME: Delete this entirely when we drop support for Qt 4.
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	639 dnl
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	640 AC_DEFUN([OCTAVE_CHECK_FUNC_QOBJECT_FINDCHILDREN_ACCEPTS_FINDCHILDOPTIONS], [
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	641 AC_CACHE_CHECK([whether QObject::findChildren accepts Qt::FindChildOptions],
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	642 [octave_cv_func_qobject_findchildren_accepts_findchildoptions],
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	643 [AC_LANG_PUSH(C++)
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	644 ac_octave_save_CPPFLAGS="$CPPFLAGS"
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	645 ac_octave_save_CXXFLAGS="$CXXFLAGS"
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	646 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	647 CXXFLAGS="$CXXPICFLAG $CXXFLAGS"
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	648 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	649 #include <QList>
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	650 #include <QObject>
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	651 #include <QWidget>
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	652 ]], [[
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	653 QObject obj;
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	654 QList<QWidget *> widgets
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	655 = obj.findChildren<QWidget *> ("name", Qt::FindDirectChildrenOnly);
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	656 ]])],
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	657 octave_cv_func_qobject_findchildren_accepts_findchildoptions=yes,
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	658 octave_cv_func_qobject_findchildren_accepts_findchildoptions=no)
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	659 CPPFLAGS="$ac_octave_save_CPPFLAGS"
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	660 CXXFLAGS="$ac_octave_save_CXXFLAGS"
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	661 AC_LANG_POP(C++)
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	662 ])
24825 e08c1fea96c5 acinclude.m4: Fix another typo in cset 53f68d0fb122. Rik <rik@octave.org> parents: 24824 diff changeset	663 if test $octave_cv_func_qobject_findchildren_accepts_findchildoptions = yes; then
24824 cce5d2ea39ff acinclude.m4: Fix typo in previous cset (53f68d0fb122). Rik <rik@octave.org> parents: 24823 diff changeset	664 AC_DEFINE(QOBJECT_FINDCHILDREN_ACCEPTS_FINDCHILDOPTIONS, 1,
24823 53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	665 [Define to 1 if 'QObject::findChildren' accepts 'Qt::FindChildOptions' argument.])
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	666 fi
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	667 ])
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	668 dnl
25884 4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25862 diff changeset	669 dnl Check whether the Qt class QScreen has the devicePixelRatio member function.
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25862 diff changeset	670 dnl This member function was introduced in Qt 5.5.
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25862 diff changeset	671 dnl
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25862 diff changeset	672 AC_DEFUN([OCTAVE_CHECK_FUNC_QSCREEN_DEVICEPIXELRATIO], [
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25862 diff changeset	673 AC_CACHE_CHECK([for QScreen::devicePixelRatio in <QScreen>],
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25862 diff changeset	674 [octave_cv_func_qscreen_devicepixelratio],
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25862 diff changeset	675 [AC_LANG_PUSH(C++)
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25862 diff changeset	676 ac_octave_save_CPPFLAGS="$CPPFLAGS"
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25862 diff changeset	677 ac_octave_save_CXXFLAGS="$CXXFLAGS"
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25862 diff changeset	678 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25862 diff changeset	679 CXXFLAGS="$CXXPICFLAG $CXXFLAGS"
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25862 diff changeset	680 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25862 diff changeset	681 #include <QApplication>
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25862 diff changeset	682 #include <QScreen>
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25862 diff changeset	683 ]], [[
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25862 diff changeset	684 QScreen *screen = QApplication::primaryScreen ();
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25862 diff changeset	685 qreal ratio = screen->devicePixelRatio ();
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25862 diff changeset	686 ]])],
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25862 diff changeset	687 octave_cv_func_qscreen_devicepixelratio=yes,
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25862 diff changeset	688 octave_cv_func_qscreen_devicepixelratio=no)
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25862 diff changeset	689 CPPFLAGS="$ac_octave_save_CPPFLAGS"
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25862 diff changeset	690 CXXFLAGS="$ac_octave_save_CXXFLAGS"
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25862 diff changeset	691 AC_LANG_POP(C++)
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25862 diff changeset	692 ])
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25862 diff changeset	693 if test $octave_cv_func_qscreen_devicepixelratio = yes; then
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25862 diff changeset	694 AC_DEFINE(HAVE_QSCREEN_DEVICEPIXELRATIO, 1,
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25862 diff changeset	695 [Define to 1 if you have the `QScreen::devicePixelRatio' member function.])
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25862 diff changeset	696 fi
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25862 diff changeset	697 ])
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25862 diff changeset	698 dnl
24093 7d9ba57201b4 configure: improve Qt feature tests for functionality and consistency Mike Miller <mtmiller@octave.org> parents: 24077 diff changeset	699 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	700 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	701 dnl
7d9ba57201b4 configure: improve Qt feature tests for functionality and consistency Mike Miller <mtmiller@octave.org> parents: 24077 diff changeset	702 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	703 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	704 dnl
e54cfaae830b Make editor tabs draggable if feature is available Richard Crozier richard dot crozier(at)yahoo.co.uk parents: 18141 diff changeset	705 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	706 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	707 [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	708 [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	709 ac_octave_save_CPPFLAGS="$CPPFLAGS"
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	710 ac_octave_save_CXXFLAGS="$CXXFLAGS"
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	711 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	712 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	713 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	714 #include <QTabWidget>
e54cfaae830b Make editor tabs draggable if feature is available Richard Crozier richard dot crozier(at)yahoo.co.uk parents: 18141 diff changeset	715 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	716 {
e54cfaae830b Make editor tabs draggable if feature is available Richard Crozier richard dot crozier(at)yahoo.co.uk parents: 18141 diff changeset	717 public:
e54cfaae830b Make editor tabs draggable if feature is available Richard Crozier richard dot crozier(at)yahoo.co.uk parents: 18141 diff changeset	718 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	719 ~tab_widget () {}
e54cfaae830b Make editor tabs draggable if feature is available Richard Crozier richard dot crozier(at)yahoo.co.uk parents: 18141 diff changeset	720 };
e54cfaae830b Make editor tabs draggable if feature is available Richard Crozier richard dot crozier(at)yahoo.co.uk parents: 18141 diff changeset	721 ]], [[
e54cfaae830b Make editor tabs draggable if feature is available Richard Crozier richard dot crozier(at)yahoo.co.uk parents: 18141 diff changeset	722 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	723 ]])],
e54cfaae830b Make editor tabs draggable if feature is available Richard Crozier richard dot crozier(at)yahoo.co.uk parents: 18141 diff changeset	724 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	725 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	726 CPPFLAGS="$ac_octave_save_CPPFLAGS"
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	727 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	728 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	729 ])
e54cfaae830b Make editor tabs draggable if feature is available Richard Crozier richard dot crozier(at)yahoo.co.uk parents: 18141 diff changeset	730 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	731 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	732 [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	733 fi
0a66861d8069 implementation of search in selection in gui editor (bbug #41196) Torsten <ttl@justmail.de> parents: 18216 diff changeset	734 ])
0a66861d8069 implementation of search in selection in gui editor (bbug #41196) Torsten <ttl@justmail.de> parents: 18216 diff changeset	735 dnl
24827 1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	736 dnl Check whether Qt message handler function accepts QMessageLogContext
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	737 dnl argument. This change was introduced in Qt 5.
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	738 dnl
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	739 dnl FIXME: Delete this entirely when we drop support for Qt 4.
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	740 dnl
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	741 AC_DEFUN([OCTAVE_CHECK_FUNC_QTMESSAGEHANDLER_ACCEPTS_QMESSAGELOGCONTEXT], [
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	742 AC_CACHE_CHECK([whether Qt message handler accepts QMessageLogContext],
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	743 [octave_cv_func_qtmessagehandler_accepts_qmessagelogcontext],
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	744 [AC_LANG_PUSH(C++)
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	745 ac_octave_save_CPPFLAGS="$CPPFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	746 ac_octave_save_CXXFLAGS="$CXXFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	747 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	748 CXXFLAGS="$CXXPICFLAG $CXXFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	749 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	750 #include <QtGlobal>
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	751 static void
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	752 msg_handler (QtMsgType, const QMessageLogContext &, const QString &)
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	753 { }
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	754 ]], [[
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	755 QtMessageHandler fptr = msg_handler;
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	756 ]])],
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	757 octave_cv_func_qtmessagehandler_accepts_qmessagelogcontext=yes,
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	758 octave_cv_func_qtmessagehandler_accepts_qmessagelogcontext=no)
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	759 CPPFLAGS="$ac_octave_save_CPPFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	760 CXXFLAGS="$ac_octave_save_CXXFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	761 AC_LANG_POP(C++)
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	762 ])
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	763 if test $octave_cv_func_qtmessagehandler_accepts_qmessagelogcontext = yes; then
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	764 AC_DEFINE(QTMESSAGEHANDLER_ACCEPTS_QMESSAGELOGCONTEXT, 1,
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	765 [Define to 1 if Qt message handler accepts 'QMessageLogContext' argument.])
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	766 fi
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	767 ])
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	768 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	769 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	770 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	771 AC_DEFUN([OCTAVE_CHECK_HDF5_HAS_VER_16_API], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	772 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	773 [octave_cv_hdf5_has_ver_16_api],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	774 [AC_LINK_IFELSE([AC_LANG_PROGRAM([[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	775 #include <hdf5.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	776 ]], [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	777 H5Eset_auto (0, 0);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	778 ]])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	779 octave_cv_hdf5_has_ver_16_api=yes,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	780 octave_cv_hdf5_has_ver_16_api=no)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	781 ])
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	782 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	783 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	784 fi
14605 28e53daab1f8 Cleanup on autoconf warnings Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14550 diff changeset	785 ])
28e53daab1f8 Cleanup on autoconf warnings Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14550 diff changeset	786 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	787 dnl Usage:
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	788 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	789 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	790 dnl REQUIRED)
14605 28e53daab1f8 Cleanup on autoconf warnings Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14550 diff changeset	791 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	792 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	793 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	794 [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	795 [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	796 [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	797 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	798
23017 0f22914be30e * acinclude.m4 (OCTAVE_CHECK_LIB): Downcase --with-XYZ options. John W. Eaton <jwe@octave.org> parents: 23008 diff changeset	799 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	800 [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	801 [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	802 [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	803 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	804
23017 0f22914be30e * acinclude.m4 (OCTAVE_CHECK_LIB): Downcase --with-XYZ options. John W. Eaton <jwe@octave.org> parents: 23008 diff changeset	805 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	806 [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	807 [m4_ifblank([$7],
23017 0f22914be30e * acinclude.m4 (OCTAVE_CHECK_LIB): Downcase --with-XYZ options. John W. Eaton <jwe@octave.org> parents: 23008 diff changeset	808 [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	809 [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	810 [m4_ifblank([$7],
23017 0f22914be30e * acinclude.m4 (OCTAVE_CHECK_LIB): Downcase --with-XYZ options. John W. Eaton <jwe@octave.org> parents: 23008 diff changeset	811 [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	812 [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	813 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	814
22039 0a528a6dac95 build: use pkg-config in OCTAVE_CHECK_LIB without overriding user options Mike Miller <mtmiller@octave.org> parents: 22036 diff changeset	815 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	816 m4_toupper([$1])_LIBS=
21381 e5d96f39a37d configure script fixes John W. Eaton <jwe@octave.org> parents: 21374 diff changeset	817 warn_$1="$3"
9519 ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	818 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	819 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	820 ifelse([$#], 10,
23017 0f22914be30e * acinclude.m4 (OCTAVE_CHECK_LIB): Downcase --with-XYZ options. John W. Eaton <jwe@octave.org> parents: 23008 diff changeset	821 [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	822 [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	823 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	824 ;;
9519 ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	825 yes \| "")
22039 0a528a6dac95 build: use pkg-config in OCTAVE_CHECK_LIB without overriding user options Mike Miller <mtmiller@octave.org> parents: 22036 diff changeset	826 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	827 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	828 ;;
ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	829 -* \| / \| .a \| .so \| .so. \| *.o)
ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	830 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	831 ;;
ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	832 *)
ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	833 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	834 ;;
ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	835 esac
ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	836
22039 0a528a6dac95 build: use pkg-config in OCTAVE_CHECK_LIB without overriding user options Mike Miller <mtmiller@octave.org> parents: 22036 diff changeset	837 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	838 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	839 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	840 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	841 fi
0a528a6dac95 build: use pkg-config in OCTAVE_CHECK_LIB without overriding user options Mike Miller <mtmiller@octave.org> parents: 22036 diff changeset	842 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	843 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	844 fi
23835 6ae0292aaa5c configure: ensure empty pkg-config results are actually empty (bug #51680) Mike Miller <mtmiller@octave.org> parents: 23414 diff changeset	845 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	846 ])
0a528a6dac95 build: use pkg-config in OCTAVE_CHECK_LIB without overriding user options Mike Miller <mtmiller@octave.org> parents: 22036 diff changeset	847 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	848
9519 ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	849 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	850 ac_octave_save_CPPFLAGS="$CPPFLAGS"
15350 6a0c0d3d60b6 build: Implement some caching for OCTAVE_CHECK_LIB macro. Rik <rik@octave.org> parents: 15338 diff changeset	851 ac_octave_save_LDFLAGS="$LDFLAGS"
6a0c0d3d60b6 build: Implement some caching for OCTAVE_CHECK_LIB macro. Rik <rik@octave.org> parents: 15338 diff changeset	852 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	853 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	854 LDFLAGS="$m4_toupper([$1])_LDFLAGS $LDFLAGS"
6a0c0d3d60b6 build: Implement some caching for OCTAVE_CHECK_LIB macro. Rik <rik@octave.org> parents: 15338 diff changeset	855 LIBS="$m4_toupper([$1])_LIBS $LIBS"
9523 0ce82753dd72 more configure changes for libraries John W. Eaton <jwe@octave.org> parents: 9520 diff changeset	856 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	857 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	858 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	859 [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	860 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	861 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	862 [octave_cv_lib_$1],
6a0c0d3d60b6 build: Implement some caching for OCTAVE_CHECK_LIB macro. Rik <rik@octave.org> parents: 15338 diff changeset	863 [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	864 [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	865 ])
6a0c0d3d60b6 build: Implement some caching for OCTAVE_CHECK_LIB macro. Rik <rik@octave.org> parents: 15338 diff changeset	866 if test "$octave_cv_lib_$1" = yes; then
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	867 m4_ifblank([$8], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	868 warn_$1=
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	869 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	870 [Define to 1 if $2 is available.])], [$8])
25299 537b732926fb fix logic error in OCTAVE_CONFIG_LIB (bug #53736) John W. Eaton <jwe@octave.org> parents: 25135 diff changeset	871 else
537b732926fb fix logic error in OCTAVE_CONFIG_LIB (bug #53736) John W. Eaton <jwe@octave.org> parents: 25135 diff changeset	872 m4_toupper([$1])_LIBS=
9519 ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	873 fi
25299 537b732926fb fix logic error in OCTAVE_CONFIG_LIB (bug #53736) John W. Eaton <jwe@octave.org> parents: 25135 diff changeset	874 else
25666 b08864ae8506 OCTAVE_CHECK_LIB: avoid shell syntax error if not checking for lib John W. Eaton <jwe@octave.org> parents: 25559 diff changeset	875 octave_cv_lib_$1=no
25299 537b732926fb fix logic error in OCTAVE_CONFIG_LIB (bug #53736) John W. Eaton <jwe@octave.org> parents: 25135 diff changeset	876 m4_toupper([$1])_LIBS=
9568 d3fccc4c4b9e use OCTAVE_CHECK_LIBRARY to check for ARPACK John W. Eaton <jwe@octave.org> parents: 9543 diff changeset	877 fi
9523 0ce82753dd72 more configure changes for libraries John W. Eaton <jwe@octave.org> parents: 9520 diff changeset	878 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	879 CPPFLAGS="$ac_octave_save_CPPFLAGS"
15350 6a0c0d3d60b6 build: Implement some caching for OCTAVE_CHECK_LIB macro. Rik <rik@octave.org> parents: 15338 diff changeset	880 LDFLAGS="$ac_octave_save_LDFLAGS"
6a0c0d3d60b6 build: Implement some caching for OCTAVE_CHECK_LIB macro. Rik <rik@octave.org> parents: 15338 diff changeset	881 LIBS="$ac_octave_save_LIBS"
21381 e5d96f39a37d configure script fixes John W. Eaton <jwe@octave.org> parents: 21374 diff changeset	882 else
e5d96f39a37d configure script fixes John W. Eaton <jwe@octave.org> parents: 21374 diff changeset	883 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	884 fi
15350 6a0c0d3d60b6 build: Implement some caching for OCTAVE_CHECK_LIB macro. Rik <rik@octave.org> parents: 15338 diff changeset	885
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	886 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	887 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	888 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	889 fi])
9519 ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	890 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	891 if test -n "$warn_$1"; then
21381 e5d96f39a37d configure script fixes John W. Eaton <jwe@octave.org> parents: 21374 diff changeset	892 OCTAVE_CONFIGURE_WARNING([warn_$1])
9519 ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	893 fi
ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	894 ])
ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	895 dnl
15133 f91eac1bc66d m4/acinclude.m4: Correct typos, use consistent style for describing macros. Rik <rik@octave.org> parents: 15126 diff changeset	896 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	897 dnl
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	898 dnl Using a pure Fortran program doesn't seem to crash when linked
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	899 dnl with the buggy ARPACK library, but the C++ program does. Maybe it
15133 f91eac1bc66d m4/acinclude.m4: Correct typos, use consistent style for describing macros. Rik <rik@octave.org> parents: 15126 diff changeset	900 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	901 dnl allocated arrays in Fortran does not?
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	902 dnl
18058 46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	903 dnl FIXME: it would be nice to avoid the duplication of F77 macros
25047 1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	904 dnl and typedefs here and in the f77-fcn.h header file. Also, the
1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	905 dnl definition of the character handling macros are not right for
1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	906 dnl all systems (but should work on most modern systems in use today).
18058 46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	907 dnl
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	908 AC_DEFUN([OCTAVE_CHECK_LIB_ARPACK_OK_1], [
14144 834df9f10963 remove ARPACK files from sources and restore configure checks for external ARPACK library John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	909 AC_CACHE_CHECK([whether the arpack library works],
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	910 [octave_cv_lib_arpack_ok_1],
15294 d1751eee9a42 acinclude.m4: Use AC_LANG_PUSH macro with AC_CACHE_CHECK for greater efficiency. Rik <rik@octave.org> parents: 15293 diff changeset	911 [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	912 AC_RUN_IFELSE([AC_LANG_PROGRAM([[
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	913
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	914 #include <cfloat>
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	915
18058 46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	916 #include <stdint.h>
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	917
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	918 typedef int F77_RET_T;
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	919
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	920 #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	921 #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	922
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	923 #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	924
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	925 #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	926 #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	927
25047 1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	928 #define F77_INT $OCTAVE_F77_INT_TYPE
1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	929 #define F77_DBLE double
1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	930
18058 46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	931 extern "C"
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	932 {
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	933 F77_RET_T
25047 1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	934 F77_FUNC (dnaupd, DNAUPD) (F77_INT&,
18058 46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	935 F77_CONST_CHAR_ARG_DECL,
25047 1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	936 const F77_INT&,
18058 46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	937 F77_CONST_CHAR_ARG_DECL,
25047 1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	938 F77_INT&, const F77_DBLE&,
1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	939 F77_DBLE, const F77_INT&, F77_DBLE,
1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	940 const F77_INT&, F77_INT*,
1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	941 F77_INT, F77_DBLE, F77_DBLE*,
1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	942 const F77_INT&, F77_INT&
18058 46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	943 F77_CHAR_ARG_LEN_DECL
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	944 F77_CHAR_ARG_LEN_DECL);
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	945
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	946 F77_RET_T
25047 1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	947 F77_FUNC (dneupd, DNEUPD) (const F77_INT&,
18058 46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	948 F77_CONST_CHAR_ARG_DECL,
25047 1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	949 F77_INT, F77_DBLE, F77_DBLE*,
1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	950 F77_DBLE*, const F77_INT&, const F77_DBLE&,
1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	951 const F77_DBLE&, F77_DBLE*,
18058 46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	952 F77_CONST_CHAR_ARG_DECL,
25047 1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	953 const F77_INT&,
18058 46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	954 F77_CONST_CHAR_ARG_DECL,
25047 1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	955 F77_INT&, const F77_DBLE&, F77_DBLE*,
1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	956 const F77_INT&, F77_DBLE*,
1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	957 const F77_INT&, F77_INT*,
1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	958 F77_INT, F77_DBLE, F77_DBLE*,
1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	959 const F77_INT&, F77_INT&
18058 46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	960 F77_CHAR_ARG_LEN_DECL
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	961 F77_CHAR_ARG_LEN_DECL
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	962 F77_CHAR_ARG_LEN_DECL);
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	963
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	964 F77_RET_T
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	965 F77_FUNC (dgemv, DGEMV) (F77_CONST_CHAR_ARG_DECL,
25047 1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	966 const F77_INT&, const F77_INT&,
1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	967 const F77_DBLE&, const F77_DBLE*,
1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	968 const F77_INT&, const F77_DBLE*,
1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	969 const F77_INT&, const F77_DBLE&,
1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	970 F77_DBLE*, const F77_INT&
18058 46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	971 F77_CHAR_ARG_LEN_DECL);
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	972 }
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	973
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	974 void
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	975 doit (void)
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	976 {
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	977 // 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	978
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	979 // Problem matrix. See bug #31479.
25047 1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	980 F77_INT n = 4;
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	981 double m = new double [n n];
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	982 m[0] = 1, m[4] = 0, m[8] = 0, m[12] = -1;
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	983 m[1] = 0, m[5] = 1, m[9] = 0, m[13] = 0;
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	984 m[2] = 0, m[6] = 0, m[10] = 1, m[14] = 0;
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	985 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	986
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	987 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	988
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	989 resid[0] = 0.960966;
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	990 resid[1] = 0.741195;
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	991 resid[2] = 0.150143;
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	992 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	993
25047 1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	994 F77_INT *ip = new F77_INT [11];
14144 834df9f10963 remove ARPACK files from sources and restore configure checks for external ARPACK library John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	995
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	996 ip[0] = 1; // ishift
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	997 ip[1] = 0; // ip[1] not referenced
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	998 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	999 ip[3] = 1; // NB blocksize in recurrence
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1000 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	1001 ip[5] = 0; // ip[5] not referenced
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1002 ip[6] = 1; // mode
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1003 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	1004 ip[8] = 0;
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1005 ip[9] = 0;
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1006 ip[10] = 0;
17034 8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	1007
25047 1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	1008 F77_INT *ipntr = new F77_INT [14];
14144 834df9f10963 remove ARPACK files from sources and restore configure checks for external ARPACK library John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	1009
25047 1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	1010 F77_INT k = 1;
1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	1011 F77_INT p = 3;
1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	1012 F77_INT lwork = 3 * p * (p + 2);
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1013
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1014 double v = new double [n (p + 1)];
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1015 double *workl = new double [lwork + 1];
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1016 double workd = new double [3 n + 1];
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1017
25047 1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	1018 F77_INT ido = 0;
1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	1019 F77_INT info = 0;
14144 834df9f10963 remove ARPACK files from sources and restore configure checks for external ARPACK library John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	1020
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1021 double tol = DBL_EPSILON;
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1022
17034 8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	1023 do
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1024 {
18058 46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	1025 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	1026 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	1027 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	1028 workd, workl, lwork, info
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	1029 F77_CHAR_ARG_LEN (1)
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	1030 F77_CHAR_ARG_LEN (2));
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1031
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1032 if (ido == -1 \|\| ido == 1 \|\| ido == 2)
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1033 {
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1034 double *x = workd + ipntr[0] - 1;
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1035 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	1036
18058 46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	1037 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	1038 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	1039 F77_CHAR_ARG_LEN (1));
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1040 }
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1041 else
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1042 {
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1043 if (info < 0)
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1044 return; // Error
14144 834df9f10963 remove ARPACK files from sources and restore configure checks for external ARPACK library John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	1045
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1046 break;
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1047 }
17034 8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	1048 }
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1049 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	1050
25047 1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	1051 F77_INT *sel = new F77_INT [p];
14144 834df9f10963 remove ARPACK files from sources and restore configure checks for external ARPACK library John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	1052
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1053 // 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	1054 double *dr = new double [k + 1];
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1055 double *di = new double [k + 1];
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1056 double workev = new double [3 p];
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1057
25047 1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	1058 for (F77_INT i = 0; i < k + 1; i++)
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1059 dr[i] = di[i] = 0.0;
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1060
25047 1fe6002f68a7 update arpack checks for F77_INT vs octave_idx_type changes John W. Eaton <jwe@octave.org> parents: 25046 diff changeset	1061 F77_INT rvec = 1;
14144 834df9f10963 remove ARPACK files from sources and restore configure checks for external ARPACK library John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	1062
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1063 double sigmar = 0.0;
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1064 double sigmai = 0.0;
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1065
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1066 // 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	1067 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	1068
18058 46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	1069 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	1070 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	1071 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	1072 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	1073 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	1074 workl, lwork, info
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	1075 F77_CHAR_ARG_LEN (1)
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	1076 F77_CHAR_ARG_LEN (1)
46ca76f194cb make arpack check work with --enable-64 John W. Eaton <jwe@octave.org> parents: 18036 diff changeset	1077 F77_CHAR_ARG_LEN (2));
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1078 }
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1079
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1080 ]], [[
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1081
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1082 for (int i = 0; i < 10; i++)
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	1083 doit ();
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1084
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1085 ]])],
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1086 octave_cv_lib_arpack_ok_1=yes,
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1087 octave_cv_lib_arpack_ok_1=no,
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1088 octave_cv_lib_arpack_ok_1=yes)
15294 d1751eee9a42 acinclude.m4: Use AC_LANG_PUSH macro with AC_CACHE_CHECK for greater efficiency. Rik <rik@octave.org> parents: 15293 diff changeset	1089 AC_LANG_POP(C++)
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1090 ])
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1091 if test $octave_cv_lib_arpack_ok_1 = yes; then
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1092 $1
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1093 :
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1094 else
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1095 $2
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1096 :
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1097 fi
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1098 ])
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1099 dnl
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1100 dnl Check whether ARPACK is buggy (it doesn't crash, but gets wrong answers).
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1101 dnl
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1102 dnl ARPACK versions < 3.3.0 have a bug which results in different eigenvalues
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1103 dnl being calculated depending on whether eigenvectors are also requested.
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1104 dnl See bug #52425.
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1105 dnl
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1106 AC_DEFUN([OCTAVE_CHECK_LIB_ARPACK_OK_2], [
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1107 AC_CACHE_CHECK([whether the arpack library is free of bugs],
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1108 [octave_cv_lib_arpack_ok_2],
24336 0771ce2d30ef build: Fix compiling OCTAVE_ARPACK_OK_2 Fortran code (bug #52425). Rik <rik@octave.org> parents: 24289 diff changeset	1109 [save_FFLAGS="$FFLAGS"
0771ce2d30ef build: Fix compiling OCTAVE_ARPACK_OK_2 Fortran code (bug #52425). Rik <rik@octave.org> parents: 24289 diff changeset	1110 FFLAGS="$FFLAGS $F77_INTEGER_8_FLAG"
0771ce2d30ef build: Fix compiling OCTAVE_ARPACK_OK_2 Fortran code (bug #52425). Rik <rik@octave.org> parents: 24289 diff changeset	1111 AC_LANG_PUSH(Fortran 77)
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1112 AC_RUN_IFELSE([[
24446 4ca5c9f899d3 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 24337 diff changeset	1113 program bug_52425
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1114 c
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1115 integer maxn, maxnev, maxncv, ldv
24446 4ca5c9f899d3 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 24337 diff changeset	1116 parameter (maxn=256, maxnev=10, maxncv=25,
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1117 $ ldv=maxn )
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1118 c
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1119 Double precision
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1120 & v(ldv,maxncv), workl(maxncv*(maxncv+8)),
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1121 & workd(3*maxn), d(maxncv,2), resid(maxn),
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1122 & ax(maxn)
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1123 logical select(maxncv)
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1124 integer iparam(11), ipntr(11)
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1125 c
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1126 character bmat1, which2
24446 4ca5c9f899d3 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 24337 diff changeset	1127 integer ido, n, nev, ncv, lworkl, info, ierr, j,
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1128 & nx, nconv, maxitr, mode, ishfts
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1129 logical rvec
24446 4ca5c9f899d3 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 24337 diff changeset	1130 Double precision
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1131 & tol, sigma
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1132 c
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1133 Double precision
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1134 & zero
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1135 parameter (zero = 0.0D+0)
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1136 c
24446 4ca5c9f899d3 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 24337 diff changeset	1137 Double precision
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1138 & dnrm2
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1139 external dnrm2, daxpy
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1140 c
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1141 intrinsic abs
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1142 c
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1143 n = 20
24446 4ca5c9f899d3 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 24337 diff changeset	1144 nev = 4
4ca5c9f899d3 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 24337 diff changeset	1145 ncv = 20
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1146 bmat = 'I'
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1147 which = 'BE'
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1148 c
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1149 lworkl = ncv*(ncv+8)
24446 4ca5c9f899d3 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 24337 diff changeset	1150 tol = zero
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1151 info = 1
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1152 do j = 1,n
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1153 resid (j) = 1.0d0
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1154 end do
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1155 ido = 0
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1156 c
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1157 ishfts = 1
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1158 maxitr = 300
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1159 mode = 1
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1160 c
24446 4ca5c9f899d3 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 24337 diff changeset	1161 iparam(1) = ishfts
4ca5c9f899d3 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 24337 diff changeset	1162 iparam(3) = maxitr
4ca5c9f899d3 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 24337 diff changeset	1163 iparam(7) = mode
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1164 c
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1165 10 continue
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1166 c
24446 4ca5c9f899d3 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 24337 diff changeset	1167 call dsaupd ( ido, bmat, n, which, nev, tol, resid,
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1168 & ncv, v, ldv, iparam, ipntr, workd, workl,
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1169 & lworkl, info )
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1170 c
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1171 if (ido .eq. -1 .or. ido .eq. 1) then
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1172 call av (n, workd(ipntr(1)), workd(ipntr(2)))
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1173 go to 10
24446 4ca5c9f899d3 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 24337 diff changeset	1174 end if
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1175 c
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1176 if ( info .lt. 0 ) then
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1177 stop 1
24446 4ca5c9f899d3 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 24337 diff changeset	1178 else
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1179 rvec = .false.
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1180 c
24446 4ca5c9f899d3 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 24337 diff changeset	1181 call dseupd ( rvec, 'All', select, d, v, ldv, sigma,
4ca5c9f899d3 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 24337 diff changeset	1182 & bmat, n, which, nev, tol, resid, ncv, v, ldv,
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1183 & iparam, ipntr, workd, workl, lworkl, ierr )
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1184 c
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1185 if ( ierr .ne. 0) then
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1186 stop 1
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1187 else
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1188 nconv = iparam(5)
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1189 do 20 j=1, nconv
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1190 call av(n, v(1,j), ax)
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1191 call daxpy(n, -d(j,1), v(1,j), 1, ax, 1)
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1192 d(j,2) = dnrm2(n, ax, 1)
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1193 d(j,2) = d(j,2) / abs(d(j,1))
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1194 c
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1195 20 continue
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1196 c
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1197 c \| Litmus test: return 1 or 0 based on returned eigenvalue
24446 4ca5c9f899d3 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 24337 diff changeset	1198 c
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1199 if (abs(d(1,1) - 2.0810) > 1.0d-4) then
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1200 stop 1
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1201 else
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1202 stop 0
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1203 end if
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1204 end if
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1205 end if
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1206 c
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1207 end
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1208 c
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1209 subroutine av (n, v, w)
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1210 integer n, j
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1211 Double precision v(n), w(n)
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1212 c
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1213 w(1) = 4*v(1) + v(3)
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1214 w(2) = 4*v(2) + v(4)
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1215 do 10 j = 3, n - 2
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1216 w(j) = v(j-2) + 4*v(j) + v(j+2)
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1217 10 continue
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1218 w(n-1) = v(n-3) + 4 * v(n-1)
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1219 w(n) = v(n-2) + 4 * v(n)
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1220 return
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1221 end
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1222 ]],
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1223 octave_cv_lib_arpack_ok_2=yes,
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1224 octave_cv_lib_arpack_ok_2=no,
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1225 octave_cv_lib_arpack_ok_2=yes)
24336 0771ce2d30ef build: Fix compiling OCTAVE_ARPACK_OK_2 Fortran code (bug #52425). Rik <rik@octave.org> parents: 24289 diff changeset	1226 ## Restore FFLAGS.
0771ce2d30ef build: Fix compiling OCTAVE_ARPACK_OK_2 Fortran code (bug #52425). Rik <rik@octave.org> parents: 24289 diff changeset	1227 FFLAGS="$save_FFLAGS"
24289 f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1228 AC_LANG_POP(Fortran 77)
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1229 ])
f52d91f6ef80 Check ARPACK library for buggy behavior in configure (bug #52425) Rik <rik@octave.org> parents: 23835 diff changeset	1230 if test $octave_cv_lib_arpack_ok_2 = yes; then
14144 834df9f10963 remove ARPACK files from sources and restore configure checks for external ARPACK library John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	1231 $1
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	1232 :
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	1233 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	1234 $2
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	1235 :
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	1236 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	1237 ])
834df9f10963 remove ARPACK files from sources and restore configure checks for external ARPACK library John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	1238 dnl
17241 03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1239 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	1240 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	1241 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	1242 dnl
03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1243 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	1244 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	1245 [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	1246 [AC_LANG_PUSH(C++)
03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1247 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	1248 extern "C"
03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1249 {
03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1250 #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	1251 #include <glpk/glpk.h>
03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1252 #else
03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1253 #include <glpk.h>
03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1254 #endif
03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1255 }
03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1256 ]], [[
03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1257 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	1258 glp_iptcp iptcp;
03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1259 glp_init_iptcp (&iptcp);
03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1260 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	1261 ]])],
03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1262 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	1263 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	1264 AC_LANG_POP(C++)
03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1265 ])
03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1266 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	1267 $1
03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1268 :
03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1269 else
03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1270 $2
03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1271 :
03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1272 fi
03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1273 ])
03a666018e0f build: Detect new GLPK API features required since changeset 54e251e699bb Mike Miller <mtmiller@ieee.org> parents: 17197 diff changeset	1274 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1275 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	1276 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	1277 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	1278 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1279 AC_DEFUN([OCTAVE_CHECK_LIB_HDF5_DLL], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1280 AC_CACHE_CHECK([if _HDF5USEDLL_ needs to be defined],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1281 [octave_cv_lib_hdf5_dll],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1282 [AC_LINK_IFELSE([AC_LANG_PROGRAM([[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1283 #include <hdf5.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1284 ]], [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1285 hid_t x = H5T_NATIVE_DOUBLE;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1286 return x
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1287 ]])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1288 [octave_cv_lib_hdf5_dll=no],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1289 [save_CFLAGS="$CFLAGS"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1290 CFLAGS="$CFLAGS -DWIN32 -D_HDF5USEDLL_"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1291 save_LIBS="$LIBS"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1292 LIBS="$HDF5_LIBS $LIBS"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1293 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1294 #include <hdf5.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1295 ]], [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1296 hid_t x = H5T_NATIVE_DOUBLE;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1297 return x
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1298 ]])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1299 octave_cv_lib_hdf5_dll=yes,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1300 octave_cv_lib_hdf5_dll=no)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1301 CFLAGS="$save_CFLAGS"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1302 LIBS="$save_LIBS"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1303 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1304 ])
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	1305 if test $octave_cv_lib_hdf5_dll = yes; then
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1306 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	1307 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1308 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1309 dnl
15133 f91eac1bc66d m4/acinclude.m4: Correct typos, use consistent style for describing macros. Rik <rik@octave.org> parents: 15126 diff changeset	1310 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	1311 dnl
15063 36cbcc37fdb8 Refactor configure.ac to make it more understandable. Rik <rik@octave.org> parents: 15013 diff changeset	1312 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	1313 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	1314 dnl
15063 36cbcc37fdb8 Refactor configure.ac to make it more understandable. Rik <rik@octave.org> parents: 15013 diff changeset	1315 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	1316 dnl libraries and header files?
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: 7361 diff changeset	1317 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1318 AC_DEFUN([OCTAVE_CHECK_LIB_OPENGL], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1319 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	1320
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1321 ## On MacOSX systems the OpenGL framework can be used
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1322 OCTAVE_HAVE_FRAMEWORK(OpenGL, [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1323 #include <OpenGL/gl.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1324 #include <OpenGL/glu.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1325 ]], [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1326 GLint par; glGetIntegerv (GL_VIEWPORT, &par);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1327 ]],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1328 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	1329
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	1330 if test $have_framework_opengl = yes; then
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1331 AC_DEFINE(HAVE_FRAMEWORK_OPENGL, 1,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1332 [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	1333 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	1334 AC_MSG_NOTICE([adding -framework OpenGL to OPENGL_LIBS])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1335 OCTAVE_CHECK_FUNC_GLUTESSCALLBACK_THREEDOTS
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1336 else
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1337 case $canonical_host_type in
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1338 --mingw32* \| --msdosmsvc)
15319 daf74ce2afdc m4/acinclude.m4: Use more consistent m4 quoting of arguments to macros. Rik <rik@octave.org> parents: 15302 diff changeset	1339 AC_CHECK_HEADERS([windows.h])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1340 ;;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1341 esac
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1342 have_opengl_incs=no
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1343 AC_CHECK_HEADERS([GL/gl.h OpenGL/gl.h],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1344 [AC_CHECK_HEADERS([GL/glu.h OpenGL/glu.h],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1345 [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	1346 #if defined (HAVE_WINDOWS_H)
7954 3ffc34caec65 configure fixes John W. Eaton <jwe@octave.org> parents: 7945 diff changeset	1347 #include <windows.h>
3ffc34caec65 configure fixes John W. Eaton <jwe@octave.org> parents: 7945 diff changeset	1348 #endif
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1349 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1350 break
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1351 ], [], [
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21604 diff changeset	1352 #if defined (HAVE_WINDOWS_H)
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1353 # include <windows.h>
7954 3ffc34caec65 configure fixes John W. Eaton <jwe@octave.org> parents: 7945 diff changeset	1354 #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	1355 ])
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	1356
17197 fbee0d312af5 acinclude.m4: Remove some unnecessary double quotes around variables. Rik <rik@octave.org> parents: 17196 diff changeset	1357 if test $have_opengl_incs = yes; then
18866 95b69b880b19 Allow conpile of gl-render.cc under mingw. John Donoghue parents: 18854 diff changeset	1358 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	1359 #if defined (HAVE_WINDOWS_H)
18866 95b69b880b19 Allow conpile of gl-render.cc under mingw. John Donoghue parents: 18854 diff changeset	1360 # include <windows.h>
95b69b880b19 Allow conpile of gl-render.cc under mingw. John Donoghue parents: 18854 diff changeset	1361 #endif
95b69b880b19 Allow conpile of gl-render.cc under mingw. John Donoghue parents: 18854 diff changeset	1362 #if defined (HAVE_GL_GL_H)
95b69b880b19 Allow conpile of gl-render.cc under mingw. John Donoghue parents: 18854 diff changeset	1363 # include <GL/gl.h>
95b69b880b19 Allow conpile of gl-render.cc under mingw. John Donoghue parents: 18854 diff changeset	1364 #elif defined (HAVE_OPENGL_GL_H)
95b69b880b19 Allow conpile of gl-render.cc under mingw. John Donoghue parents: 18854 diff changeset	1365 # include <OpenGL/gl.h>
95b69b880b19 Allow conpile of gl-render.cc under mingw. John Donoghue parents: 18854 diff changeset	1366 #endif
95b69b880b19 Allow conpile of gl-render.cc under mingw. John Donoghue parents: 18854 diff changeset	1367 ])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1368 case $canonical_host_type in
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1369 --mingw32* \| --msdosmsvc)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1370 save_LIBS="$LIBS"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1371 LIBS="$LIBS -lopengl32"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1372 AC_MSG_CHECKING([for glEnable in -lopengl32])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1373 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1374 #if HAVE_WINDOWS_H
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1375 # include <windows.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1376 #endif
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1377 #if defined (HAVE_GL_GL_H)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1378 # include <GL/gl.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1379 #elif defined (HAVE_OPENGL_GL_H)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1380 # include <OpenGL/gl.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1381 #endif
17034 8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	1382 ]], [[
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1383 glEnable(GL_SMOOTH);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1384 ]])], [OPENGL_LIBS="-lopengl32 -lglu32"])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1385
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1386 LIBS="$save_LIBS"
21374 1487a68a496a untangle configuration of OpenGL, FLTK, and Qt (bug #47263) John W. Eaton <jwe@octave.org> parents: 21354 diff changeset	1387 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	1388 AC_MSG_RESULT([yes])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1389 else
15319 daf74ce2afdc m4/acinclude.m4: Use more consistent m4 quoting of arguments to macros. Rik <rik@octave.org> parents: 15302 diff changeset	1390 AC_MSG_RESULT([no])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1391 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1392 ;;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1393 *)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1394 ## 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	1395 AC_CHECK_LIB([GL], [glEnable], [OPENGL_LIBS="-lGL -lGLU"])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1396 ;;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1397 esac
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1398 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	1399 fi
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1400 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	1401 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	1402 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	1403 fi
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: 7361 diff changeset	1404 ])
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: 7825 diff changeset	1405 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1406 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	1407 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1408 AC_DEFUN([OCTAVE_CHECK_LIB_QHULL_OK], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1409 AC_CACHE_CHECK([whether the qhull library works],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1410 [octave_cv_lib_qhull_ok],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1411 [AC_RUN_IFELSE([AC_LANG_PROGRAM([[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1412 #include <stdio.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1413 #if defined (HAVE_LIBQHULL_LIBQHULL_H)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1414 # include <libqhull/libqhull.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1415 # include <libqhull/qset.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1416 # include <libqhull/geom.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1417 # include <libqhull/poly.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1418 # include <libqhull/io.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1419 #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	1420 # if defined (HAVE_QHULL_LIBQHULL_H)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1421 # include <qhull/libqhull.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1422 # else
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1423 # include <qhull/qhull.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1424 # endif
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1425 # include <qhull/qset.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1426 # include <qhull/geom.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1427 # include <qhull/poly.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1428 # include <qhull/io.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1429 #elif defined (HAVE_LIBQHULL_H) \|\| defined (HAVE_QHULL_H)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1430 # if defined (HAVE_LIBQHULL_H)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1431 # include <libqhull.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1432 # else
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1433 # include <qhull.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1434 # endif
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1435 # include <qset.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1436 # include <geom.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1437 # include <poly.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1438 # include <io.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1439 #endif
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21604 diff changeset	1440 #if defined (NEED_QHULL_VERSION)
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1441 char *qh_version = "version";
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1442 #endif
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1443 ]], [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1444 int dim = 2;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1445 int n = 4;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1446 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	1447 boolT ismalloc = 0;
17034 8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	1448 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	1449 ]])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1450 octave_cv_lib_qhull_ok=yes,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1451 octave_cv_lib_qhull_ok=no,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1452 octave_cv_lib_qhull_ok=yes)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1453 ])
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	1454 if test $octave_cv_lib_qhull_ok = yes; then
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1455 $1
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	1456 :
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1457 else
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1458 $2
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	1459 :
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1460 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	1461 ])
20715 5b7643257978 Remove trailing whitespace at end of lines. Rik <rik@octave.org> parents: 20420 diff changeset	1462 dnl
20153 3b3579ad7e46 Check for a modern version of sndfile in configure scripts (bug #44976). Rik <rik@octave.org> parents: 19816 diff changeset	1463 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	1464 dnl
3b3579ad7e46 Check for a modern version of sndfile in configure scripts (bug #44976). Rik <rik@octave.org> parents: 19816 diff changeset	1465 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	1466 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	1467 [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	1468 [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	1469 #include <sndfile.h>
3b3579ad7e46 Check for a modern version of sndfile in configure scripts (bug #44976). Rik <rik@octave.org> parents: 19816 diff changeset	1470 ]], [[
3b3579ad7e46 Check for a modern version of sndfile in configure scripts (bug #44976). Rik <rik@octave.org> parents: 19816 diff changeset	1471 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	1472 ]])],
3b3579ad7e46 Check for a modern version of sndfile in configure scripts (bug #44976). Rik <rik@octave.org> parents: 19816 diff changeset	1473 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	1474 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	1475 ])
3b3579ad7e46 Check for a modern version of sndfile in configure scripts (bug #44976). Rik <rik@octave.org> parents: 19816 diff changeset	1476 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	1477 $1
3b3579ad7e46 Check for a modern version of sndfile in configure scripts (bug #44976). Rik <rik@octave.org> parents: 19816 diff changeset	1478 :
3b3579ad7e46 Check for a modern version of sndfile in configure scripts (bug #44976). Rik <rik@octave.org> parents: 19816 diff changeset	1479 else
3b3579ad7e46 Check for a modern version of sndfile in configure scripts (bug #44976). Rik <rik@octave.org> parents: 19816 diff changeset	1480 $2
3b3579ad7e46 Check for a modern version of sndfile in configure scripts (bug #44976). Rik <rik@octave.org> parents: 19816 diff changeset	1481 :
3b3579ad7e46 Check for a modern version of sndfile in configure scripts (bug #44976). Rik <rik@octave.org> parents: 19816 diff changeset	1482 fi
3b3579ad7e46 Check for a modern version of sndfile in configure scripts (bug #44976). Rik <rik@octave.org> parents: 19816 diff changeset	1483 ])
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	1484 dnl
15302 a8cfbc1911e4 build: Set TERM_LIBS before checking for READLINE. Rik <rik@octave.org> parents: 15295 diff changeset	1485 dnl Find a suitable termlib to use.
a8cfbc1911e4 build: Set TERM_LIBS before checking for READLINE. Rik <rik@octave.org> parents: 15295 diff changeset	1486 dnl
a8cfbc1911e4 build: Set TERM_LIBS before checking for READLINE. Rik <rik@octave.org> parents: 15295 diff changeset	1487 AC_DEFUN([OCTAVE_CHECK_LIB_TERMLIB], [
a8cfbc1911e4 build: Set TERM_LIBS before checking for READLINE. Rik <rik@octave.org> parents: 15295 diff changeset	1488 TERM_LIBS=
15338 dc39c1d84c5b build: Use caching on more intermediate results to speed up configure. Rik <rik@octave.org> parents: 15336 diff changeset	1489 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	1490 AC_SEARCH_LIBS([tputs],
dc39c1d84c5b build: Use caching on more intermediate results to speed up configure. Rik <rik@octave.org> parents: 15336 diff changeset	1491 [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	1492 [], [])
dc39c1d84c5b build: Use caching on more intermediate results to speed up configure. Rik <rik@octave.org> parents: 15336 diff changeset	1493 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	1494 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	1495 -l*)
15338 dc39c1d84c5b build: Use caching on more intermediate results to speed up configure. Rik <rik@octave.org> parents: 15336 diff changeset	1496 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	1497 ;;
dc39c1d84c5b build: Use caching on more intermediate results to speed up configure. Rik <rik@octave.org> parents: 15336 diff changeset	1498 no)
dc39c1d84c5b build: Use caching on more intermediate results to speed up configure. Rik <rik@octave.org> parents: 15336 diff changeset	1499 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	1500 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	1501 ;;
dc39c1d84c5b build: Use caching on more intermediate results to speed up configure. Rik <rik@octave.org> parents: 15336 diff changeset	1502 esac
15302 a8cfbc1911e4 build: Set TERM_LIBS before checking for READLINE. Rik <rik@octave.org> parents: 15295 diff changeset	1503
15338 dc39c1d84c5b build: Use caching on more intermediate results to speed up configure. Rik <rik@octave.org> parents: 15336 diff changeset	1504 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	1505 dnl
dc39c1d84c5b build: Use caching on more intermediate results to speed up configure. Rik <rik@octave.org> parents: 15336 diff changeset	1506 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	1507 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	1508 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	1509 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	1510 dnl break])
dc39c1d84c5b build: Use caching on more intermediate results to speed up configure. Rik <rik@octave.org> parents: 15336 diff changeset	1511 dnl done
dc39c1d84c5b build: Use caching on more intermediate results to speed up configure. Rik <rik@octave.org> parents: 15336 diff changeset	1512
15302 a8cfbc1911e4 build: Set TERM_LIBS before checking for READLINE. Rik <rik@octave.org> parents: 15295 diff changeset	1513 AC_SUBST(TERM_LIBS)
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: 7361 diff changeset	1514 ])
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: 7825 diff changeset	1515 dnl
24093 7d9ba57201b4 configure: improve Qt feature tests for functionality and consistency Mike Miller <mtmiller@octave.org> parents: 24077 diff changeset	1516 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	1517 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	1518 dnl
24093 7d9ba57201b4 configure: improve Qt feature tests for functionality and consistency Mike Miller <mtmiller@octave.org> parents: 24077 diff changeset	1519 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	1520 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	1521 dnl
7d9ba57201b4 configure: improve Qt feature tests for functionality and consistency Mike Miller <mtmiller@octave.org> parents: 24077 diff changeset	1522 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	1523 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	1524 [octave_cv_decl_qfont_force_integer_metrics],
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1525 [AC_LANG_PUSH(C++)
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1526 ac_octave_save_CPPFLAGS="$CPPFLAGS"
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1527 ac_octave_save_CXXFLAGS="$CXXFLAGS"
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1528 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1529 CXXFLAGS="$CXXPICFLAG $CXXFLAGS"
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1530 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1531 #include <QFont>
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1532 ]], [[
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1533 QFont::StyleStrategy strategy = QFont::ForceIntegerMetrics;
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1534 ]])],
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1535 octave_cv_decl_qfont_force_integer_metrics=yes,
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1536 octave_cv_decl_qfont_force_integer_metrics=no)
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1537 CPPFLAGS="$ac_octave_save_CPPFLAGS"
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1538 CXXFLAGS="$ac_octave_save_CXXFLAGS"
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1539 AC_LANG_POP(C++)
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1540 ])
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1541 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	1542 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	1543 [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	1544 fi
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1545 ])
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1546 dnl
24093 7d9ba57201b4 configure: improve Qt feature tests for functionality and consistency Mike Miller <mtmiller@octave.org> parents: 24077 diff changeset	1547 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	1548 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	1549 dnl
24093 7d9ba57201b4 configure: improve Qt feature tests for functionality and consistency Mike Miller <mtmiller@octave.org> parents: 24077 diff changeset	1550 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	1551 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	1552 dnl
7d9ba57201b4 configure: improve Qt feature tests for functionality and consistency Mike Miller <mtmiller@octave.org> parents: 24077 diff changeset	1553 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	1554 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	1555 [octave_cv_decl_qfont_monospace],
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1556 [AC_LANG_PUSH(C++)
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1557 ac_octave_save_CPPFLAGS="$CPPFLAGS"
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1558 ac_octave_save_CXXFLAGS="$CXXFLAGS"
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1559 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1560 CXXFLAGS="$CXXPICFLAG $CXXFLAGS"
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1561 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1562 #include <QFont>
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1563 ]], [[
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1564 QFont::StyleHint hint = QFont::Monospace;
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1565 ]])],
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1566 octave_cv_decl_qfont_monospace=yes,
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1567 octave_cv_decl_qfont_monospace=no)
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1568 CPPFLAGS="$ac_octave_save_CPPFLAGS"
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1569 CXXFLAGS="$ac_octave_save_CXXFLAGS"
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1570 AC_LANG_POP(C++)
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1571 ])
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1572 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	1573 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	1574 [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	1575 fi
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1576 ])
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1577 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1578 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	1579 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1580 AC_DEFUN([OCTAVE_CHECK_QHULL_VERSION], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1581 AC_CACHE_CHECK([for qh_version in $QHULL_LIBS],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1582 [octave_cv_lib_qhull_version],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1583 [AC_LINK_IFELSE([AC_LANG_PROGRAM([[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1584 #include <stdio.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1585 #if defined (HAVE_LIBQHULL_LIBQHULL_H)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1586 # include <libqhull/libqhull.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1587 # include <libqhull/qset.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1588 # include <libqhull/geom.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1589 # include <libqhull/poly.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1590 # include <libqhull/io.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1591 #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	1592 # if defined (HAVE_QHULL_LIBQHULL_H)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1593 # include <qhull/libqhull.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1594 # else
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1595 # include <qhull/qhull.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1596 # endif
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1597 # include <qhull/qset.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1598 # include <qhull/geom.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1599 # include <qhull/poly.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1600 # include <qhull/io.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1601 #elif defined (HAVE_LIBQHULL_H) \|\| defined (HAVE_QHULL_H)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1602 # if defined (HAVE_LIBQHULL_H)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1603 # include <libqhull.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1604 # else
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1605 # include <qhull.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1606 # endif
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1607 # include <qset.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1608 # include <geom.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1609 # include <poly.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1610 # include <io.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1611 #endif
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1612 ]], [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1613 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	1614 ]])],
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1615 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	1616 ])
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	1617 if test $octave_cv_lib_qhull_version = no; then
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1618 AC_DEFINE(NEED_QHULL_VERSION, 1,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1619 [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	1620 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1621 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1622 dnl
22823 e2afee0041bf new configure option, --without-qscintilla John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1623 dnl Check whether we have QScintilla for the given Qt VERSION.
20420 6cfbf412a2c3 configure.ac: Test that Qt and OpenGL can be used together (bug #45672) Mike Miller <mtmiller@octave.org> parents: 20416 diff changeset	1624 dnl
22823 e2afee0041bf new configure option, --without-qscintilla John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1625 AC_DEFUN([OCTAVE_CHECK_QSCINTILLA], [
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1626 qt_version="$1";
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1627 use_qscintilla=no
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1628 warn_qscintilla=""
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1629
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1630 ## Check for Qt libraries
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1631 case "$qt_version" in
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1632 4)
24125 ed746cbfce24 * acinclude.m4: Search for version-specific qscintilla libs first. John W. Eaton <jwe@octave.org> parents: 24124 diff changeset	1633 octave_qscintilla_libnames="qscintilla2-qt4 qscintilla2_qt4 qt4scintilla2 qscintilla2"
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1634 ;;
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1635 5)
23414 a759896c2b53 acinclude.m4: Look for "qscintilla_qt5" as another name for Qt5 scintilla library. Rik <rik@octave.org> parents: 23219 diff changeset	1636 octave_qscintilla_libnames="qscintilla2-qt5 qscintilla2_qt5 qt5scintilla2"
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1637 ;;
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1638 *)
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1639 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	1640 ;;
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1641 esac
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1642
22823 e2afee0041bf new configure option, --without-qscintilla John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1643 if test $build_qt_gui = yes && test $check_qscintilla = yes; then
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1644
22286 f394436a4025 build: improve QScintilla detection to work with distro naming schemes (bug #48773) Mike Miller <mtmiller@octave.org> parents: 22257 diff changeset	1645 ## Check for QScintilla library which is used in the Qt GUI editor.
f394436a4025 build: improve QScintilla detection to work with distro naming schemes (bug #48773) Mike Miller <mtmiller@octave.org> parents: 22257 diff changeset	1646 AC_CACHE_CHECK([for the QScintilla library for Qt $qt_version],
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1647 [octave_cv_lib_qscintilla],
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1648 [save_CPPFLAGS="$CPPFLAGS"
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1649 save_CXXFLAGS="$CXXFLAGS"
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1650 save_LDFLAGS="$LDFLAGS"
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1651 save_LIBS="$LIBS"
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1652 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1653 CXXFLAGS="$CXXPICFLAG $CXXFLAGS"
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1654 LDFLAGS="$QT_LDFLAGS $LDFLAGS"
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1655 AC_LANG_PUSH(C++)
22286 f394436a4025 build: improve QScintilla detection to work with distro naming schemes (bug #48773) Mike Miller <mtmiller@octave.org> parents: 22257 diff changeset	1656 for octave_qscintilla_try in $octave_qscintilla_libnames; do
f394436a4025 build: improve QScintilla detection to work with distro naming schemes (bug #48773) Mike Miller <mtmiller@octave.org> parents: 22257 diff changeset	1657 LIBS="$QT_LIBS -l$octave_qscintilla_try"
f394436a4025 build: improve QScintilla detection to work with distro naming schemes (bug #48773) Mike Miller <mtmiller@octave.org> parents: 22257 diff changeset	1658 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
22456 8924139b4f21 fix test for qscintilla (bug #49018) John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1659 #include <Qsci/qsciapis.h>
8924139b4f21 fix test for qscintilla (bug #49018) John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1660 #include <Qsci/qscilexercpp.h>
22286 f394436a4025 build: improve QScintilla detection to work with distro naming schemes (bug #48773) Mike Miller <mtmiller@octave.org> parents: 22257 diff changeset	1661 ]], [[
22456 8924139b4f21 fix test for qscintilla (bug #49018) John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1662 QsciLexer *lexer = new QsciLexerCPP ();
8924139b4f21 fix test for qscintilla (bug #49018) John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1663 QsciAPIs *lexer_apis = new QsciAPIs (lexer);
22286 f394436a4025 build: improve QScintilla detection to work with distro naming schemes (bug #48773) Mike Miller <mtmiller@octave.org> parents: 22257 diff changeset	1664 ]])],
f394436a4025 build: improve QScintilla detection to work with distro naming schemes (bug #48773) Mike Miller <mtmiller@octave.org> parents: 22257 diff changeset	1665 octave_cv_lib_qscintilla="-l$octave_qscintilla_try",
f394436a4025 build: improve QScintilla detection to work with distro naming schemes (bug #48773) Mike Miller <mtmiller@octave.org> parents: 22257 diff changeset	1666 octave_cv_lib_qscintilla=no)
f394436a4025 build: improve QScintilla detection to work with distro naming schemes (bug #48773) Mike Miller <mtmiller@octave.org> parents: 22257 diff changeset	1667 if test $octave_cv_lib_qscintilla != no; then
f394436a4025 build: improve QScintilla detection to work with distro naming schemes (bug #48773) Mike Miller <mtmiller@octave.org> parents: 22257 diff changeset	1668 break
f394436a4025 build: improve QScintilla detection to work with distro naming schemes (bug #48773) Mike Miller <mtmiller@octave.org> parents: 22257 diff changeset	1669 fi
f394436a4025 build: improve QScintilla detection to work with distro naming schemes (bug #48773) Mike Miller <mtmiller@octave.org> parents: 22257 diff changeset	1670 done
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1671 CPPFLAGS="$save_CPPFLAGS"
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1672 CXXFLAGS="$save_CXXFLAGS"
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1673 LDFLAGS="$save_LDFLAGS"
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1674 LIBS="$save_LIBS"
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1675 AC_LANG_POP([C++])
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1676 ])
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1677
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1678 if test $octave_cv_lib_qscintilla = no; then
22286 f394436a4025 build: improve QScintilla detection to work with distro naming schemes (bug #48773) Mike Miller <mtmiller@octave.org> parents: 22257 diff changeset	1679 warn_qscintilla="QScintilla library not found; disabling built-in Qt GUI editor"
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1680 else
22286 f394436a4025 build: improve QScintilla detection to work with distro naming schemes (bug #48773) Mike Miller <mtmiller@octave.org> parents: 22257 diff changeset	1681 ## Let's assume QScintilla library is at the same location as
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1682 ## other regular Qt libraries.
22286 f394436a4025 build: improve QScintilla detection to work with distro naming schemes (bug #48773) Mike Miller <mtmiller@octave.org> parents: 22257 diff changeset	1683 QT_LIBS="$QT_LIBS $octave_cv_lib_qscintilla"
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1684 OCTAVE_CHECK_QSCINTILLA_VERSION
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1685 AC_DEFINE(HAVE_QSCINTILLA, 1,
22250 2fd4f1a3f4a8 allow building with Qt5 (bug #40252) John W. Eaton <jwe@octave.org> parents: 22234 diff changeset	1686 [Define to 1 if the QScintilla library and header files are available.])
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1687
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1688 save_CPPFLAGS="$CPPFLAGS"
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1689 save_CXXFLAGS="$CXXFLAGS"
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1690 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1691 CXXFLAGS="$CXXPICFLAG $CXXFLAGS"
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1692 AC_LANG_PUSH(C++)
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1693 AC_CHECK_HEADERS([Qsci/qscilexeroctave.h Qsci/qscilexermatlab.h])
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1694 AC_LANG_POP(C++)
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1695 CPPFLAGS="$save_CPPFLAGS"
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1696 CXXFLAGS="$save_CXXFLAGS"
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1697
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1698 OCTAVE_CHECK_FUNC_QSCI_FINDSELECTION
22823 e2afee0041bf new configure option, --without-qscintilla John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1699
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1700 use_qscintilla=yes
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1701 fi
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1702 fi
22823 e2afee0041bf new configure option, --without-qscintilla John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1703 ])
e2afee0041bf new configure option, --without-qscintilla John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1704 dnl
23510 b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1705 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	1706 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	1707 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	1708 dnl
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1709 AC_DEFUN([OCTAVE_CHECK_QSCINTILLA_VERSION], [
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1710 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	1711 [octave_cv_version_2_6_0],
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1712 [AC_LANG_PUSH(C++)
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1713 ac_octave_save_CPPFLAGS="$CPPFLAGS"
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1714 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1715 AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1716 #include <Qsci/qsciglobal.h>
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1717 ]], [[
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1718 #if QSCINTILLA_VERSION < 0x020600
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1719 #error Old FindFirst function found.
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1720 #endif
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1721 ]])],
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1722 octave_cv_version_2_6_0=yes,
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1723 octave_cv_version_2_6_0=no)
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1724 CPPFLAGS="$ac_octave_save_CPPFLAGS"
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1725 AC_LANG_POP(C++)
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1726 ])
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	1727 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	1728 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	1729 [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	1730 fi
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1731 ])
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1732 dnl
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1733 dnl OCTAVE_CHECK_QT
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1734 dnl
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1735 AC_DEFUN([OCTAVE_CHECK_QT], [
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1736 octave_qt_versions="$1"
22257 945e7f9c11ff build: fix configure --without-qt or --with-qt Mike Miller <mtmiller@octave.org> parents: 22255 diff changeset	1737
945e7f9c11ff build: fix configure --without-qt or --with-qt Mike Miller <mtmiller@octave.org> parents: 22255 diff changeset	1738 build_qt_gui=no
945e7f9c11ff build: fix configure --without-qt or --with-qt Mike Miller <mtmiller@octave.org> parents: 22255 diff changeset	1739 build_qt_graphics=no
945e7f9c11ff build: fix configure --without-qt or --with-qt Mike Miller <mtmiller@octave.org> parents: 22255 diff changeset	1740 use_qscintilla=no
945e7f9c11ff build: fix configure --without-qt or --with-qt Mike Miller <mtmiller@octave.org> parents: 22255 diff changeset	1741 win32_terminal=no
945e7f9c11ff build: fix configure --without-qt or --with-qt Mike Miller <mtmiller@octave.org> parents: 22255 diff changeset	1742
22255 8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1743 for ver in $octave_qt_versions; do
8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1744 OCTAVE_CHECK_QT_VERSION([$ver])
22250 2fd4f1a3f4a8 allow building with Qt5 (bug #40252) John W. Eaton <jwe@octave.org> parents: 22234 diff changeset	1745 if test $build_qt_gui = yes; then
22255 8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1746 have_qt_version=$ver
8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1747 break
25134 5fccb7373bc4 allow configure to continue if some Qt tools are found (bug #53571) John W. Eaton <jwe@octave.org> parents: 25119 diff changeset	1748 elif test -n "$QT_MODULES_AVAILABLE"; then
25114 f191e1a26095 if a Qt version appears partially installed, don't check another version John W. Eaton <jwe@octave.org> parents: 25098 diff changeset	1749 ## If some modules were found for $ver, then warn about possible
f191e1a26095 if a Qt version appears partially installed, don't check another version John W. Eaton <jwe@octave.org> parents: 25098 diff changeset	1750 ## incomplete or broken Qt installation instead of checking for
25134 5fccb7373bc4 allow configure to continue if some Qt tools are found (bug #53571) John W. Eaton <jwe@octave.org> parents: 25119 diff changeset	1751 ## next version in the list. Don't attempt a similar check for
5fccb7373bc4 allow configure to continue if some Qt tools are found (bug #53571) John W. Eaton <jwe@octave.org> parents: 25119 diff changeset	1752 ## tools here becuase Qt4 and Qt5 tools may be installed with
5fccb7373bc4 allow configure to continue if some Qt tools are found (bug #53571) John W. Eaton <jwe@octave.org> parents: 25119 diff changeset	1753 ## the same name so determining whether there is a mix of versions
5fccb7373bc4 allow configure to continue if some Qt tools are found (bug #53571) John W. Eaton <jwe@octave.org> parents: 25119 diff changeset	1754 ## will require more work than just looking which tools are installed.
25114 f191e1a26095 if a Qt version appears partially installed, don't check another version John W. Eaton <jwe@octave.org> parents: 25098 diff changeset	1755 warn_qt_modules="Your installation of Qt version $ver appears incomplete or broken in some way. Fix that or use --with-qt=VER to use another version."
f191e1a26095 if a Qt version appears partially installed, don't check another version John W. Eaton <jwe@octave.org> parents: 25098 diff changeset	1756 break
22255 8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1757 fi
8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1758 done
8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1759
8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1760 if test $build_qt_gui = yes; then
25097 cc21f66ecb1c display more info in configure summary about Qt version and missing features John W. Eaton <jwe@octave.org> parents: 25061 diff changeset	1761 BUILD_QT_SUMMARY_MSG="yes (version: $have_qt_version)"
22255 8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1762 if test x"$have_qt_version" = x4; then
24810 8a92f442c4a2 configure.ac: Overhaul file (bug #53186). Rik <rik@octave.org> parents: 24798 diff changeset	1763 AC_DEFINE(HAVE_QT4, 1, [Define to 1 if using Qt version 4.])
22255 8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1764 fi
8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1765 if test x"$have_qt_version" = x5; then
24810 8a92f442c4a2 configure.ac: Overhaul file (bug #53186). Rik <rik@octave.org> parents: 24798 diff changeset	1766 AC_DEFINE(HAVE_QT5, 1, [Define to 1 if using Qt version 5.])
22255 8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1767 fi
8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1768 else
25119 14b9e2a1f3e1 if some Qt tools are instaslled, don't check for another version John W. Eaton <jwe@octave.org> parents: 25114 diff changeset	1769 if test -n "$QT_MODULES_MISSING" \|\| test -n "$QT_TOOLS_MISSING"; then
14b9e2a1f3e1 if some Qt tools are instaslled, don't check for another version John W. Eaton <jwe@octave.org> parents: 25114 diff changeset	1770 qt_missing=`echo $QT_MODULES_MISSING$QT_TOOLS_MISSING \| sed 's/ *$//'`
14b9e2a1f3e1 if some Qt tools are instaslled, don't check for another version John W. Eaton <jwe@octave.org> parents: 25114 diff changeset	1771 BUILD_QT_SUMMARY_MSG="no (missing:$qt_missing)"
25097 cc21f66ecb1c display more info in configure summary about Qt version and missing features John W. Eaton <jwe@octave.org> parents: 25061 diff changeset	1772 else
cc21f66ecb1c display more info in configure summary about Qt version and missing features John W. Eaton <jwe@octave.org> parents: 25061 diff changeset	1773 BUILD_QT_SUMMARY_MSG="no"
cc21f66ecb1c display more info in configure summary about Qt version and missing features John W. Eaton <jwe@octave.org> parents: 25061 diff changeset	1774 fi
25114 f191e1a26095 if a Qt version appears partially installed, don't check another version John W. Eaton <jwe@octave.org> parents: 25098 diff changeset	1775 if test -n "$warn_qt_modules"; then
f191e1a26095 if a Qt version appears partially installed, don't check another version John W. Eaton <jwe@octave.org> parents: 25098 diff changeset	1776 OCTAVE_CONFIGURE_WARNING([warn_qt_modules])
f191e1a26095 if a Qt version appears partially installed, don't check another version John W. Eaton <jwe@octave.org> parents: 25098 diff changeset	1777 fi
22255 8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1778 if test -n "$warn_qt_libraries"; then
8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1779 OCTAVE_CONFIGURE_WARNING([warn_qt_libraries])
8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1780 fi
8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1781 if test -n "$warn_qt_version"; then
8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1782 OCTAVE_CONFIGURE_WARNING([warn_qt_version])
8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1783 fi
8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1784 if test -n "$warn_qt_tools"; then
8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1785 OCTAVE_CONFIGURE_WARNING([warn_qt_tools])
8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1786 fi
8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1787 if test -n "$warn_qt_setlocale"; then
8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1788 OCTAVE_CONFIGURE_WARNING([warn_qt_setlocale])
8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1789 fi
8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1790 if test -n "$warn_qt_setvbuf"; then
8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1791 OCTAVE_CONFIGURE_WARNING([warn_qt_setvbuf])
8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1792 fi
8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1793 if test -n "$warn_qt_lib_fcns"; then
8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1794 OCTAVE_CONFIGURE_WARNING([warn_qt_lib_fcns])
8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1795 fi
8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1796 if test -n "$warn_qt_abstract_item_model"; then
8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1797 OCTAVE_CONFIGURE_WARNING([warn_qt_abstract_item_model])
8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1798 fi
8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1799 if test -n "$warn_qt_opengl"; then
8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1800 OCTAVE_CONFIGURE_WARNING([warn_qt_opengl])
8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1801 fi
8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1802 if test -n "$warn_qscintilla"; then
8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1803 OCTAVE_CONFIGURE_WARNING([warn_qscintilla])
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1804 fi
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1805 fi
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1806
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1807 AM_CONDITIONAL([AMCOND_BUILD_QT_GUI], [test $build_qt_gui = yes])
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1808 AM_CONDITIONAL([AMCOND_BUILD_QT_GRAPHICS], [test $build_qt_graphics = yes])
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1809 AM_CONDITIONAL([AMCOND_HAVE_QSCINTILLA], [test $use_qscintilla = yes])
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1810 AM_CONDITIONAL([WIN32_TERMINAL], [test $win32_terminal = yes])
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1811 ])
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1812 dnl
24798 45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1813 dnl Check whether QOffscreenSurface is present.
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1814 dnl
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1815 AC_DEFUN([OCTAVE_CHECK_QT_OPENGL_OFFSCREEN_OK], [
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1816 dnl Normally the language and compiler flags would be set and restored
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1817 dnl inside of the AC_CACHE_CHECK body. Because we also need to check for
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1818 dnl Qt header files associated with the compilation test, set and restore
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1819 dnl these values outside of the AC_CACHE_CHECK for this macro only.
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1820 AC_LANG_PUSH(C++)
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1821 ac_octave_save_CPPFLAGS="$CPPFLAGS"
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1822 ac_octave_save_CXXFLAGS="$CXXFLAGS"
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1823 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1824 CXXFLAGS="$CXXPICFLAG $CXXFLAGS"
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1825 AC_CHECK_HEADERS([QOffscreenSurface])
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1826 AC_CACHE_CHECK([whether Qt supports full offscreen OpenGL rendering],
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1827 [octave_cv_qt_opengl_os_ok],
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1828 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1829 #if HAVE_WINDOWS_H
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1830 # include <windows.h>
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1831 #endif
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1832 #if defined (HAVE_GL_GL_H)
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1833 # include <GL/gl.h>
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1834 #elif defined (HAVE_OPENGL_GL_H)
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1835 # include <OpenGL/gl.h>
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1836 #endif
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1837 #if defined (HAVE_GL_GLU_H)
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1838 # include <GL/glu.h>
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1839 #elif defined HAVE_OPENGL_GLU_H \|\| defined HAVE_FRAMEWORK_OPENGL
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1840 # include <OpenGL/glu.h>
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1841 #endif
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1842 #if defined (HAVE_QOPENGLWIDGET)
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1843 # include <QOpenGLWidget>
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1844 # include <QOpenGLContext>
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1845 #endif
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1846 #if defined (HAVE_QOFFSCREENSURFACE)
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1847 # include <QOffscreenSurface>
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1848 #endif
25061 5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	1849 QOpenGLContext ctx;
24798 45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1850 QOffscreenSurface surf;
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1851 ]])],
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1852 octave_cv_qt_opengl_os_ok=yes,
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1853 octave_cv_qt_opengl_os_ok=no)
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1854 ])
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1855 CPPFLAGS="$ac_octave_save_CPPFLAGS"
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1856 CXXFLAGS="$ac_octave_save_CXXFLAGS"
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1857 AC_LANG_POP(C++)
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1858 if test $octave_cv_qt_opengl_os_ok = yes; then
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1859 $1
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1860 :
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1861 else
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1862 $2
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1863 :
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1864 fi
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1865 ])
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1866 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	1867 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	1868 dnl
6cfbf412a2c3 configure.ac: Test that Qt and OpenGL can be used together (bug #45672) Mike Miller <mtmiller@octave.org> parents: 20416 diff changeset	1869 AC_DEFUN([OCTAVE_CHECK_QT_OPENGL_OK], [
24144 8e034cb195f1 configure: set and restore compiler flags when testing for Qt header files Mike Miller <mtmiller@octave.org> parents: 24143 diff changeset	1870 dnl Normally the language and compiler flags would be set and restored
8e034cb195f1 configure: set and restore compiler flags when testing for Qt header files Mike Miller <mtmiller@octave.org> parents: 24143 diff changeset	1871 dnl inside of the AC_CACHE_CHECK body. Because we also need to check for
8e034cb195f1 configure: set and restore compiler flags when testing for Qt header files Mike Miller <mtmiller@octave.org> parents: 24143 diff changeset	1872 dnl Qt header files associated with the compilation test, set and restore
8e034cb195f1 configure: set and restore compiler flags when testing for Qt header files Mike Miller <mtmiller@octave.org> parents: 24143 diff changeset	1873 dnl these values outside of the AC_CACHE_CHECK for this macro only.
8e034cb195f1 configure: set and restore compiler flags when testing for Qt header files Mike Miller <mtmiller@octave.org> parents: 24143 diff changeset	1874 AC_LANG_PUSH(C++)
8e034cb195f1 configure: set and restore compiler flags when testing for Qt header files Mike Miller <mtmiller@octave.org> parents: 24143 diff changeset	1875 ac_octave_save_CPPFLAGS="$CPPFLAGS"
8e034cb195f1 configure: set and restore compiler flags when testing for Qt header files Mike Miller <mtmiller@octave.org> parents: 24143 diff changeset	1876 ac_octave_save_CXXFLAGS="$CXXFLAGS"
8e034cb195f1 configure: set and restore compiler flags when testing for Qt header files Mike Miller <mtmiller@octave.org> parents: 24143 diff changeset	1877 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
8e034cb195f1 configure: set and restore compiler flags when testing for Qt header files Mike Miller <mtmiller@octave.org> parents: 24143 diff changeset	1878 CXXFLAGS="$CXXPICFLAG $CXXFLAGS"
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25844 diff changeset	1879 AC_CHECK_HEADERS([QOpenGLWidget QGLWidget QGLFunctions_1_1])
20420 6cfbf412a2c3 configure.ac: Test that Qt and OpenGL can be used together (bug #45672) Mike Miller <mtmiller@octave.org> parents: 20416 diff changeset	1880 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	1881 [octave_cv_qt_opengl_ok],
24144 8e034cb195f1 configure: set and restore compiler flags when testing for Qt header files Mike Miller <mtmiller@octave.org> parents: 24143 diff changeset	1882 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
20420 6cfbf412a2c3 configure.ac: Test that Qt and OpenGL can be used together (bug #45672) Mike Miller <mtmiller@octave.org> parents: 20416 diff changeset	1883 #if HAVE_WINDOWS_H
24142 59cdf06c940e use QOpenGLWidget if it is available John W. Eaton <jwe@octave.org> parents: 24125 diff changeset	1884 # include <windows.h>
20420 6cfbf412a2c3 configure.ac: Test that Qt and OpenGL can be used together (bug #45672) Mike Miller <mtmiller@octave.org> parents: 20416 diff changeset	1885 #endif
6cfbf412a2c3 configure.ac: Test that Qt and OpenGL can be used together (bug #45672) Mike Miller <mtmiller@octave.org> parents: 20416 diff changeset	1886 #if defined (HAVE_GL_GL_H)
24142 59cdf06c940e use QOpenGLWidget if it is available John W. Eaton <jwe@octave.org> parents: 24125 diff changeset	1887 # include <GL/gl.h>
20420 6cfbf412a2c3 configure.ac: Test that Qt and OpenGL can be used together (bug #45672) Mike Miller <mtmiller@octave.org> parents: 20416 diff changeset	1888 #elif defined (HAVE_OPENGL_GL_H)
24142 59cdf06c940e use QOpenGLWidget if it is available John W. Eaton <jwe@octave.org> parents: 24125 diff changeset	1889 # include <OpenGL/gl.h>
20420 6cfbf412a2c3 configure.ac: Test that Qt and OpenGL can be used together (bug #45672) Mike Miller <mtmiller@octave.org> parents: 20416 diff changeset	1890 #endif
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21604 diff changeset	1891 #if defined (HAVE_GL_GLU_H)
24142 59cdf06c940e use QOpenGLWidget if it is available John W. Eaton <jwe@octave.org> parents: 24125 diff changeset	1892 # include <GL/glu.h>
20420 6cfbf412a2c3 configure.ac: Test that Qt and OpenGL can be used together (bug #45672) Mike Miller <mtmiller@octave.org> parents: 20416 diff changeset	1893 #elif defined HAVE_OPENGL_GLU_H \|\| defined HAVE_FRAMEWORK_OPENGL
24142 59cdf06c940e use QOpenGLWidget if it is available John W. Eaton <jwe@octave.org> parents: 24125 diff changeset	1894 # include <OpenGL/glu.h>
20420 6cfbf412a2c3 configure.ac: Test that Qt and OpenGL can be used together (bug #45672) Mike Miller <mtmiller@octave.org> parents: 20416 diff changeset	1895 #endif
24142 59cdf06c940e use QOpenGLWidget if it is available John W. Eaton <jwe@octave.org> parents: 24125 diff changeset	1896 #if defined (HAVE_QOPENGLWIDGET)
59cdf06c940e use QOpenGLWidget if it is available John W. Eaton <jwe@octave.org> parents: 24125 diff changeset	1897 # include <QOpenGLWidget>
59cdf06c940e use QOpenGLWidget if it is available John W. Eaton <jwe@octave.org> parents: 24125 diff changeset	1898 # define OCTAVE_QT_OPENGL_WIDGET QOpenGLWidget
59cdf06c940e use QOpenGLWidget if it is available John W. Eaton <jwe@octave.org> parents: 24125 diff changeset	1899 #elif defined (HAVE_QGLWIDGET)
59cdf06c940e use QOpenGLWidget if it is available John W. Eaton <jwe@octave.org> parents: 24125 diff changeset	1900 # include <QGLWidget>
59cdf06c940e use QOpenGLWidget if it is available John W. Eaton <jwe@octave.org> parents: 24125 diff changeset	1901 # define OCTAVE_QT_OPENGL_WIDGET QGLWidget
59cdf06c940e use QOpenGLWidget if it is available John W. Eaton <jwe@octave.org> parents: 24125 diff changeset	1902 #endif
59cdf06c940e use QOpenGLWidget if it is available John W. Eaton <jwe@octave.org> parents: 24125 diff changeset	1903 class gl_widget : public OCTAVE_QT_OPENGL_WIDGET
20420 6cfbf412a2c3 configure.ac: Test that Qt and OpenGL can be used together (bug #45672) Mike Miller <mtmiller@octave.org> parents: 20416 diff changeset	1904 {
6cfbf412a2c3 configure.ac: Test that Qt and OpenGL can be used together (bug #45672) Mike Miller <mtmiller@octave.org> parents: 20416 diff changeset	1905 public:
24142 59cdf06c940e use QOpenGLWidget if it is available John W. Eaton <jwe@octave.org> parents: 24125 diff changeset	1906 gl_widget (QWidget *parent = 0)
59cdf06c940e use QOpenGLWidget if it is available John W. Eaton <jwe@octave.org> parents: 24125 diff changeset	1907 : OCTAVE_QT_OPENGL_WIDGET (parent) { }
20420 6cfbf412a2c3 configure.ac: Test that Qt and OpenGL can be used together (bug #45672) Mike Miller <mtmiller@octave.org> parents: 20416 diff changeset	1908 ~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	1909 };
6cfbf412a2c3 configure.ac: Test that Qt and OpenGL can be used together (bug #45672) Mike Miller <mtmiller@octave.org> parents: 20416 diff changeset	1910 ]], [[
6cfbf412a2c3 configure.ac: Test that Qt and OpenGL can be used together (bug #45672) Mike Miller <mtmiller@octave.org> parents: 20416 diff changeset	1911 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	1912 ]])],
6cfbf412a2c3 configure.ac: Test that Qt and OpenGL can be used together (bug #45672) Mike Miller <mtmiller@octave.org> parents: 20416 diff changeset	1913 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	1914 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	1915 ])
24144 8e034cb195f1 configure: set and restore compiler flags when testing for Qt header files Mike Miller <mtmiller@octave.org> parents: 24143 diff changeset	1916 CPPFLAGS="$ac_octave_save_CPPFLAGS"
8e034cb195f1 configure: set and restore compiler flags when testing for Qt header files Mike Miller <mtmiller@octave.org> parents: 24143 diff changeset	1917 CXXFLAGS="$ac_octave_save_CXXFLAGS"
8e034cb195f1 configure: set and restore compiler flags when testing for Qt header files Mike Miller <mtmiller@octave.org> parents: 24143 diff changeset	1918 AC_LANG_POP(C++)
20420 6cfbf412a2c3 configure.ac: Test that Qt and OpenGL can be used together (bug #45672) Mike Miller <mtmiller@octave.org> parents: 20416 diff changeset	1919 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	1920 $1
6cfbf412a2c3 configure.ac: Test that Qt and OpenGL can be used together (bug #45672) Mike Miller <mtmiller@octave.org> parents: 20416 diff changeset	1921 :
6cfbf412a2c3 configure.ac: Test that Qt and OpenGL can be used together (bug #45672) Mike Miller <mtmiller@octave.org> parents: 20416 diff changeset	1922 else
6cfbf412a2c3 configure.ac: Test that Qt and OpenGL can be used together (bug #45672) Mike Miller <mtmiller@octave.org> parents: 20416 diff changeset	1923 $2
6cfbf412a2c3 configure.ac: Test that Qt and OpenGL can be used together (bug #45672) Mike Miller <mtmiller@octave.org> parents: 20416 diff changeset	1924 :
6cfbf412a2c3 configure.ac: Test that Qt and OpenGL can be used together (bug #45672) Mike Miller <mtmiller@octave.org> parents: 20416 diff changeset	1925 fi
6cfbf412a2c3 configure.ac: Test that Qt and OpenGL can be used together (bug #45672) Mike Miller <mtmiller@octave.org> parents: 20416 diff changeset	1926 ])
6cfbf412a2c3 configure.ac: Test that Qt and OpenGL can be used together (bug #45672) Mike Miller <mtmiller@octave.org> parents: 20416 diff changeset	1927 dnl
25135 ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	1928 dnl OCTAVE_CHECK_QT_TOOL(TOOL)
ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	1929 dnl
ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	1930 AC_DEFUN([OCTAVE_CHECK_QT_TOOL], [
ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	1931 AC_CHECK_TOOLS(m4_toupper([$1])_QTVER, [$1-qt$qt_version])
ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	1932 if test -z "$m4_toupper([$1])_QTVER"; then
ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	1933 AC_CHECK_TOOLS(m4_toupper([$1]), [$1])
ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	1934 if test -n "$m4_toupper([$1])"; then
ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	1935 if test -n "$QTCHOOSER"; then
ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	1936 m4_toupper([$1])FLAGS="-qt$qt_version"
ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	1937 fi
ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	1938 QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE $1"
ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	1939 else
ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	1940 QT_TOOLS_MISSING="$QT_TOOLS_MISSING $1"
ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	1941 fi
ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	1942 else
ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	1943 m4_toupper([$1])="$m4_toupper([$1])_QTVER"
ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	1944 QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE $1"
ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	1945 fi
ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	1946 ])
ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	1947 dnl
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1948 dnl Check whether Qt VERSION is present, supports QtOpenGL and
24798 45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1949 dnl QScintilla, and will work for Octave.
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1950 dnl
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1951 dnl OCTAVE_CHECK_QT_VERSION(VERSION)
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1952 dnl
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1953 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	1954 QT_CPPFLAGS=
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1955 QT_LDFLAGS=
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1956 QT_LIBS=
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1957
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1958 qt_version="$1";
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1959
22255 8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1960 build_qt_gui=yes
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1961 build_qt_graphics=no
24798 45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	1962 have_qt_opengl_offscreen=no
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1963 win32_terminal=no
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1964
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1965 warn_qt_libraries=""
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1966 warn_qt_version=""
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1967 warn_qt_tools=""
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1968 warn_qt_setlocale=""
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1969 warn_qt_setvbuf=""
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1970 warn_qt_lib_fcns=""
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1971 warn_qt_abstract_item_model=""
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1972 warn_qt_opengl=""
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1973
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1974 ## Check for Qt libraries
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1975 case "$qt_version" in
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1976 4)
25931 332be8be16eb dynamically load qt graphics John W. Eaton <jwe@octave.org> parents: 25884 diff changeset	1977 QT_OPENGL_MODULE="QtOpenGL"
332be8be16eb dynamically load qt graphics John W. Eaton <jwe@octave.org> parents: 25884 diff changeset	1978 QT_MODULES="QtCore QtGui QtNetwork QtHelp"
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1979 ;;
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1980 5)
25931 332be8be16eb dynamically load qt graphics John W. Eaton <jwe@octave.org> parents: 25884 diff changeset	1981 QT_OPENGL_MODULE="Qt5OpenGL"
332be8be16eb dynamically load qt graphics John W. Eaton <jwe@octave.org> parents: 25884 diff changeset	1982 QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5PrintSupport Qt5Help"
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1983 ;;
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1984 *)
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1985 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	1986 ;;
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1987 esac
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1988
25114 f191e1a26095 if a Qt version appears partially installed, don't check another version John W. Eaton <jwe@octave.org> parents: 25098 diff changeset	1989 ## Use this check to get info in the log file.
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1990 PKG_CHECK_MODULES(QT, [$QT_MODULES],
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1991 [],
22255 8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	1992 [build_qt_gui=no
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	1993 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	1994
25114 f191e1a26095 if a Qt version appears partially installed, don't check another version John W. Eaton <jwe@octave.org> parents: 25098 diff changeset	1995 ## Check the modules again individually to get lists of modules that
f191e1a26095 if a Qt version appears partially installed, don't check another version John W. Eaton <jwe@octave.org> parents: 25098 diff changeset	1996 ## are available and/or missing
f191e1a26095 if a Qt version appears partially installed, don't check another version John W. Eaton <jwe@octave.org> parents: 25098 diff changeset	1997 QT_MODULES_AVAILABLE=
25097 cc21f66ecb1c display more info in configure summary about Qt version and missing features John W. Eaton <jwe@octave.org> parents: 25061 diff changeset	1998 QT_MODULES_MISSING=
25114 f191e1a26095 if a Qt version appears partially installed, don't check another version John W. Eaton <jwe@octave.org> parents: 25098 diff changeset	1999 for qt_mod in $QT_MODULES; do
f191e1a26095 if a Qt version appears partially installed, don't check another version John W. Eaton <jwe@octave.org> parents: 25098 diff changeset	2000 if $PKG_CONFIG --exists $qt_mod; then
f191e1a26095 if a Qt version appears partially installed, don't check another version John W. Eaton <jwe@octave.org> parents: 25098 diff changeset	2001 QT_MODULES_AVAILABLE="$QT_MODULES_AVAILABLE $qt_mod"
f191e1a26095 if a Qt version appears partially installed, don't check another version John W. Eaton <jwe@octave.org> parents: 25098 diff changeset	2002 else
f191e1a26095 if a Qt version appears partially installed, don't check another version John W. Eaton <jwe@octave.org> parents: 25098 diff changeset	2003 QT_MODULES_MISSING="$QT_MODULES_MISSING $qt_mod"
f191e1a26095 if a Qt version appears partially installed, don't check another version John W. Eaton <jwe@octave.org> parents: 25098 diff changeset	2004 fi
f191e1a26095 if a Qt version appears partially installed, don't check another version John W. Eaton <jwe@octave.org> parents: 25098 diff changeset	2005 done
25097 cc21f66ecb1c display more info in configure summary about Qt version and missing features John W. Eaton <jwe@octave.org> parents: 25061 diff changeset	2006
22255 8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	2007 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	2008 ## 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	2009 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	2010 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	2011 QT_LIBS="$($PKG_CONFIG --libs-only-l $QT_MODULES \| $SED -e 's/^ *$//')"
25931 332be8be16eb dynamically load qt graphics John W. Eaton <jwe@octave.org> parents: 25884 diff changeset	2012 QT_OPENGL_LIBS="$($PKG_CONFIG --libs-only-l $QT_OPENGL_MODULE \| $SED -e 's/^ *$//')"
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2013
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2014 case $host_os in
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2015 darwin)
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2016 ## Qt might be installed in framework
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2017 if test -z "$QT_LIBS"; then
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2018 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	2019 QT_LIBS="`$PKG_CONFIG --libs-only-other $QT_MODULES \| tr ' ' '\n' \| $GREP -v -e '-F' \| uniq \| tr '\n' ' '`"
25931 332be8be16eb dynamically load qt graphics John W. Eaton <jwe@octave.org> parents: 25884 diff changeset	2020 QT_OPENGL_LIBS="`$PKG_CONFIG --libs-only-other $QT_OPENGL_MODULE \| tr ' ' '\n' \| $GREP -v -e '-F' \| uniq \| tr '\n' ' '`"
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2021 ## 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	2022 ## of the -F flag
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2023 AM_CONDITIONAL([AMCOND_LINK_ALL_DEPS],
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2024 [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	2025 fi
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2026 ;;
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2027 esac
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2028
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2029 if test $qt_version = 4; then
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2030 ## Check for Qt4
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2031 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	2032 build_qt_gui=no
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2033 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	2034 fi
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2035 fi
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2036 fi
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2037
25119 14b9e2a1f3e1 if some Qt tools are instaslled, don't check for another version John W. Eaton <jwe@octave.org> parents: 25114 diff changeset	2038 QT_TOOLS_AVAILABLE=
14b9e2a1f3e1 if some Qt tools are instaslled, don't check for another version John W. Eaton <jwe@octave.org> parents: 25114 diff changeset	2039 QT_TOOLS_MISSING=
14b9e2a1f3e1 if some Qt tools are instaslled, don't check for another version John W. Eaton <jwe@octave.org> parents: 25114 diff changeset	2040
22255 8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	2041 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	2042 AC_CHECK_TOOLS(QTCHOOSER, [qtchooser])
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2043
25135 ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	2044 OCTAVE_CHECK_QT_TOOL([moc])
ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	2045 OCTAVE_CHECK_QT_TOOL([uic])
ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	2046 OCTAVE_CHECK_QT_TOOL([rcc])
ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	2047 OCTAVE_CHECK_QT_TOOL([lrelease])
ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	2048 OCTAVE_CHECK_QT_TOOL([qcollectiongenerator])
ab3904f253c5 correctly track available/missing Qt tools when qtchooser is not found John W. Eaton <jwe@octave.org> parents: 25134 diff changeset	2049 OCTAVE_CHECK_QT_TOOL([qhelpgenerator])
24873 486bc22482ca Improve Doxygen generation. Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24837 diff changeset	2050
25119 14b9e2a1f3e1 if some Qt tools are instaslled, don't check for another version John W. Eaton <jwe@octave.org> parents: 25114 diff changeset	2051 if test -n "$QT_TOOLS_MISSING"; then
25029 91671d57817e configure: mention qcollectiongenerator and qhelpgenerator in diagnostics (bug #53474) Mike Miller <mtmiller@octave.org> parents: 24938 diff changeset	2052 warn_qt_tools="one or more of the Qt utilities moc, uic, rcc, lrelease, qcollectiongenerator, and qhelpgenerator not found; disabling Qt GUI"
22255 8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	2053 build_qt_gui=no
23154 80a2434ba83c refactor checks for Qt tools (bug #50214) John W. Eaton <jwe@octave.org> parents: 23088 diff changeset	2054 MOC_QTVER=
80a2434ba83c refactor checks for Qt tools (bug #50214) John W. Eaton <jwe@octave.org> parents: 23088 diff changeset	2055 UIC_QTVER=
80a2434ba83c refactor checks for Qt tools (bug #50214) John W. Eaton <jwe@octave.org> parents: 23088 diff changeset	2056 RCC_QTVER=
80a2434ba83c refactor checks for Qt tools (bug #50214) John W. Eaton <jwe@octave.org> parents: 23088 diff changeset	2057 LRELEASE_QTVER=
24875 7c7b60dd4d4c Generate Qt compressed help and collection files for the manual (bug #53006) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24873 diff changeset	2058 QCOLLECTIONGENERATOR_QTVER=
24873 486bc22482ca Improve Doxygen generation. Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24837 diff changeset	2059 QHELPGENERATOR_QTVER=
486bc22482ca Improve Doxygen generation. Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24837 diff changeset	2060 MOCFLAGS=
486bc22482ca Improve Doxygen generation. Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24837 diff changeset	2061 UICFLAGS=
486bc22482ca Improve Doxygen generation. Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24837 diff changeset	2062 RCCFLAGS=
486bc22482ca Improve Doxygen generation. Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24837 diff changeset	2063 LRELEASEFLAGS=
24938 4f1da669b610 build: export and use qcollectiongenerator command line options correctly Mike Miller <mtmiller@octave.org> parents: 24890 diff changeset	2064 QCOLLECTIONGENERATORFLAGS=
24873 486bc22482ca Improve Doxygen generation. Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24837 diff changeset	2065 QHELPGENERATORFLAGS=
23154 80a2434ba83c refactor checks for Qt tools (bug #50214) John W. Eaton <jwe@octave.org> parents: 23088 diff changeset	2066 $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	2067 $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	2068 $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	2069 $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	2070 $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	2071 $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	2072 $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	2073 $as_unset ac_cv_prog_ac_ct_LRELEASE_QTVER
24938 4f1da669b610 build: export and use qcollectiongenerator command line options correctly Mike Miller <mtmiller@octave.org> parents: 24890 diff changeset	2074 $as_unset ac_cv_prog_QCOLLECTIONGENERATOR_QTVER
4f1da669b610 build: export and use qcollectiongenerator command line options correctly Mike Miller <mtmiller@octave.org> parents: 24890 diff changeset	2075 $as_unset ac_cv_prog_ac_ct_QCOLLECTIONGENERATOR_QTVER
24873 486bc22482ca Improve Doxygen generation. Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24837 diff changeset	2076 $as_unset ac_cv_prog_QHELPGENERATOR_QTVER
486bc22482ca Improve Doxygen generation. Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24837 diff changeset	2077 $as_unset ac_cv_prog_ac_ct_QHELPGENERATOR_QTVER
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2078 fi
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2079 fi
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2080
22255 8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	2081 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	2082 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	2083 [build_qt_gui=no
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2084 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	2085 fi
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2086
22255 8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	2087 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	2088 case $host_os in
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2089 mingw* \| msdosmsvc*)
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2090 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	2091 [build_qt_gui=no
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2092 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	2093 ;;
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2094 *)
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2095 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	2096 AC_SEARCH_LIBS([openpty], [util],
24810 8a92f442c4a2 configure.ac: Overhaul file (bug #53186). Rik <rik@octave.org> parents: 24798 diff changeset	2097 [AC_DEFINE(HAVE_OPENPTY, 1, [Define to 1 if openpty exists])])
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2098 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	2099 [build_qt_gui=no
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2100 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	2101 ;;
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2102 esac
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2103 fi
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2104
22255 8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	2105 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	2106 OCTAVE_CHECK_FUNC_QABSTRACTITEMMODEL_BEGINRESETMODEL
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2107
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2108 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	2109 build_qt_gui=no
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2110 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	2111 ## 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	2112 ## 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	2113 $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	2114 fi
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2115 fi
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2116
22255 8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	2117 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	2118 ## 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	2119 ## 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	2120
8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	2121 AC_DEFINE(HAVE_QT, 1,
25029 91671d57817e configure: mention qcollectiongenerator and qhelpgenerator in diagnostics (bug #53474) Mike Miller <mtmiller@octave.org> parents: 24938 diff changeset	2122 [Define to 1 if Qt is available, with all required functions, libraries, developer header files, and utilities.])
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2123
24827 1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	2124 AC_LANG_PUSH(C++)
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	2125 ac_octave_save_CPPFLAGS="$CPPFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	2126 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	2127 AC_CHECK_HEADERS([QStandardPaths])
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	2128 CPPFLAGS="$ac_octave_save_CPPFLAGS"
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	2129 AC_LANG_POP(C++)
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	2130
22255 8e18e364a686 improve checks for Qt when Qt 5 is not installed John W. Eaton <jwe@octave.org> parents: 22250 diff changeset	2131 ## 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	2132 ## 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	2133 ## 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	2134
25046 a4c687fec320 gui: set Qt Application and Desktop metadata for desktop integration (bug #53102) Mike Miller <mtmiller@octave.org> parents: 25042 diff changeset	2135 OCTAVE_CHECK_FUNC_QGUIAPPLICATION_SETDESKTOPFILENAME
24827 1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	2136 OCTAVE_CHECK_FUNC_QHEADERVIEW_SETSECTIONRESIZEMODE
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	2137 OCTAVE_CHECK_FUNC_QHEADERVIEW_SETSECTIONSCLICKABLE
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	2138 OCTAVE_CHECK_FUNC_QHEADERVIEW_SETSECTIONSMOVABLE
25061 5fef743c34d7 build: Check for new help query member in qt 5.9 (bug #53006). Torsten <mttl@mailbox.org> parents: 25054 diff changeset	2139 OCTAVE_CHECK_FUNC_QHELPSEARCHQUERYWIDGET_SEARCHINPUT
24827 1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	2140 OCTAVE_CHECK_FUNC_QINSTALLMESSAGEHANDLER
24093 7d9ba57201b4 configure: improve Qt feature tests for functionality and consistency Mike Miller <mtmiller@octave.org> parents: 24077 diff changeset	2141 OCTAVE_CHECK_FUNC_QLINEEDIT_SETPLACEHOLDERTEXT
24827 1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	2142 OCTAVE_CHECK_FUNC_QMOUSEEVENT_LOCALPOS
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	2143 OCTAVE_CHECK_FUNC_QOBJECT_FINDCHILDREN_ACCEPTS_FINDCHILDOPTIONS
25884 4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25862 diff changeset	2144 OCTAVE_CHECK_FUNC_QSCREEN_DEVICEPIXELRATIO
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2145 OCTAVE_CHECK_FUNC_QTABWIDGET_SETMOVABLE
24827 1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24825 diff changeset	2146 OCTAVE_CHECK_FUNC_QTMESSAGEHANDLER_ACCEPTS_QMESSAGELOGCONTEXT
24093 7d9ba57201b4 configure: improve Qt feature tests for functionality and consistency Mike Miller <mtmiller@octave.org> parents: 24077 diff changeset	2147 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	2148 OCTAVE_CHECK_MEMBER_QFONT_MONOSPACE
24821 88665923596c Make variable editor code compile under Qt4 (bug #53259) Daniel J Sebald <daniel.sebald@ieee.org> parents: 24810 diff changeset	2149 OCTAVE_HAVE_QGUIAPPLICATION
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2150
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2151 if test -n "$OPENGL_LIBS"; then
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2152 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	2153 [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	2154
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2155 if test $build_qt_graphics = yes; then
24837 ae6679369a80 Rely on QOffscreenSurface functionality rather than its presence (bug #53278) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24827 diff changeset	2156 AC_DEFINE(HAVE_QT_GRAPHICS, 1, [Define to 1 if Qt works with OpenGL libs (GL and GLU)])
24798 45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24623 diff changeset	2157 OCTAVE_CHECK_QT_OPENGL_OFFSCREEN_OK([have_qt_opengl_offscreen=yes])
24837 ae6679369a80 Rely on QOffscreenSurface functionality rather than its presence (bug #53278) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24827 diff changeset	2158 if test $have_qt_opengl_offscreen = yes; then
ae6679369a80 Rely on QOffscreenSurface functionality rather than its presence (bug #53278) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24827 diff changeset	2159 AC_DEFINE(HAVE_QT_OFFSCREEN, 1, [Define to 1 if Qt handles offscreen OpenGL rendering])
ae6679369a80 Rely on QOffscreenSurface functionality rather than its presence (bug #53278) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24827 diff changeset	2160 fi
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2161 fi
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2162 fi
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2163
22823 e2afee0041bf new configure option, --without-qscintilla John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	2164 OCTAVE_CHECK_QSCINTILLA([$qt_version])
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2165
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2166 fi
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2167 AC_SUBST(MOCFLAGS)
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2168 AC_SUBST(UICFLAGS)
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2169 AC_SUBST(RCCFLAGS)
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2170 AC_SUBST(LRELEASEFLAGS)
24938 4f1da669b610 build: export and use qcollectiongenerator command line options correctly Mike Miller <mtmiller@octave.org> parents: 24890 diff changeset	2171 AC_SUBST(QCOLLECTIONGENERATORFLAGS)
4f1da669b610 build: export and use qcollectiongenerator command line options correctly Mike Miller <mtmiller@octave.org> parents: 24890 diff changeset	2172 AC_SUBST(QHELPGENERATORFLAGS)
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2173 AC_SUBST(QT_CPPFLAGS)
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2174 AC_SUBST(QT_LDFLAGS)
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2175 AC_SUBST(QT_LIBS)
25931 332be8be16eb dynamically load qt graphics John W. Eaton <jwe@octave.org> parents: 25884 diff changeset	2176 AC_SUBST(QT_OPENGL_LIBS)
22234 66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2177 ])
66dd260512a4 allow configure to select Qt version John W. Eaton <jwe@octave.org> parents: 22208 diff changeset	2178 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2179 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	2180 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	2181 dnl is already set.
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2182 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2183 AC_DEFUN([OCTAVE_CHECK_SIZEOF_FORTRAN_INTEGER], [
22986 21707d6a02c7 make --enable-64 the default John W. Eaton <jwe@octave.org> parents: 22899 diff changeset	2184 AC_CACHE_CHECK([default size of Fortran INTEGER],
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2185 [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	2186 [ac_octave_save_FFLAGS="$FFLAGS"
22986 21707d6a02c7 make --enable-64 the default John W. Eaton <jwe@octave.org> parents: 22899 diff changeset	2187 FFLAGS="$FFLAGS $F77_INTEGER_8_FLAG"
21707d6a02c7 make --enable-64 the default John W. Eaton <jwe@octave.org> parents: 22899 diff changeset	2188 AC_LANG_PUSH(Fortran 77)
21707d6a02c7 make --enable-64 the default John W. Eaton <jwe@octave.org> parents: 22899 diff changeset	2189 AC_RUN_IFELSE([AC_LANG_PROGRAM(,[[
21707d6a02c7 make --enable-64 the default John W. Eaton <jwe@octave.org> parents: 22899 diff changeset	2190 integer*8 n8
21707d6a02c7 make --enable-64 the default John W. Eaton <jwe@octave.org> parents: 22899 diff changeset	2191 integer n
21707d6a02c7 make --enable-64 the default John W. Eaton <jwe@octave.org> parents: 22899 diff changeset	2192 c Generate -2**33 + 1.
21707d6a02c7 make --enable-64 the default John W. Eaton <jwe@octave.org> parents: 22899 diff changeset	2193 n8 = 2
21707d6a02c7 make --enable-64 the default John W. Eaton <jwe@octave.org> parents: 22899 diff changeset	2194 n8 = -4 * (n8 ** 30)
21707d6a02c7 make --enable-64 the default John W. Eaton <jwe@octave.org> parents: 22899 diff changeset	2195 n8 = n8 + 1
21707d6a02c7 make --enable-64 the default John W. Eaton <jwe@octave.org> parents: 22899 diff changeset	2196 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	2197 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	2198 n = n8
21707d6a02c7 make --enable-64 the default John W. Eaton <jwe@octave.org> parents: 22899 diff changeset	2199 if (n .ne. n8) stop 1
21707d6a02c7 make --enable-64 the default John W. Eaton <jwe@octave.org> parents: 22899 diff changeset	2200 ]])],
21707d6a02c7 make --enable-64 the default John W. Eaton <jwe@octave.org> parents: 22899 diff changeset	2201 octave_cv_sizeof_fortran_integer=8,
21707d6a02c7 make --enable-64 the default John W. Eaton <jwe@octave.org> parents: 22899 diff changeset	2202 octave_cv_sizeof_fortran_integer=4,
21707d6a02c7 make --enable-64 the default John W. Eaton <jwe@octave.org> parents: 22899 diff changeset	2203 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	2204 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	2205 FFLAGS="$ac_octave_save_FFLAGS"
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2206 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2207 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2208 dnl
23981 6420142ff32c configure: fix capitalization of SUNDIALS, reword related terms Mike Miller <mtmiller@octave.org> parents: 23980 diff changeset	2209 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	2210 dnl precision realtype.
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2211 dnl
23980 eb6602171d59 configure: make SUNDIALS double precision test cross-compile-safe (bug #51904) Mike Miller <mtmiller@octave.org> parents: 23836 diff changeset	2212 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	2213 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	2214 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	2215 [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	2216 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
22899 31bd8a50d44c Add Sundials library support Francesco Faccio <francesco.faccio@mail.polimi.it> parents: 22890 diff changeset	2217 #if defined (HAVE_IDA_IDA_H)
31bd8a50d44c Add Sundials library support Francesco Faccio <francesco.faccio@mail.polimi.it> parents: 22890 diff changeset	2218 #include <ida/ida.h>
31bd8a50d44c Add Sundials library support Francesco Faccio <francesco.faccio@mail.polimi.it> parents: 22890 diff changeset	2219 #else
31bd8a50d44c Add Sundials library support Francesco Faccio <francesco.faccio@mail.polimi.it> parents: 22890 diff changeset	2220 #include <ida.h>
31bd8a50d44c Add Sundials library support Francesco Faccio <francesco.faccio@mail.polimi.it> parents: 22890 diff changeset	2221 #endif
31bd8a50d44c Add Sundials library support Francesco Faccio <francesco.faccio@mail.polimi.it> parents: 22890 diff changeset	2222 #include <assert.h>
31bd8a50d44c Add Sundials library support Francesco Faccio <francesco.faccio@mail.polimi.it> parents: 22890 diff changeset	2223 ]], [[
23980 eb6602171d59 configure: make SUNDIALS double precision test cross-compile-safe (bug #51904) Mike Miller <mtmiller@octave.org> parents: 23836 diff changeset	2224 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	2225 "SUNDIALS is not configured for double precision");
22899 31bd8a50d44c Add Sundials library support Francesco Faccio <francesco.faccio@mail.polimi.it> parents: 22890 diff changeset	2226 ]])],
23980 eb6602171d59 configure: make SUNDIALS double precision test cross-compile-safe (bug #51904) Mike Miller <mtmiller@octave.org> parents: 23836 diff changeset	2227 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	2228 octave_cv_sundials_realtype_is_double=no)
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2229 ])
23980 eb6602171d59 configure: make SUNDIALS double precision test cross-compile-safe (bug #51904) Mike Miller <mtmiller@octave.org> parents: 23836 diff changeset	2230 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	2231 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	2232 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	2233 fi
6094018f5e72 refactor configure checks for Sundials (bug #50003) John W. Eaton <jwe@octave.org> parents: 23017 diff changeset	2234 ])
6094018f5e72 refactor configure checks for Sundials (bug #50003) John W. Eaton <jwe@octave.org> parents: 23017 diff changeset	2235 dnl
23981 6420142ff32c configure: fix capitalization of SUNDIALS, reword related terms Mike Miller <mtmiller@octave.org> parents: 23980 diff changeset	2236 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	2237 dnl enabled.
6094018f5e72 refactor configure checks for Sundials (bug #50003) John W. Eaton <jwe@octave.org> parents: 23017 diff changeset	2238 dnl
6094018f5e72 refactor configure checks for Sundials (bug #50003) John W. Eaton <jwe@octave.org> parents: 23017 diff changeset	2239 AC_DEFUN([OCTAVE_CHECK_SUNDIALS_IDAKLU], [
6094018f5e72 refactor configure checks for Sundials (bug #50003) John W. Eaton <jwe@octave.org> parents: 23017 diff changeset	2240 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	2241 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	2242 [octave_cv_sundials_idaklu],
6094018f5e72 refactor configure checks for Sundials (bug #50003) John W. Eaton <jwe@octave.org> parents: 23017 diff changeset	2243 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
6094018f5e72 refactor configure checks for Sundials (bug #50003) John W. Eaton <jwe@octave.org> parents: 23017 diff changeset	2244 #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	2245 #include <ida/ida_klu.h>
6094018f5e72 refactor configure checks for Sundials (bug #50003) John W. Eaton <jwe@octave.org> parents: 23017 diff changeset	2246 #else
6094018f5e72 refactor configure checks for Sundials (bug #50003) John W. Eaton <jwe@octave.org> parents: 23017 diff changeset	2247 #include <ida_klu.h>
6094018f5e72 refactor configure checks for Sundials (bug #50003) John W. Eaton <jwe@octave.org> parents: 23017 diff changeset	2248 #endif
6094018f5e72 refactor configure checks for Sundials (bug #50003) John W. Eaton <jwe@octave.org> parents: 23017 diff changeset	2249 ]], [[
6094018f5e72 refactor configure checks for Sundials (bug #50003) John W. Eaton <jwe@octave.org> parents: 23017 diff changeset	2250 IDAKLU (0, 0, 0, 0);
6094018f5e72 refactor configure checks for Sundials (bug #50003) John W. Eaton <jwe@octave.org> parents: 23017 diff changeset	2251 ]])],
6094018f5e72 refactor configure checks for Sundials (bug #50003) John W. Eaton <jwe@octave.org> parents: 23017 diff changeset	2252 octave_cv_sundials_idaklu=yes,
6094018f5e72 refactor configure checks for Sundials (bug #50003) John W. Eaton <jwe@octave.org> parents: 23017 diff changeset	2253 octave_cv_sundials_idaklu=no)
6094018f5e72 refactor configure checks for Sundials (bug #50003) John W. Eaton <jwe@octave.org> parents: 23017 diff changeset	2254 ])
6094018f5e72 refactor configure checks for Sundials (bug #50003) John W. Eaton <jwe@octave.org> parents: 23017 diff changeset	2255 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	2256 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	2257 [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	2258 else
23981 6420142ff32c configure: fix capitalization of SUNDIALS, reword related terms Mike Miller <mtmiller@octave.org> parents: 23980 diff changeset	2259 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	2260 OCTAVE_CONFIGURE_WARNING([warn_sundials_idaklu])
22899 31bd8a50d44c Add Sundials library support Francesco Faccio <francesco.faccio@mail.polimi.it> parents: 22890 diff changeset	2261 fi
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2262 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2263 dnl
25098 5dce8aa80652 configure: disable SUNDIALS if the IDADENSE API is not found (bug #52475) Mike Miller <mtmiller@octave.org> parents: 25097 diff changeset	2264 dnl Check whether SUNDIALS IDA library has the IDADENSE linear solver.
5dce8aa80652 configure: disable SUNDIALS if the IDADENSE API is not found (bug #52475) Mike Miller <mtmiller@octave.org> parents: 25097 diff changeset	2265 dnl The IDADENSE API was removed in SUNDIALS version 3.0.0.
5dce8aa80652 configure: disable SUNDIALS if the IDADENSE API is not found (bug #52475) Mike Miller <mtmiller@octave.org> parents: 25097 diff changeset	2266 dnl
5dce8aa80652 configure: disable SUNDIALS if the IDADENSE API is not found (bug #52475) Mike Miller <mtmiller@octave.org> parents: 25097 diff changeset	2267 AC_DEFUN([OCTAVE_CHECK_SUNDIALS_IDA_DENSE], [
5dce8aa80652 configure: disable SUNDIALS if the IDADENSE API is not found (bug #52475) Mike Miller <mtmiller@octave.org> parents: 25097 diff changeset	2268 AC_CHECK_HEADERS([ida/ida_dense.h ida_dense.h])
5dce8aa80652 configure: disable SUNDIALS if the IDADENSE API is not found (bug #52475) Mike Miller <mtmiller@octave.org> parents: 25097 diff changeset	2269 AC_CACHE_CHECK([whether SUNDIALS IDA includes the IDADENSE linear solver],
5dce8aa80652 configure: disable SUNDIALS if the IDADENSE API is not found (bug #52475) Mike Miller <mtmiller@octave.org> parents: 25097 diff changeset	2270 [octave_cv_sundials_ida_dense],
5dce8aa80652 configure: disable SUNDIALS if the IDADENSE API is not found (bug #52475) Mike Miller <mtmiller@octave.org> parents: 25097 diff changeset	2271 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
5dce8aa80652 configure: disable SUNDIALS if the IDADENSE API is not found (bug #52475) Mike Miller <mtmiller@octave.org> parents: 25097 diff changeset	2272 #if defined (HAVE_IDA_IDA_DENSE_H)
5dce8aa80652 configure: disable SUNDIALS if the IDADENSE API is not found (bug #52475) Mike Miller <mtmiller@octave.org> parents: 25097 diff changeset	2273 #include <ida/ida_dense.h>
5dce8aa80652 configure: disable SUNDIALS if the IDADENSE API is not found (bug #52475) Mike Miller <mtmiller@octave.org> parents: 25097 diff changeset	2274 #else
5dce8aa80652 configure: disable SUNDIALS if the IDADENSE API is not found (bug #52475) Mike Miller <mtmiller@octave.org> parents: 25097 diff changeset	2275 #include <ida_dense.h>
5dce8aa80652 configure: disable SUNDIALS if the IDADENSE API is not found (bug #52475) Mike Miller <mtmiller@octave.org> parents: 25097 diff changeset	2276 #endif
5dce8aa80652 configure: disable SUNDIALS if the IDADENSE API is not found (bug #52475) Mike Miller <mtmiller@octave.org> parents: 25097 diff changeset	2277 ]], [[
5dce8aa80652 configure: disable SUNDIALS if the IDADENSE API is not found (bug #52475) Mike Miller <mtmiller@octave.org> parents: 25097 diff changeset	2278 void *mem = 0;
5dce8aa80652 configure: disable SUNDIALS if the IDADENSE API is not found (bug #52475) Mike Miller <mtmiller@octave.org> parents: 25097 diff changeset	2279 long int num = 0;
5dce8aa80652 configure: disable SUNDIALS if the IDADENSE API is not found (bug #52475) Mike Miller <mtmiller@octave.org> parents: 25097 diff changeset	2280 IDADense (mem, num);
5dce8aa80652 configure: disable SUNDIALS if the IDADENSE API is not found (bug #52475) Mike Miller <mtmiller@octave.org> parents: 25097 diff changeset	2281 ]])],
5dce8aa80652 configure: disable SUNDIALS if the IDADENSE API is not found (bug #52475) Mike Miller <mtmiller@octave.org> parents: 25097 diff changeset	2282 octave_cv_sundials_ida_dense=yes,
5dce8aa80652 configure: disable SUNDIALS if the IDADENSE API is not found (bug #52475) Mike Miller <mtmiller@octave.org> parents: 25097 diff changeset	2283 octave_cv_sundials_ida_dense=no)
5dce8aa80652 configure: disable SUNDIALS if the IDADENSE API is not found (bug #52475) Mike Miller <mtmiller@octave.org> parents: 25097 diff changeset	2284 ])
5dce8aa80652 configure: disable SUNDIALS if the IDADENSE API is not found (bug #52475) Mike Miller <mtmiller@octave.org> parents: 25097 diff changeset	2285 if test $octave_cv_sundials_ida_dense = yes; then
5dce8aa80652 configure: disable SUNDIALS if the IDADENSE API is not found (bug #52475) Mike Miller <mtmiller@octave.org> parents: 25097 diff changeset	2286 AC_DEFINE(HAVE_SUNDIALS_IDADENSE, 1,
5dce8aa80652 configure: disable SUNDIALS if the IDADENSE API is not found (bug #52475) Mike Miller <mtmiller@octave.org> parents: 25097 diff changeset	2287 [Define to 1 if SUNDIALS IDA includes the IDADENSE linear solver.])
5dce8aa80652 configure: disable SUNDIALS if the IDADENSE API is not found (bug #52475) Mike Miller <mtmiller@octave.org> parents: 25097 diff changeset	2288 else
5dce8aa80652 configure: disable SUNDIALS if the IDADENSE API is not found (bug #52475) Mike Miller <mtmiller@octave.org> parents: 25097 diff changeset	2289 warn_sundials_ida_dense="SUNDIALS IDA library does not include the IDADENSE linear solver, ode15i and ode15s will be disabled"
5dce8aa80652 configure: disable SUNDIALS if the IDADENSE API is not found (bug #52475) Mike Miller <mtmiller@octave.org> parents: 25097 diff changeset	2290 OCTAVE_CONFIGURE_WARNING([warn_sundials_ida_dense])
5dce8aa80652 configure: disable SUNDIALS if the IDADENSE API is not found (bug #52475) Mike Miller <mtmiller@octave.org> parents: 25097 diff changeset	2291 fi
5dce8aa80652 configure: disable SUNDIALS if the IDADENSE API is not found (bug #52475) Mike Miller <mtmiller@octave.org> parents: 25097 diff changeset	2292 ])
5dce8aa80652 configure: disable SUNDIALS if the IDADENSE API is not found (bug #52475) Mike Miller <mtmiller@octave.org> parents: 25097 diff changeset	2293 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2294 dnl Add warning to final summary.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2295 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2296 AC_DEFUN([OCTAVE_CONFIGURE_WARNING], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2297 AC_MSG_WARN([$][$1])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2298 m4_set_add([summary_warning_list], [$1])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2299 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2300 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2301 dnl Print final summary.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2302 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2303 AC_DEFUN([OCTAVE_CONFIGURE_WARNING_SUMMARY], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2304 m4_set_foreach([summary_warning_list], [elt], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2305 if test -n "[$]elt"; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2306 AC_MSG_WARN([$]elt)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2307 warn_msg_printed=true
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2308 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	2309 ])
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	2310 dnl
21397 df859661e31e generate default-qt-settings at configure time John W. Eaton <jwe@octave.org> parents: 21381 diff changeset	2311 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	2312 dnl exists and hasn't changed.
df859661e31e generate default-qt-settings at configure time John W. Eaton <jwe@octave.org> parents: 21381 diff changeset	2313 dnl
df859661e31e generate default-qt-settings at configure time John W. Eaton <jwe@octave.org> parents: 21381 diff changeset	2314 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	2315 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	2316 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	2317 AC_CONFIG_COMMANDS(elt,
df859661e31e generate default-qt-settings at configure time John W. Eaton <jwe@octave.org> parents: 21381 diff changeset	2318 [$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	2319 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2320 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	2321 dnl templates defined.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2322 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2323 AC_DEFUN([OCTAVE_CXX_BITWISE_OP_TEMPLATES], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2324 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	2325 [octave_cv_cxx_bitwise_op_templates],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2326 [AC_LANG_PUSH(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2327 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2328 #include <functional>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2329 ]], [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2330 int x = 0;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2331 int y = 1;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2332 int z1 = std::bit_and<int>() (x, y);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2333 int z2 = std::bit_or<int>() (x, y);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2334 int z3 = std::bit_xor<int>() (x, y);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2335 ]])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2336 octave_cv_cxx_bitwise_op_templates=yes,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2337 octave_cv_cxx_bitwise_op_templates=no)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2338 AC_LANG_POP(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2339 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2340 if test $octave_cv_cxx_bitwise_op_templates = yes; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2341 AC_DEFINE(HAVE_CXX_BITWISE_OP_TEMPLATES, 1,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2342 [Define to 1 if C++ library has templated bitwise operators.])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2343 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2344 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2345 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2346 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	2347 dnl parts of complex numbers independently via references.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2348 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2349 AC_DEFUN([OCTAVE_CXX_COMPLEX_REFERENCE_ACCESSORS], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2350 AC_CACHE_CHECK([whether complex class can reference components independently],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2351 [octave_cv_cxx_complex_reference_accessors],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2352 [AC_LANG_PUSH(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2353 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2354 #include <complex>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2355 ]], [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2356 std::complex<double> x;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2357 x.real () = 1.0;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2358 x.imag () = 1.0;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2359 ]])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2360 octave_cv_cxx_complex_reference_accessors=yes,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2361 octave_cv_cxx_complex_reference_accessors=no)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2362 AC_LANG_POP(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2363 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2364 if test $octave_cv_cxx_complex_reference_accessors = yes; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2365 AC_DEFINE(HAVE_CXX_COMPLEX_REFERENCE_ACCESSORS, 1,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2366 [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	2367 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2368 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2369 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2370 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	2371 dnl parts of complex numbers independently.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2372 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2373 AC_DEFUN([OCTAVE_CXX_COMPLEX_SETTERS], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2374 AC_CACHE_CHECK([whether complex class can set components independently],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2375 [octave_cv_cxx_complex_setters],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2376 [AC_LANG_PUSH(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2377 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2378 #include <complex>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2379 ]], [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2380 std::complex<double> x;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2381 x.real (1.0);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2382 x.imag (2.0);
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 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	2385 AC_LANG_POP(C++)
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 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	2388 AC_DEFINE(HAVE_CXX_COMPLEX_SETTERS, 1,
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2389 [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	2390 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2391 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2392 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2393 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	2394 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2395 AC_DEFUN([OCTAVE_CXX_DYNAMIC_AUTO_ARRAYS], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2396 AC_CACHE_CHECK([whether C++ supports dynamic auto arrays],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2397 [octave_cv_cxx_dynamic_auto_arrays],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2398 [AC_LANG_PUSH(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2399 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2400 void test(char *);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2401 int length();
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2402 char x[length()];
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2403 test(x);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2404 ]])],
17034 8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	2405 octave_cv_cxx_dynamic_auto_arrays=yes,
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2406 octave_cv_cxx_dynamic_auto_arrays=no)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2407 AC_LANG_POP(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2408 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2409 if test $octave_cv_cxx_dynamic_auto_arrays = yes; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2410 AC_DEFINE(HAVE_DYNAMIC_AUTO_ARRAYS, 1,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2411 [Define to 1 if C++ supports dynamic auto arrays.])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2412 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2413 ])
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 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	2416 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	2417 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	2418 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2419 AC_DEFUN([OCTAVE_CXX_FLAG], [
17661 1978a6c76aa9 Use user-specified SED during build process (bug #40273). Rik <rik@octave.org> parents: 17615 diff changeset	2420 ac_safe=`echo "$1" \| $SED 'y%./+-:=%__p___%'`
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2421 AC_MSG_CHECKING([whether ${CXX-g++} accepts $1])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2422 AC_CACHE_VAL([octave_cv_cxx_flag_$ac_safe],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2423 [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	2424 ac_octave_save_CXXFLAGS="$CXXFLAGS"
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2425 CXXFLAGS="$CXXFLAGS $1"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2426 AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2427 eval "octave_cv_cxx_flag_$ac_safe=yes",
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2428 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	2429 CXXFLAGS="$ac_octave_save_CXXFLAGS"
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2430 AC_LANG_POP(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2431 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2432 if 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	2433 AC_MSG_RESULT([yes])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2434 ifelse([$2], ,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2435 [CXXFLAGS="$CXXFLAGS $1"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2436 AC_MSG_RESULT([adding $1 to CXXFLAGS])], [$2])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2437 else
15319 daf74ce2afdc m4/acinclude.m4: Use more consistent m4 quoting of arguments to macros. Rik <rik@octave.org> parents: 15302 diff changeset	2438 AC_MSG_RESULT([no])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2439 ifelse([$3], , , [$3])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2440 fi
10471 bcabc1c4f20c Add detection of OpenMP support to configure. Disabled by default David Bateman <dbateman@free.fr> parents: 10380 diff changeset	2441 ])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2442 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2443 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	2444 dnl readline.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2445 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2446 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	2447 USE_READLINE=yes
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2448 READLINE_LIBS=
15319 daf74ce2afdc m4/acinclude.m4: Use more consistent m4 quoting of arguments to macros. Rik <rik@octave.org> parents: 15302 diff changeset	2449 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	2450 [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	2451 [do not use readline library])],
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2452 [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	2453 USE_READLINE=no
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2454 warn_readline="command editing and history features require GNU Readline"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2455 fi])
16068 b309a5da17f5 use yes/no instead of true/false in confgure scripts John W. Eaton <jwe@octave.org> parents: 16012 diff changeset	2456 if test $USE_READLINE = yes; then
15302 a8cfbc1911e4 build: Set TERM_LIBS before checking for READLINE. Rik <rik@octave.org> parents: 15295 diff changeset	2457 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	2458 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	2459 ac_octave_save_LIBS="$LIBS"
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2460 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	2461 AC_CHECK_LIB([readline], [rl_set_keyboard_input_timeout],
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2462 [READLINE_LIBS="-lreadline"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2463 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	2464 ],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2465 [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	2466 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	2467 ])
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	2468 LIBS="$ac_octave_save_LIBS"
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2469 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2470 AC_SUBST(READLINE_LIBS)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2471 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2472 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2473 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	2474 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	2475 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	2476 dnl the flag.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2477 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2478 AC_DEFUN([OCTAVE_F77_FLAG], [
17661 1978a6c76aa9 Use user-specified SED during build process (bug #40273). Rik <rik@octave.org> parents: 17615 diff changeset	2479 ac_safe=`echo "$1" \| $SED 'y%./+-:=%__p___%'`
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2480 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	2481 AC_CACHE_VAL([octave_cv_f77_flag_$ac_safe], [
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2482 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	2483 ac_octave_save_FFLAGS="$FFLAGS"
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2484 FFLAGS="$FFLAGS $1"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2485 AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2486 eval "octave_cv_f77_flag_$ac_safe=yes",
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2487 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	2488 FFLAGS="$ac_octave_save_FFLAGS"
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2489 AC_LANG_POP(Fortran 77)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2490 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2491 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	2492 AC_MSG_RESULT([yes])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2493 ifelse([$2], ,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2494 [FFLAGS="$FFLAGS $1"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2495 AC_MSG_RESULT([adding $1 to FFLAGS])], [$2])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2496 else
15319 daf74ce2afdc m4/acinclude.m4: Use more consistent m4 quoting of arguments to macros. Rik <rik@octave.org> parents: 15302 diff changeset	2497 AC_MSG_RESULT([no])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2498 ifelse([$3], , , [$3])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2499 fi
10471 bcabc1c4f20c Add detection of OpenMP support to configure. Disabled by default David Bateman <dbateman@free.fr> parents: 10380 diff changeset	2500 ])
bcabc1c4f20c Add detection of OpenMP support to configure. Disabled by default David Bateman <dbateman@free.fr> parents: 10380 diff changeset	2501 dnl
8595 dee5d60257e4 Use Carbon framework to determine ScreenSize on Mac. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8169 diff changeset	2502 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	2503 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	2504 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	2505 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	2506 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	2507 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	2508 dnl
9654 a307a6f77fb3 aclocal.m4: consistently quote first arg to AC_DEFUN John W. Eaton <jwe@octave.org> parents: 9645 diff changeset	2509 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	2510 AC_MSG_CHECKING([whether ${LD-ld} accepts -framework $1])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2511 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	2512 [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	2513 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	2514 AC_LANG_PUSH(C++)
8595 dee5d60257e4 Use Carbon framework to determine ScreenSize on Mac. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8169 diff changeset	2515 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	2516 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	2517 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	2518 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	2519 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	2520 ])
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	2521 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	2522 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	2523 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	2524 [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	2525 [don't use framework $1])],
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2526 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	2527 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	2528 [$4]
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	2529 :
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	2530 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	2531 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	2532 [$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	2533 fi
8595 dee5d60257e4 Use Carbon framework to determine ScreenSize on Mac. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8169 diff changeset	2534 else
15319 daf74ce2afdc m4/acinclude.m4: Use more consistent m4 quoting of arguments to macros. Rik <rik@octave.org> parents: 15302 diff changeset	2535 AC_MSG_RESULT([no])
8595 dee5d60257e4 Use Carbon framework to determine ScreenSize on Mac. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8169 diff changeset	2536 [$5]
dee5d60257e4 Use Carbon framework to determine ScreenSize on Mac. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8169 diff changeset	2537 fi
dee5d60257e4 Use Carbon framework to determine ScreenSize on Mac. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8169 diff changeset	2538 ])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2539 dnl
24823 53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	2540 dnl Check whether the Qt class QGuiApplication exists.
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	2541 dnl This class was introduced in Qt 5.0.
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	2542 dnl
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	2543 dnl FIXME: Delete this entirely when we drop support for Qt 4.
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	2544 dnl
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	2545 AC_DEFUN([OCTAVE_HAVE_QGUIAPPLICATION], [
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	2546 AC_CACHE_CHECK([for QGuiApplication],
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	2547 [octave_cv_decl_qguiapplication],
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	2548 [AC_LANG_PUSH(C++)
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	2549 ac_octave_save_CPPFLAGS="$CPPFLAGS"
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	2550 ac_octave_save_CXXFLAGS="$CXXFLAGS"
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	2551 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	2552 CXXFLAGS="$CXXPICFLAG $CXXFLAGS"
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	2553 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	2554 #include <QGuiApplication>
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	2555 ]], [[
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	2556 QScreen *pscreen = QGuiApplication::primaryScreen ();
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	2557 ]])],
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	2558 octave_cv_decl_qguiapplication=yes,
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	2559 octave_cv_decl_qguiapplication=no)
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	2560 CPPFLAGS="$ac_octave_save_CPPFLAGS"
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	2561 CXXFLAGS="$ac_octave_save_CXXFLAGS"
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	2562 AC_LANG_POP(C++)
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	2563 ])
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	2564 if test $octave_cv_decl_qguiapplication = yes; then
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	2565 AC_DEFINE(HAVE_QGUIAPPLICATION, 1,
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	2566 [Define to 1 if `QGuiApplication' class is available.])
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	2567 fi
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	2568 ])
53f68d0fb122 acinclude.m4: Keep macros in alphabetical order. Rik <rik@octave.org> parents: 24821 diff changeset	2569 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2570 dnl Check for IEEE 754 data format.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2571 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2572 AC_DEFUN([OCTAVE_IEEE754_DATA_FORMAT], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2573 AC_MSG_CHECKING([for IEEE 754 data format])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2574 AC_CACHE_VAL([octave_cv_ieee754_data_format],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2575 [AC_RUN_IFELSE([AC_LANG_SOURCE([[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2576 int
17034 8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	2577 main (void)
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2578 {
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2579 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	2580
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2581 ieeebytes l = {0x1c, 0xbc, 0x6e, 0xf2, 0x54, 0x8b, 0x11, 0x43};
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2582 ieeebytes b = {0x43, 0x11, 0x8b, 0x54, 0xf2, 0x6e, 0xbc, 0x1c};
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2583
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2584 return l.d != 1234567891234567.0 && b.d != 1234567891234567.0;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2585 }
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2586 ]])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2587 octave_cv_ieee754_data_format=yes,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2588 octave_cv_ieee754_data_format=no,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2589 octave_cv_ieee754_data_format=yes)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2590 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2591 if test "$cross_compiling" = yes; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2592 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	2593 else
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2594 AC_MSG_RESULT([$octave_cv_ieee754_data_format])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2595 fi
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	2596 if test $octave_cv_ieee754_data_format = yes; then
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2597 AC_DEFINE(HAVE_IEEE754_DATA_FORMAT, 1,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2598 [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	2599 else
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2600 ## 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	2601 ## useful system, so we will abort here. Anyone wishing to
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2602 ## experiment with building Octave on a system without IEEE
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2603 ## floating point should be capable of removing this check and
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2604 ## 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	2605 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	2606 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2607 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	2608 dnl
17034 8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	2609 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	2610 dnl
8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	2611 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	2612 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	2613 [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	2614 [AC_LANG_PUSH(C++)
8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	2615 AC_COMPILE_IFELSE(
17615 3a7d5d655749 Fix typos in configure tests for LLVM methods (bug #39973) Mike Miller <mtmiller@ieee.org> parents: 17241 diff changeset	2616 [AC_LANG_PROGRAM([[
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21604 diff changeset	2617 #if defined (HAVE_LLVM_IR_FUNCTION_H)
17164 36fd98b9ce48 Add support for llvm 3.3 Max Brister <max@2bass.com> parents: 17111 diff changeset	2618 #include <llvm/IR/Instructions.h>
36fd98b9ce48 Add support for llvm 3.3 Max Brister <max@2bass.com> parents: 17111 diff changeset	2619 #include <llvm/IR/Attributes.h>
36fd98b9ce48 Add support for llvm 3.3 Max Brister <max@2bass.com> parents: 17111 diff changeset	2620 #else
17034 8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	2621 #include <llvm/Instructions.h>
8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	2622 #include <llvm/Attributes.h>
17164 36fd98b9ce48 Add support for llvm 3.3 Max Brister <max@2bass.com> parents: 17111 diff changeset	2623 #endif
17615 3a7d5d655749 Fix typos in configure tests for LLVM methods (bug #39973) Mike Miller <mtmiller@ieee.org> parents: 17241 diff changeset	2624 ]], [[
17034 8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	2625 llvm::CallInst *callinst;
8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	2626 llvm::AttrBuilder attr_builder;
8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	2627 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	2628 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	2629 callinst->addAttribute (1, attrs);
8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	2630 ]])],
8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	2631 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	2632 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	2633 AC_LANG_POP(C++)
8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	2634 ])
8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	2635 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	2636 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	2637 [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	2638 fi
8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	2639 ])
8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	2640 dnl
8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	2641 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	2642 dnl
8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	2643 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	2644 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	2645 [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	2646 [AC_LANG_PUSH(C++)
8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	2647 AC_COMPILE_IFELSE(
8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	2648 [AC_LANG_PROGRAM([[
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21604 diff changeset	2649 #if defined (HAVE_LLVM_IR_FUNCTION_H)
17164 36fd98b9ce48 Add support for llvm 3.3 Max Brister <max@2bass.com> parents: 17111 diff changeset	2650 #include <llvm/IR/Function.h>
36fd98b9ce48 Add support for llvm 3.3 Max Brister <max@2bass.com> parents: 17111 diff changeset	2651 #include <llvm/IR/Attributes.h>
36fd98b9ce48 Add support for llvm 3.3 Max Brister <max@2bass.com> parents: 17111 diff changeset	2652 #include <llvm/IR/LLVMContext.h>
36fd98b9ce48 Add support for llvm 3.3 Max Brister <max@2bass.com> parents: 17111 diff changeset	2653 #else
17034 8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	2654 #include <llvm/Function.h>
8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	2655 #include <llvm/Attributes.h>
8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	2656 #include <llvm/LLVMContext.h>
17164 36fd98b9ce48 Add support for llvm 3.3 Max Brister <max@2bass.com> parents: 17111 diff changeset	2657 #endif
17034 8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	2658 ]], [[
8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	2659 llvm::Function *llvm_function;
8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	2660 llvm::AttrBuilder attr_builder;
8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	2661 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	2662 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	2663 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	2664 ]])],
8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	2665 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	2666 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	2667 AC_LANG_POP(C++)
8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	2668 ])
8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	2669 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	2670 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	2671 [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	2672 fi
8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	2673 ])
8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	2674 dnl
8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	2675 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	2676 dnl
8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	2677 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	2678 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	2679 [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	2680 [AC_LANG_PUSH(C++)
8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	2681 AC_COMPILE_IFELSE(
8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	2682 [AC_LANG_PROGRAM([[
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21604 diff changeset	2683 #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	2684 #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	2685 #include <llvm/IR/Attributes.h>
17164 36fd98b9ce48 Add support for llvm 3.3 Max Brister <max@2bass.com> parents: 17111 diff changeset	2686 #else
36fd98b9ce48 Add support for llvm 3.3 Max Brister <max@2bass.com> parents: 17111 diff changeset	2687 #include <llvm/Function.h>
36fd98b9ce48 Add support for llvm 3.3 Max Brister <max@2bass.com> parents: 17111 diff changeset	2688 #include <llvm/Attributes.h>
36fd98b9ce48 Add support for llvm 3.3 Max Brister <max@2bass.com> parents: 17111 diff changeset	2689 #endif
17034 8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	2690 ]], [[
8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	2691 llvm::Function *llvm_function;
8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	2692 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	2693 ]])],
8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	2694 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	2695 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	2696 AC_LANG_POP(C++)
8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	2697 ])
8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	2698 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	2699 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	2700 [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	2701 fi
8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	2702 ])
8d84dc5f5b5d acinclude.m4: Use m4 quote '[' rather than '"' in AC_MSG_ERROR. Rik <rik@octave.org> parents: 17031 diff changeset	2703 dnl
18831 4a4edf0f2077 fix LLVM 3.4 build (bug #41061) Stefan Mahr <dac922@gmx.de> parents: 18216 diff changeset	2704 dnl Check for legacy::PassManager API
4a4edf0f2077 fix LLVM 3.4 build (bug #41061) Stefan Mahr <dac922@gmx.de> parents: 18216 diff changeset	2705 dnl
4a4edf0f2077 fix LLVM 3.4 build (bug #41061) Stefan Mahr <dac922@gmx.de> parents: 18216 diff changeset	2706 AC_DEFUN([OCTAVE_LLVM_LEGACY_PASSMANAGER_API], [
4a4edf0f2077 fix LLVM 3.4 build (bug #41061) Stefan Mahr <dac922@gmx.de> parents: 18216 diff changeset	2707 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	2708 [octave_cv_legacy_passmanager],
4a4edf0f2077 fix LLVM 3.4 build (bug #41061) Stefan Mahr <dac922@gmx.de> parents: 18216 diff changeset	2709 [AC_LANG_PUSH(C++)
4a4edf0f2077 fix LLVM 3.4 build (bug #41061) Stefan Mahr <dac922@gmx.de> parents: 18216 diff changeset	2710 save_LIBS="$LIBS"
4a4edf0f2077 fix LLVM 3.4 build (bug #41061) Stefan Mahr <dac922@gmx.de> parents: 18216 diff changeset	2711 LIBS="$LLVM_LIBS $LIBS"
4a4edf0f2077 fix LLVM 3.4 build (bug #41061) Stefan Mahr <dac922@gmx.de> parents: 18216 diff changeset	2712 AC_LINK_IFELSE(
4a4edf0f2077 fix LLVM 3.4 build (bug #41061) Stefan Mahr <dac922@gmx.de> parents: 18216 diff changeset	2713 [AC_LANG_PROGRAM([[
4a4edf0f2077 fix LLVM 3.4 build (bug #41061) Stefan Mahr <dac922@gmx.de> parents: 18216 diff changeset	2714 #include <llvm/IR/LegacyPassManager.h>
4a4edf0f2077 fix LLVM 3.4 build (bug #41061) Stefan Mahr <dac922@gmx.de> parents: 18216 diff changeset	2715 ]], [[
4a4edf0f2077 fix LLVM 3.4 build (bug #41061) Stefan Mahr <dac922@gmx.de> parents: 18216 diff changeset	2716 llvm::Module *module;
4a4edf0f2077 fix LLVM 3.4 build (bug #41061) Stefan Mahr <dac922@gmx.de> parents: 18216 diff changeset	2717 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	2718 llvm::legacy::FunctionPassManager *pass_manager;
18831 4a4edf0f2077 fix LLVM 3.4 build (bug #41061) Stefan Mahr <dac922@gmx.de> parents: 18216 diff changeset	2719 module_pass_manager = new llvm::legacy::PassManager ();
4a4edf0f2077 fix LLVM 3.4 build (bug #41061) Stefan Mahr <dac922@gmx.de> parents: 18216 diff changeset	2720 pass_manager = new llvm::legacy::FunctionPassManager (module);
4a4edf0f2077 fix LLVM 3.4 build (bug #41061) Stefan Mahr <dac922@gmx.de> parents: 18216 diff changeset	2721 ]])],
4a4edf0f2077 fix LLVM 3.4 build (bug #41061) Stefan Mahr <dac922@gmx.de> parents: 18216 diff changeset	2722 octave_cv_legacy_passmanager=yes,
4a4edf0f2077 fix LLVM 3.4 build (bug #41061) Stefan Mahr <dac922@gmx.de> parents: 18216 diff changeset	2723 octave_cv_legacy_passmanager=no)
4a4edf0f2077 fix LLVM 3.4 build (bug #41061) Stefan Mahr <dac922@gmx.de> parents: 18216 diff changeset	2724 LIBS="$save_LIBS"
4a4edf0f2077 fix LLVM 3.4 build (bug #41061) Stefan Mahr <dac922@gmx.de> parents: 18216 diff changeset	2725 AC_LANG_POP(C++)
4a4edf0f2077 fix LLVM 3.4 build (bug #41061) Stefan Mahr <dac922@gmx.de> parents: 18216 diff changeset	2726 ])
4a4edf0f2077 fix LLVM 3.4 build (bug #41061) Stefan Mahr <dac922@gmx.de> parents: 18216 diff changeset	2727 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	2728 AC_DEFINE(LEGACY_PASSMANAGER, 1,
4a4edf0f2077 fix LLVM 3.4 build (bug #41061) Stefan Mahr <dac922@gmx.de> parents: 18216 diff changeset	2729 [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	2730 fi
4a4edf0f2077 fix LLVM 3.4 build (bug #41061) Stefan Mahr <dac922@gmx.de> parents: 18216 diff changeset	2731 ])
4a4edf0f2077 fix LLVM 3.4 build (bug #41061) Stefan Mahr <dac922@gmx.de> parents: 18216 diff changeset	2732 dnl
23510 b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	2733 dnl Check for raw_fd_ostream API
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	2734 dnl
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	2735 AC_DEFUN([OCTAVE_LLVM_RAW_FD_OSTREAM_API], [
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	2736 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	2737 [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	2738 [AC_LANG_PUSH(C++)
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	2739 AC_COMPILE_IFELSE(
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	2740 [AC_LANG_PROGRAM([[
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	2741 #include <llvm/Support/raw_os_ostream.h>
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	2742 ]], [[
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	2743 std::string str;
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	2744 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	2745 ]])],
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	2746 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	2747 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	2748 AC_LANG_POP(C++)
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	2749 ])
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	2750 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	2751 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	2752 [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	2753 fi
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	2754 ])
b0e23bfa9966 maint: sort Octave m4 macro definitions Mike Miller <mtmiller@octave.org> parents: 23509 diff changeset	2755 dnl
25559 4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2756 dnl OCTAVE_CHECK_FORTRAN_SYMBOL_AND_CALLING_CONVENTIONS
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2757 dnl
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2758 dnl Set variables related to Fortran symbol names (append underscore,
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2759 dnl use uppercase names, etc.) and calling convention (mostly used for
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2760 dnl determining how character strings are passed).
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2761 dnl
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2762 AC_DEFUN([OCTAVE_CHECK_FORTRAN_SYMBOL_AND_CALLING_CONVENTIONS], [
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2763 F77_TOLOWER=yes
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2764 F77_APPEND_UNDERSCORE=yes
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2765 F77_APPEND_EXTRA_UNDERSCORE=yes
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2766
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2767 case $ac_cv_f77_mangling in
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2768 "upper case") F77_TOLOWER=no ;;
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2769 esac
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2770 case $ac_cv_f77_mangling in
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2771 "no underscore") F77_APPEND_UNDERSCORE=no ;;
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2772 esac
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2773 case $ac_cv_f77_mangling in
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2774 "no extra underscore") F77_APPEND_EXTRA_UNDERSCORE=no ;;
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2775 esac
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2776
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2777 case $canonical_host_type in
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2778 i[[3456789]]86--)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2779 if test $ac_cv_f77_compiler_gnu = yes; then
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2780 OCTAVE_F77_FLAG([-mieee-fp])
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2781 fi
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2782 ;;
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2783 alpha--*)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2784 if test $ac_cv_f77_compiler_gnu = yes; then
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2785 OCTAVE_F77_FLAG([-mieee])
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2786 else
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2787 OCTAVE_F77_FLAG([-ieee])
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2788 OCTAVE_F77_FLAG([-fpe1])
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2789 fi
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2790 ;;
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2791 powerpc-apple-machten*)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2792 FFLAGS=
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2793 ;;
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2794 esac
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2795
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2796 if test $ac_cv_f77_compiler_gnu = yes; then
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2797 FORTRAN_CALLING_CONVENTION=gfortran
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2798 else
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2799 FORTRAN_CALLING_CONVENTION=unknown
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2800 fi
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2801 AC_ARG_ENABLE([fortran-calling-convention],
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2802 [AS_HELP_STRING([--enable-fortran-calling-convention=OPTION],
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2803 [Select C++ to Fortran calling convention. "gfortran" should be detected automatically. Other options are "cray", "visual-fortran", or "f2c".])],
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2804 [FORTRAN_CALLING_CONVENTION="$enableval"], [])
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2805
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2806 case $FORTRAN_CALLING_CONVENTION in
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2807 gfortran)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2808 AC_DEFINE(F77_USES_GFORTRAN_CALLING_CONVENTION, 1, [Define to 1 if calling Fortran from C++ should use the gfortran calling convention.])
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2809 ;;
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2810 cray)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2811 AC_DEFINE(F77_USES_CRAY_CALLING_CONVENTION, 1, [Define to 1 if calling Fortran from C++ should use the Cray Fortran calling convention.])
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2812 ;;
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2813 visual-fortran)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2814 AC_DEFINE(F77_USES_VISUAL_FORTRAN_CALLING_CONVENTION, 1, [Define to 1 if calling Fortran from C++ should use the Visual Fortran calling convention.])
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2815 ;;
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2816 f2c)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2817 AC_DEFINE(F77_USES_F2C_CALLING_CONVENTION, 1, [Define to 1 if calling Fortran from C++ should use the f2c calling convention.])
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2818 ;;
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2819 *)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2820 AC_MSG_ERROR([to build Octave, the C++ to Fortran calling convention must be known.])
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2821 ;;
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2822 esac
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2823
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2824 if test -n "$FFLAGS"; then
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2825 AC_MSG_NOTICE([defining FFLAGS to be $FFLAGS])
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2826 fi
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2827
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2828 AC_SUBST(F77_TOLOWER)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2829 AC_SUBST(F77_APPEND_UNDERSCORE)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2830 AC_SUBST(F77_APPEND_EXTRA_UNDERSCORE)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2831 ])
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2832 dnl
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2833 dnl OCTAVE_DEFINE_MKOCTFILE_DYNAMIC_LINK_OPTIONS
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2834 dnl
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2835 dnl Requires the following variables to already be set:
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2836 dnl
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2837 dnl AR
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2838 dnl CFLAGS
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2839 dnl CXX
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2840 dnl CXXFLAGS
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2841 dnl EXEEXT
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2842 dnl GCC
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2843 dnl GREP
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2844 dnl GXX
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2845 dnl LDFLAGS
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2846 dnl ac_cv_f77_compiler_gnu
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2847 dnl ac_top_build_prefix
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2848 dnl canonical_host_type
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2849 dnl have_msvc
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2850 dnl
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2851 AC_DEFUN_ONCE([OCTAVE_DEFINE_MKOCTFILE_DYNAMIC_LINK_OPTIONS], [
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2852 ### Set system-dependent options for building shared libraries.
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2853 ### These are used by mkoctfile to create dynamically loadable
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2854 ### .oct and .mex files. It would be great if we could somehow
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2855 ### use libtool to get this information.
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2856
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2857 CPICFLAG=-fPIC
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2858 CXXPICFLAG=-fPIC
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2859 FPICFLAG=-fPIC
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2860 SH_LD="${CXX}"
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2861 SH_LDFLAGS=-shared
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2862 DL_LD="${SH_LD}"
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2863 DL_LDFLAGS="${SH_LDFLAGS}"
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2864 MKOCTFILE_DL_LDFLAGS="${DL_LDFLAGS}"
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2865 NO_OCT_FILE_STRIP=false
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2866 TEMPLATE_AR="${AR}"
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2867 TEMPLATE_ARFLAGS="${ARFLAGS}"
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2868 EXTERNAL_DLL_DEFS=
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2869 OCTAVE_DLL_DEFS=
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2870 OCTINTERP_DLL_DEFS=
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2871 OCTGUI_DLL_DEFS=
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2872 OCTGRAPHICS_DLL_DEFS=
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2873 library_path_var=LD_LIBRARY_PATH
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2874 ldpreloadsep=" "
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2875 case $canonical_host_type in
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2876 --386bsd* \| --netbsd*)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2877 SH_LD=ld
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2878 SH_LDFLAGS=-Bshareable
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2879 ;;
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2880 --openbsd*)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2881 SH_LDFLAGS="-shared -fPIC"
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2882 ;;
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2883 --freebsd*)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2884 SH_LDFLAGS="-shared -Wl,-x"
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2885 ;;
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2886 alpha-dec-osf)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2887 CPICFLAG=
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2888 CXXPICFLAG=
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2889 FPICFLAG=
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2890 SH_LDFLAGS="-shared -Wl,-expect_unresolved -Wl,'*'"
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2891 ;;
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2892 --darwin*)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2893 DL_LDFLAGS="-bundle -bundle_loader ${ac_top_build_prefix}libinterp/octave ${LDFLAGS}"
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2894 dnl Contains variables that are defined and undefined at this point, so use
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2895 dnl appropriate quoting to defer expansion of ${bindir} and ${version}.
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2896 MKOCTFILE_DL_LDFLAGS='-bundle -bundle_loader ${bindir}/octave-${version}'"${EXEEXT}"
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2897 SH_LDFLAGS="-dynamiclib -single_module ${LDFLAGS}"
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2898 case $canonical_host_type in
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2899 powerpc-*)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2900 CXXPICFLAG=
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2901 CPICFLAG=
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2902 FPICFLAG=
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2903 ;;
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2904 esac
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2905 NO_OCT_FILE_STRIP=true
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2906 library_path_var=DYLD_LIBRARY_PATH
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2907 ;;
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2908 --cygwin*)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2909 CPICFLAG=
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2910 CXXPICFLAG=
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2911 FPICFLAG=
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2912 DL_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc"
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2913 SH_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-auto-image-base"
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2914 ldpreloadsep=":"
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2915 ;;
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2916 --mingw*)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2917 if test $have_msvc = yes; then
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2918 DL_LDFLAGS="-shared"
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2919 CPICFLAG=
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2920 CXXPICFLAG=
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2921 FPICFLAG=
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2922 SH_LDFLAGS="-shared"
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2923 if test -n "`echo $CFLAGS \| $GREP -e '-g'`" \|\| test -n "`echo $CXXFLAGS \| $GREP -e '-g'`"; then
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2924 DL_LDFLAGS="$DL_LDFLAGS -g"
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2925 SH_LDFLAGS="$SH_LDFLAGS -g"
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2926 fi
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2927 NO_OCT_FILE_STRIP=true
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2928 library_path_var=PATH
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2929 ## Extra compilation flags.
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2930 EXTERNAL_DLL_DEFS="-DEXTERNAL_DLL"
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2931 OCTAVE_DLL_DEFS="-DOCTAVE_DLL"
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2932 OCTINTERP_DLL_DEFS="-DOCTINTERP_DLL"
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2933 OCTGUI_DLL_DEFS="-DOCTGUI_DLL"
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2934 OCTGRAPHICS_DLL_DEFS="-DOCTGRAPHICS_DLL"
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2935 else
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2936 CPICFLAG=
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2937 CXXPICFLAG=
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2938 FPICFLAG=
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2939 DL_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc"
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2940 SH_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-auto-image-base"
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2941 library_path_var=PATH
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2942 fi
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2943 ;;
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2944 --msdosmsvc)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2945 DL_LDFLAGS="-shared"
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2946 CPICFLAG=
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2947 CXXPICFLAG=
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2948 FPICFLAG=
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2949 SH_LDFLAGS="-shared"
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2950 if test -n "`echo $CFLAGS \| $GREP -e '-g'`" \|\| test -n "`echo $CXXFLAGS \| $GREP -e '-g'`"; then
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2951 DL_LDFLAGS="$DL_LDFLAGS -g"
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2952 SH_LDFLAGS="$SH_LDFLAGS -g"
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2953 fi
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2954 NO_OCT_FILE_STRIP=true
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2955 library_path_var=PATH
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2956 ## Extra compilation flags.
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2957 EXTERNAL_DLL_DEFS="-DEXTERNAL_DLL"
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2958 OCTAVE_DLL_DEFS="-DOCTAVE_DLL"
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2959 OCTGUI_DLL_DEFS="-DOCTGUI_DLL"
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2960 OCTGRAPHICS_DLL_DEFS="-DOCTGRAPHICS_DLL"
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2961 ;;
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2962 --linux* \| --gnu*)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2963 MKOCTFILE_DL_LDFLAGS="-shared -Wl,-Bsymbolic"
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2964 ;;
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2965 i[[3456]]86--sco3.2v5)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2966 SH_LDFLAGS=-G
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2967 ;;
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2968 rs6000-ibm-aix* \| powerpc-ibm-aix*)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2969 CPICFLAG=
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2970 CXXPICFLAG=
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2971 FPICFLAG=
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2972 library_path_var=LIBPATH
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2973 ;;
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2974 hppa-hp-hpux)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2975 if test $ac_cv_f77_compiler_gnu = yes; then
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2976 FPICFLAG=-fPIC
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2977 else
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2978 FPICFLAG=+Z
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2979 fi
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2980 SH_LDFLAGS="-shared -fPIC"
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2981 library_path_var=SHLIB_PATH
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2982 ;;
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2983 ia64-hp-hpux)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2984 if test $ac_cv_f77_compiler_gnu = yes; then
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2985 FPICFLAG=-fPIC
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2986 else
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2987 FPICFLAG=+Z
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2988 fi
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2989 SH_LDFLAGS="-shared -fPIC"
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2990 ;;
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2991 -sgi-)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2992 CPICFLAG=
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2993 CXXPICFLAG=
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2994 FPICFLAG=
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2995 ;;
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2996 sparc-sun-sunos4*)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2997 if test $ac_cv_f77_compiler_gnu = yes; then
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2998 FPICFLAG=-fPIC
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	2999 else
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3000 FPICFLAG=-PIC
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3001 fi
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3002 SH_LD=ld
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3003 SH_LDFLAGS="-assert nodefinitions"
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3004 ;;
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3005 sparc-sun-solaris2* \| i386-pc-solaris2*)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3006 if test $ac_cv_f77_compiler_gnu = yes; then
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3007 FPICFLAG=-fPIC
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3008 else
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3009 FPICFLAG=-KPIC
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3010 fi
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3011 if test "$GCC" = yes; then
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3012 CPICFLAG=-fPIC
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3013 else
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3014 CPICFLAG=-KPIC
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3015 fi
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3016 if test "$GXX" = yes; then
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3017 CXXPICFLAG=-fPIC
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3018 SH_LDFLAGS=-shared
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3019 else
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3020 CXXPICFLAG=-KPIC
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3021 SH_LDFLAGS=-G
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3022 fi
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3023 ## Template closures in archive libraries need a different mechanism.
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3024 if test "$GXX" != yes; then
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3025 TEMPLATE_AR="${CXX}"
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3026 TEMPLATE_ARFLAGS="-xar -o"
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3027 fi
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3028 ;;
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3029 esac
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3030
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3031 AC_MSG_NOTICE([defining FPICFLAG to be $FPICFLAG])
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3032 AC_MSG_NOTICE([defining CPICFLAG to be $CPICFLAG])
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3033 AC_MSG_NOTICE([defining CXXPICFLAG to be $CXXPICFLAG])
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3034 AC_MSG_NOTICE([defining SH_LD to be $SH_LD])
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3035 AC_MSG_NOTICE([defining SH_LDFLAGS to be $SH_LDFLAGS])
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3036 AC_MSG_NOTICE([defining DL_LD to be $DL_LD])
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3037 AC_MSG_NOTICE([defining DL_LDFLAGS to be $DL_LDFLAGS])
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3038 AC_MSG_NOTICE([defining MKOCTFILE_DL_LDFLAGS to be $MKOCTFILE_DL_LDFLAGS])
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3039 AC_MSG_NOTICE([defining NO_OCT_FILE_STRIP to be $NO_OCT_FILE_STRIP])
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3040 AC_MSG_NOTICE([defining TEMPLATE_AR to be $TEMPLATE_AR])
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3041 AC_MSG_NOTICE([defining TEMPLATE_ARFLAGS to be $TEMPLATE_ARFLAGS])
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3042 AC_MSG_NOTICE([defining EXTERNAL_DLL_DEFS to be $EXTERNAL_DLL_DEFS])
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3043 AC_MSG_NOTICE([defining OCTAVE_DLL_DEFS to be $OCTAVE_DLL_DEFS])
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3044 AC_MSG_NOTICE([defining OCTINTERP_DLL_DEFS to be $OCTINTERP_DLL_DEFS])
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3045 AC_MSG_NOTICE([defining OCTGUI_DLL_DEFS to be $OCTGUI_DLL_DEFS])
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3046 AC_MSG_NOTICE([defining OCTGRAPHICS_DLL_DEFS to be $OCTGRAPHICS_DLL_DEFS])
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3047 AC_MSG_NOTICE([defining library_path_var to be $library_path_var])
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3048 AC_SUBST(FPICFLAG)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3049 AC_SUBST(CPICFLAG)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3050 AC_SUBST(CXXPICFLAG)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3051 AC_SUBST(SH_LD)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3052 AC_SUBST(SH_LDFLAGS)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3053 AC_SUBST(DL_LD)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3054 AC_SUBST(DL_LDFLAGS)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3055 AC_SUBST(MKOCTFILE_DL_LDFLAGS)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3056 AC_SUBST(NO_OCT_FILE_STRIP)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3057 AC_SUBST(TEMPLATE_AR)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3058 AC_SUBST(TEMPLATE_ARFLAGS)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3059 AC_SUBST(EXTERNAL_DLL_DEFS)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3060 AC_SUBST(OCTAVE_DLL_DEFS)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3061 AC_SUBST(OCTINTERP_DLL_DEFS)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3062 AC_SUBST(OCTGUI_DLL_DEFS)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3063 AC_SUBST(OCTGRAPHICS_DLL_DEFS)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3064 AC_SUBST(library_path_var)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3065 AC_SUBST(ldpreloadsep)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3066 AM_SUBST_NOTMAKE(ldpreloadsep)
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3067 ])
4fe32753cb56 move some fortran and dynamic linking configure checks to separate macros John W. Eaton <jwe@octave.org> parents: 25310 diff changeset	3068 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3069 dnl Check for ar.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3070 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3071 AC_DEFUN([OCTAVE_PROG_AR], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3072 if test -z "$AR"; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3073 AR=ar
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3074 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3075 AC_SUBST(AR)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3076
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3077 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	3078 ARFLAGS="cr"
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3079 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3080 AC_SUBST(ARFLAGS)
23400 b5ee9b985a82 Silence compile warning about 'u' modifier to ar. Rik <rik@octave.org> parents: 23329 diff changeset	3081
23402 1fadf480a63b maint: tweak ARFLAGS and AR_FLAGS defaults and comments Mike Miller <mtmiller@octave.org> parents: 23400 diff changeset	3082 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	3083 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	3084 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	3085 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	3086 AR_FLAGS="$ARFLAGS"
23400 b5ee9b985a82 Silence compile warning about 'u' modifier to ar. Rik <rik@octave.org> parents: 23329 diff changeset	3087 fi
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3088 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3089 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3090 dnl Check for bison.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3091 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3092 AC_DEFUN([OCTAVE_PROG_BISON], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3093 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	3094
0fabe0f49f38 use better method to determine whether we are using flex and bison John W. Eaton <jwe@octave.org> parents: 16733 diff changeset	3095 case "`$YACC --version`" in
17197 fbee0d312af5 acinclude.m4: Remove some unnecessary double quotes around variables. Rik <rik@octave.org> parents: 17196 diff changeset	3096 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	3097 *) 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	3098 esac
0fabe0f49f38 use better method to determine whether we are using flex and bison John W. Eaton <jwe@octave.org> parents: 16733 diff changeset	3099
17197 fbee0d312af5 acinclude.m4: Remove some unnecessary double quotes around variables. Rik <rik@octave.org> parents: 17196 diff changeset	3100 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	3101 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	3102 [octave_cv_bison_api_prefix_decl_style], [
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18973 diff changeset	3103 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	3104 quote="quote brace"
18974 d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18973 diff changeset	3105 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	3106 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	3107 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	3108 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	3109 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	3110 else
6b4dfb1e5afb allow building with old versions of bison again (bug #43023) John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	3111 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	3112 fi
6b4dfb1e5afb allow building with old versions of bison again (bug #43023) John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	3113 else
6b4dfb1e5afb allow building with old versions of bison again (bug #43023) John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	3114 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	3115 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	3116 else
6b4dfb1e5afb allow building with old versions of bison again (bug #43023) John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	3117 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	3118 fi
6b4dfb1e5afb allow building with old versions of bison again (bug #43023) John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	3119 fi
6b4dfb1e5afb allow building with old versions of bison again (bug #43023) John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	3120 cat << EOF > conftest.yy
18974 d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18973 diff changeset	3121 $def
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18973 diff changeset	3122 %start input
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18973 diff changeset	3123 %%
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18973 diff changeset	3124 input:;
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18973 diff changeset	3125 %%
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18973 diff changeset	3126 EOF
19105 6b4dfb1e5afb allow building with old versions of bison again (bug #43023) John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	3127 ## 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	3128 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	3129 ac_status=$?
6b4dfb1e5afb allow building with old versions of bison again (bug #43023) John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	3130 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	3131 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	3132 break
6b4dfb1e5afb allow building with old versions of bison again (bug #43023) John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	3133 fi
6b4dfb1e5afb allow building with old versions of bison again (bug #43023) John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	3134 done
6b4dfb1e5afb allow building with old versions of bison again (bug #43023) John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	3135 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	3136 break
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18973 diff changeset	3137 fi
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18973 diff changeset	3138 done
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18973 diff changeset	3139 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	3140 ])
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18973 diff changeset	3141 fi
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18973 diff changeset	3142
25637 e1c3d1c6e896 don't substitute api.prefix style in bison input files John W. Eaton <jwe@octave.org> parents: 25559 diff changeset	3143 if test -z "$octave_cv_bison_api_prefix_decl_style" \
e1c3d1c6e896 don't substitute api.prefix style in bison input files John W. Eaton <jwe@octave.org> parents: 25559 diff changeset	3144 \|\| test "$octave_cv_bison_api_prefix_decl_style" != "api brace"; then
19105 6b4dfb1e5afb allow building with old versions of bison again (bug #43023) John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	3145 tmp_have_bison=no
18974 d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18973 diff changeset	3146 warn_bison_api_prefix_decl_style="
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18973 diff changeset	3147
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18973 diff changeset	3148 I wasn't able to find a suitable style for declaring the api prefix
25637 e1c3d1c6e896 don't substitute api.prefix style in bison input files John W. Eaton <jwe@octave.org> parents: 25559 diff changeset	3149 in a bison input file so I'm disabling bison. We expect bison to
e1c3d1c6e896 don't substitute api.prefix style in bison input files John W. Eaton <jwe@octave.org> parents: 25559 diff changeset	3150 understand the '%define api.prefix { PREFIX }' syntax.
18974 d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18973 diff changeset	3151 "
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18973 diff changeset	3152 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	3153 fi
d8abf813c69f handle changes in bison 3.x John W. Eaton <jwe@octave.org> parents: 18973 diff changeset	3154
17197 fbee0d312af5 acinclude.m4: Remove some unnecessary double quotes around variables. Rik <rik@octave.org> parents: 17196 diff changeset	3155 if test $tmp_have_bison = no; then
25310 0b253ba6eb91 avoid syntax errors in build-aux/subst scripts John W. Eaton <jwe@octave.org> parents: 25299 diff changeset	3156 YACC='${top_srcdir}/build-aux/missing bison'
16784 0fabe0f49f38 use better method to determine whether we are using flex and bison John W. Eaton <jwe@octave.org> parents: 16733 diff changeset	3157 warn_bison="
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3158
19105 6b4dfb1e5afb allow building with old versions of bison again (bug #43023) John W. Eaton <jwe@octave.org> parents: 18974 diff changeset	3159 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	3160 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	3161 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	3162 building from VCS sources.
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3163 "
16784 0fabe0f49f38 use better method to determine whether we are using flex and bison John W. Eaton <jwe@octave.org> parents: 16733 diff changeset	3164 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	3165 fi
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3166 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3167 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3168 dnl Find find program.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3169 dnl
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	3170 ## Prefer GNU find if found.
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3171 AN_MAKEVAR([FIND], [OCTAVE_PROG_FIND])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3172 AN_PROGRAM([gfind], [OCTAVE_PROG_FIND])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3173 AN_PROGRAM([find], [OCTAVE_PROG_FIND])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3174 AC_DEFUN([OCTAVE_PROG_FIND], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3175 AC_CHECK_PROGS(FIND, [gfind find])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3176 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3177 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3178 dnl Check for flex.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3179 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3180 AC_DEFUN([OCTAVE_PROG_FLEX], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3181 ## 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	3182 ## it, and it might not be installed.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3183 ##
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3184 ## 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	3185 ## using flex.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3186 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	3187 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	3188 flex)
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3189 LFLAGS="-I"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3190 AC_MSG_RESULT([defining LFLAGS to be $LFLAGS])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3191 LEXLIB=
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3192 ;;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3193 *)
25310 0b253ba6eb91 avoid syntax errors in build-aux/subst scripts John W. Eaton <jwe@octave.org> parents: 25299 diff changeset	3194 LEX='${top_srcdir}/build-aux/missing flex'
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3195 warn_flex="
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3196
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3197 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	3198 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	3199 "
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3200 OCTAVE_CONFIGURE_WARNING([warn_flex])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3201 ;;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3202 esac
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3203 AC_SUBST(LFLAGS)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3204 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3205 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3206 dnl Check for ghostscript.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3207 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3208 AC_DEFUN([OCTAVE_PROG_GHOSTSCRIPT], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3209 case "$canonical_host_type" in
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3210 --mingw* \| --msdosmsvc)
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	3211 ac_octave_gs_names="gswin32c gs mgs"
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3212 ;;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3213 *)
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	3214 ac_octave_gs_names="gs"
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3215 ;;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3216 esac
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	3217 AC_CHECK_PROGS(GHOSTSCRIPT, [$ac_octave_gs_names])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3218 if test -z "$GHOSTSCRIPT"; then
25310 0b253ba6eb91 avoid syntax errors in build-aux/subst scripts John W. Eaton <jwe@octave.org> parents: 25299 diff changeset	3219 GHOSTSCRIPT='${top_srcdir}/build-aux/missing gs'
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3220 warn_ghostscript="
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3221
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3222 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	3223 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	3224 using Octave
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3225 "
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3226 OCTAVE_CONFIGURE_WARNING([warn_ghostscript])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3227 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3228 AC_SUBST(GHOSTSCRIPT)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3229 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3230 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3231 dnl Check for gnuplot.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3232 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3233 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	3234 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	3235 ac_octave_gp_default="gnuplot"
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3236 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	3237 GNUPLOT="$ac_octave_gp_default"
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3238 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	3239 else
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	3240 AC_CHECK_PROGS(GNUPLOT, [$ac_octave_gp_names])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3241 if test -z "$GNUPLOT"; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3242 GNUPLOT="$gp_default"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3243 warn_gnuplot="
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3244
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3245 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	3246 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	3247 Octave's plotting commands.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3248 "
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3249 OCTAVE_CONFIGURE_WARNING([warn_gnuplot])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3250 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3251 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3252 AC_SUBST(GNUPLOT)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3253 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3254 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3255 dnl Check for gperf.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3256 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3257 AC_DEFUN([OCTAVE_PROG_GPERF], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3258 AC_CHECK_PROG(GPERF, gperf, gperf, [])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3259 if test -z "$GPERF"; then
25310 0b253ba6eb91 avoid syntax errors in build-aux/subst scripts John W. Eaton <jwe@octave.org> parents: 25299 diff changeset	3260 GPERF='${top_srcdir}/build-aux/missing gperf'
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3261 warn_gperf="
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3262
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3263 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	3264 reconstruct oct-gperf.h
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3265 "
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3266 OCTAVE_CONFIGURE_WARNING([warn_gperf])
25310 0b253ba6eb91 avoid syntax errors in build-aux/subst scripts John W. Eaton <jwe@octave.org> parents: 25299 diff changeset	3267 GPERF='${top_srcdir}/build-aux/missing gperf'
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3268 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3269 AC_SUBST(GPERF)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3270 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3271 dnl
19744 1687269e31e4 build: Generate Octave logo icons from SVG source (bug #37062) Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	3272 dnl Find icotool program.
1687269e31e4 build: Generate Octave logo icons from SVG source (bug #37062) Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	3273 dnl
1687269e31e4 build: Generate Octave logo icons from SVG source (bug #37062) Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	3274 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	3275 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	3276 if test -z "$ICOTOOL"; then
25310 0b253ba6eb91 avoid syntax errors in build-aux/subst scripts John W. Eaton <jwe@octave.org> parents: 25299 diff changeset	3277 ICOTOOL='${top_srcdir}/build-aux/missing icotool'
19753 bc2a8db22831 build: Use the missing script for icotool and rsvg-convert Mike Miller <mtmiller@ieee.org> parents: 19744 diff changeset	3278 warn_icotool="
bc2a8db22831 build: Use the missing script for icotool and rsvg-convert Mike Miller <mtmiller@ieee.org> parents: 19744 diff changeset	3279
bc2a8db22831 build: Use the missing script for icotool and rsvg-convert Mike Miller <mtmiller@ieee.org> parents: 19744 diff changeset	3280 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	3281 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	3282 VCS sources.
bc2a8db22831 build: Use the missing script for icotool and rsvg-convert Mike Miller <mtmiller@ieee.org> parents: 19744 diff changeset	3283 "
bc2a8db22831 build: Use the missing script for icotool and rsvg-convert Mike Miller <mtmiller@ieee.org> parents: 19744 diff changeset	3284 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	3285 fi
19744 1687269e31e4 build: Generate Octave logo icons from SVG source (bug #37062) Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	3286 AC_SUBST(ICOTOOL)
1687269e31e4 build: Generate Octave logo icons from SVG source (bug #37062) Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	3287 ])
1687269e31e4 build: Generate Octave logo icons from SVG source (bug #37062) Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	3288 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3289 dnl Check for makeinfo.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3290 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3291 AC_DEFUN([OCTAVE_PROG_MAKEINFO], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3292 dnl use MKINFO, not MAKEINFO, for variable name because Automake
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3293 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	3294 dnl exist which will then fool the 'test -z' line.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3295 AC_CHECK_PROG(MKINFO, makeinfo, makeinfo, [])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3296 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	3297 warn_makeinfo="
ca37c6023a79 don't abort configure if makeinfo is missing John W. Eaton <jwe@octave.org> parents: 15969 diff changeset	3298
ca37c6023a79 don't abort configure if makeinfo is missing John W. Eaton <jwe@octave.org> parents: 15969 diff changeset	3299 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	3300 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	3301 "
ca37c6023a79 don't abort configure if makeinfo is missing John W. Eaton <jwe@octave.org> parents: 15969 diff changeset	3302 OCTAVE_CONFIGURE_WARNING([warn_makeinfo])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3303 fi
24623 f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3304 dnl If we have a GNU makeinfo program, see if it supports the @sortas command
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3305 dnl for defining a custom sort key for an index entry.
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3306 if test -n "$MKINFO"; then
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3307 AC_CACHE_CHECK([for makeinfo support for @sortas command],
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3308 [octave_cv_makeinfo_sortas_command],
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3309 [cat << EOF > conftest.texi
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3310 \input texinfo
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3311 @node Top
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3312 @top Document
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3313 @menu
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3314 * Chapter::
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3315 * Index::
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3316 @end menu
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3317 @node Chapter
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3318 @chapter Chapter
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3319 @cindex @sortas{a} foo
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3320 @node Index
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3321 @unnumbered Index
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3322 @printindex cp
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3323 @bye
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3324 EOF
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3325 if $MKINFO --no-warn conftest.texi 2>/dev/null; then
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3326 octave_cv_makeinfo_sortas_command=yes
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3327 else
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3328 octave_cv_makeinfo_sortas_command=no
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3329 fi
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3330 rm -f conftest.info conftest.texi
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3331 ])
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3332 if test $octave_cv_makeinfo_sortas_command = no; then
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3333 warn_makeinfo="
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3334
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3335 I wasn't able to find a version of GNU makeinfo that supports the
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3336 @sortas command, but it's only a problem if you need to build the
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3337 manual, which is the case if you're building from VCS sources.
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3338 "
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3339 OCTAVE_CONFIGURE_WARNING([warn_makeinfo])
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3340 fi
f39ae754a7d8 configure: test that makeinfo supports the @sortas command Mike Miller <mtmiller@octave.org> parents: 24534 diff changeset	3341 fi
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3342 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3343 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3344 dnl What pager should we use?
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3345 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3346 AC_DEFUN([OCTAVE_PROG_PAGER], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3347 if test "$cross_compiling" = yes; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3348 DEFAULT_PAGER=less
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3349 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	3350 AC_SUBST(DEFAULT_PAGER)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3351 else
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	3352 ac_octave_possible_pagers="less more page pg"
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3353 case "$canonical_host_type" in
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3354 --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	3355 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	3356 ;;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3357 esac
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3358
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	3359 AC_CHECK_PROGS(DEFAULT_PAGER, [$ac_octave_possible_pagers], [])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3360 if test -z "$DEFAULT_PAGER"; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3361 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	3362 OCTAVE_CONFIGURE_WARNING([warn_less])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3363 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3364 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3365 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3366 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3367 dnl Find Perl program.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3368 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3369 AC_DEFUN([OCTAVE_PROG_PERL], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3370 AC_CHECK_PROG(PERL, perl, perl, [])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3371 AC_SUBST(PERL)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3372 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3373 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3374 dnl Find Python program.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3375 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3376 AC_DEFUN([OCTAVE_PROG_PYTHON], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3377 AC_CHECK_PROG(PYTHON, python, python, [])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3378 AC_SUBST(PYTHON)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3379 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3380 dnl
19744 1687269e31e4 build: Generate Octave logo icons from SVG source (bug #37062) Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	3381 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	3382 dnl
1687269e31e4 build: Generate Octave logo icons from SVG source (bug #37062) Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	3383 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	3384 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	3385 if test -z "$RSVG_CONVERT"; then
25310 0b253ba6eb91 avoid syntax errors in build-aux/subst scripts John W. Eaton <jwe@octave.org> parents: 25299 diff changeset	3386 RSVG_CONVERT='${top_srcdir}/build-aux/missing rsvg-convert'
19753 bc2a8db22831 build: Use the missing script for icotool and rsvg-convert Mike Miller <mtmiller@ieee.org> parents: 19744 diff changeset	3387 warn_rsvg_convert="
bc2a8db22831 build: Use the missing script for icotool and rsvg-convert Mike Miller <mtmiller@ieee.org> parents: 19744 diff changeset	3388
bc2a8db22831 build: Use the missing script for icotool and rsvg-convert Mike Miller <mtmiller@ieee.org> parents: 19744 diff changeset	3389 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	3390 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	3391 from VCS sources.
bc2a8db22831 build: Use the missing script for icotool and rsvg-convert Mike Miller <mtmiller@ieee.org> parents: 19744 diff changeset	3392 "
bc2a8db22831 build: Use the missing script for icotool and rsvg-convert Mike Miller <mtmiller@ieee.org> parents: 19744 diff changeset	3393 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	3394 fi
19744 1687269e31e4 build: Generate Octave logo icons from SVG source (bug #37062) Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	3395 AC_SUBST(RSVG_CONVERT)
1687269e31e4 build: Generate Octave logo icons from SVG source (bug #37062) Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	3396 ])
1687269e31e4 build: Generate Octave logo icons from SVG source (bug #37062) Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	3397 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3398 dnl Find sed program.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3399 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3400 # Check for a fully-functional sed program, that truncates
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3401 # as few characters as possible and that supports "$X\\|Y$"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3402 # style regular expression alternation. Prefer GNU sed if found.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3403 AC_DEFUN([OCTAVE_PROG_SED], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3404 AC_MSG_CHECKING([for a usable sed])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3405 if test -z "$SED"; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3406 AC_CACHE_VAL([octave_cv_prog_sed],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3407 [# 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	3408 # Next, test potential sed programs in list for truncation.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3409 _AS_PATH_WALK([$PATH],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3410 [for ac_prog in sed gsed; do
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3411 for ac_exec_ext in '' $ac_executable_extensions; do
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3412 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	3413 _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	3414 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3415 done
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3416 done
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3417 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3418 AS_TMPDIR(sed)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3419 _max=0
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3420 _count=0
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3421 # 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	3422 # along with /bin/sed that truncates output.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3423 for _sed in $_sed_list /usr/xpg4/bin/sed; do
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3424 test ! -f ${_sed} && break
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3425 cat /dev/null > "$tmp/sed.in"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3426 _count=0
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3427 echo $ECHO_N "0123456789$ECHO_C" >"$tmp/sed.in"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3428 # 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	3429 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	3430 octave_cv_prog_sed=${_sed}
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3431 break;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3432 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3433 # Reject if RE alternation is not handled.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3434 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	3435 continue;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3436 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3437 while true; do
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3438 cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3439 mv "$tmp/sed.tmp" "$tmp/sed.in"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3440 cp "$tmp/sed.in" "$tmp/sed.nl"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3441 echo >>"$tmp/sed.nl"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3442 ${_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	3443 cmp -s "$tmp/sed.out" "$tmp/sed.nl" \|\| break
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3444 # 10000 chars as input seems more than enough
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3445 test $_count -gt 10 && break
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3446 _count=`expr $_count + 1`
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3447 if test $_count -gt $_max; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3448 _max=$_count
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3449 octave_cv_prog_sed=$_sed
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3450 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3451 done
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3452 done
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3453 rm -rf "$tmp"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3454 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3455 SED=$octave_cv_prog_sed
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3456 if test -z "$SED"; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3457 AC_MSG_ERROR([no usable version of sed found])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3458 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3459 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3460 AC_SUBST(SED)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3461 AC_MSG_RESULT([$SED])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3462 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3463 dnl
24077 e483dcb5777d build the source distribution archives reproducibly Mike Miller <mtmiller@octave.org> parents: 24022 diff changeset	3464 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	3465 dnl
e483dcb5777d build the source distribution archives reproducibly Mike Miller <mtmiller@octave.org> parents: 24022 diff changeset	3466 AC_DEFUN([OCTAVE_PROG_TAR_REPRODUCIBLE], [
e483dcb5777d build the source distribution archives reproducibly Mike Miller <mtmiller@octave.org> parents: 24022 diff changeset	3467 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	3468 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	3469 for octave_tar in tar gnutar gtar :; do
e483dcb5777d build the source distribution archives reproducibly Mike Miller <mtmiller@octave.org> parents: 24022 diff changeset	3470 $octave_tar --version >/dev/null 2>&1 && break
e483dcb5777d build the source distribution archives reproducibly Mike Miller <mtmiller@octave.org> parents: 24022 diff changeset	3471 done
e483dcb5777d build the source distribution archives reproducibly Mike Miller <mtmiller@octave.org> parents: 24022 diff changeset	3472 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	3473 if test x"$octave_tar" != x:; then
e483dcb5777d build the source distribution archives reproducibly Mike Miller <mtmiller@octave.org> parents: 24022 diff changeset	3474 octave_tar_flags=
e483dcb5777d build the source distribution archives reproducibly Mike Miller <mtmiller@octave.org> parents: 24022 diff changeset	3475 echo > conftest.txt
e483dcb5777d build the source distribution archives reproducibly Mike Miller <mtmiller@octave.org> parents: 24022 diff changeset	3476 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	3477 $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	3478 if test $? -eq 0; then
e483dcb5777d build the source distribution archives reproducibly Mike Miller <mtmiller@octave.org> parents: 24022 diff changeset	3479 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	3480 fi
e483dcb5777d build the source distribution archives reproducibly Mike Miller <mtmiller@octave.org> parents: 24022 diff changeset	3481 done
e483dcb5777d build the source distribution archives reproducibly Mike Miller <mtmiller@octave.org> parents: 24022 diff changeset	3482 rm -f conftest.tar conftest.txt
e483dcb5777d build the source distribution archives reproducibly Mike Miller <mtmiller@octave.org> parents: 24022 diff changeset	3483 REPRODUCIBLE_TAR_FLAGS="$octave_tar_flags"
e483dcb5777d build the source distribution archives reproducibly Mike Miller <mtmiller@octave.org> parents: 24022 diff changeset	3484 fi
e483dcb5777d build the source distribution archives reproducibly Mike Miller <mtmiller@octave.org> parents: 24022 diff changeset	3485 AC_SUBST(REPRODUCIBLE_TAR_FLAGS)
e483dcb5777d build the source distribution archives reproducibly Mike Miller <mtmiller@octave.org> parents: 24022 diff changeset	3486 AC_MSG_RESULT([$REPRODUCIBLE_TAR_FLAGS])
e483dcb5777d build the source distribution archives reproducibly Mike Miller <mtmiller@octave.org> parents: 24022 diff changeset	3487 ])
e483dcb5777d build the source distribution archives reproducibly Mike Miller <mtmiller@octave.org> parents: 24022 diff changeset	3488 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3489 dnl Check for texi2dvi.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3490 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3491 AC_DEFUN([OCTAVE_PROG_TEXI2DVI], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3492 AC_CHECK_PROG(TEXI2DVI, texi2dvi, texi2dvi, [])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3493 if test -z "$TEXI2DVI"; then
25310 0b253ba6eb91 avoid syntax errors in build-aux/subst scripts John W. Eaton <jwe@octave.org> parents: 25299 diff changeset	3494 TEXI2DVI='${top_srcdir}/build-aux/missing texi2dvi'
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3495 warn_texi2dvi="
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3496
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3497 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	3498 reconstruct the DVI version of the manual
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3499 "
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3500 OCTAVE_CONFIGURE_WARNING([warn_texi2dvi])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3501 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3502 AC_SUBST(TEXI2DVI)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3503 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3504 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3505 dnl Check for texi2pdf.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3506 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3507 AC_DEFUN([OCTAVE_PROG_TEXI2PDF], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3508 AC_REQUIRE([OCTAVE_PROG_TEXI2DVI])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3509 AC_CHECK_PROG(TEXI2PDF, texi2pdf, texi2pdf, [])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3510 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	3511 ac_octave_texi2pdf_missing=yes;
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3512 if test -n "$TEXI2DVI"; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3513 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	3514 ac_octave_texi2pdf_missing=no;
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3515 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3516 else
16068 b309a5da17f5 use yes/no instead of true/false in confgure scripts John W. Eaton <jwe@octave.org> parents: 16012 diff changeset	3517 ac_octave_texi2pdf_missing=no;
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3518 fi
16068 b309a5da17f5 use yes/no instead of true/false in confgure scripts John W. Eaton <jwe@octave.org> parents: 16012 diff changeset	3519 if test $ac_octave_texi2pdf_missing = yes; then
25310 0b253ba6eb91 avoid syntax errors in build-aux/subst scripts John W. Eaton <jwe@octave.org> parents: 25299 diff changeset	3520 TEXI2PDF='${top_srcdir}/build-aux/missing texi2pdf'
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3521 warn_texi2pdf="
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3522
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3523 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	3524 reconstruct the PDF version of the manual
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3525 "
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3526 OCTAVE_CONFIGURE_WARNING([warn_texi2pdf])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3527 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3528 AC_SUBST(TEXI2PDF)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3529 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3530 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3531 dnl Set default value for a variable and substitute it.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3532 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3533 AC_DEFUN([OCTAVE_SET_DEFAULT], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3534 ifelse($#, 2, [: ${$1=$2}
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3535 ])dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3536 AC_MSG_RESULT([defining $1 to be $$1])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3537 AC_SUBST($1)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3538 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3539 dnl
15144 9cc337ced51a build: Update OCTAVE_UMFPACK_SEPARATE_SPLIT macro to look for SuiteSparse header file. Rik <rik@octave.org> parents: 15141 diff changeset	3540 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	3541 dnl
15144 9cc337ced51a build: Update OCTAVE_UMFPACK_SEPARATE_SPLIT macro to look for SuiteSparse header file. Rik <rik@octave.org> parents: 15141 diff changeset	3542 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	3543 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3544 AC_DEFUN([OCTAVE_UMFPACK_SEPARATE_SPLIT], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3545 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	3546 AC_CACHE_VAL([octave_cv_umfpack_separate_split],
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3547 [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	3548 #include <stdint.h>
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3549 #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	3550 #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	3551 #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	3552 # 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	3553 #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	3554 # include <ufsparse/umfpack.h>
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3555 #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	3556 # include <umfpack/umfpack.h>
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3557 #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	3558 # include <umfpack.h>
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3559 #endif
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21604 diff changeset	3560 #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	3561 typedef uint64_t idx_type;
eb572251b7c6 check for correct SuiteSparse functions if --enable-64 John W. Eaton <jwe@octave.org> parents: 16313 diff changeset	3562 #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	3563 #else
eb572251b7c6 check for correct SuiteSparse functions if --enable-64 John W. Eaton <jwe@octave.org> parents: 16313 diff changeset	3564 typedef int idx_type;
eb572251b7c6 check for correct SuiteSparse functions if --enable-64 John W. Eaton <jwe@octave.org> parents: 16313 diff changeset	3565 #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	3566 #endif
eb572251b7c6 check for correct SuiteSparse functions if --enable-64 John W. Eaton <jwe@octave.org> parents: 16313 diff changeset	3567 idx_type n = 5;
eb572251b7c6 check for correct SuiteSparse functions if --enable-64 John W. Eaton <jwe@octave.org> parents: 16313 diff changeset	3568 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	3569 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	3570 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	3571 -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	3572 double br[] = {8., 45., -3., 3., 19.};
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3573 double bi[] = {0., 0., 0., 0., 0.};
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3574 int main (void)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3575 {
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3576 double null = (double ) NULL ;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3577 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	3578 idx_type i ;
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3579 void Symbolic, Numeric ;
16318 eb572251b7c6 check for correct SuiteSparse functions if --enable-64 John W. Eaton <jwe@octave.org> parents: 16313 diff changeset	3580 (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	3581 (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	3582 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	3583 (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	3584 Numeric, null, null) ;
16318 eb572251b7c6 check for correct SuiteSparse functions if --enable-64 John W. Eaton <jwe@octave.org> parents: 16313 diff changeset	3585 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	3586 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	3587 if (fabs (*x - i - 1.) > 1.e-13)
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3588 return (1);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3589 return (0) ;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3590 }
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3591 ]])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3592 octave_cv_umfpack_separate_split=yes,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3593 octave_cv_umfpack_separate_split=no,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3594 octave_cv_umfpack_separate_split=yes)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3595 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3596 if test "$cross_compiling" = yes; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3597 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	3598 else
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3599 AC_MSG_RESULT([$octave_cv_umfpack_separate_split])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3600 fi
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	3601 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	3602 AC_DEFINE(UMFPACK_SEPARATE_SPLIT, 1,
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3603 [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	3604 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	3605 ])

Mercurial > octave

annotate m4/acinclude.m4 @ 25931:332be8be16eb