octave-lyh: m4/acinclude.m4 annotate

annotate m4/acinclude.m4 @ 16174:39096b290a2f

check syntax used to enable bison push/pull parser * acinclude.m4 (OCTAVE_PROG_BISON): Check for syntax used to enable push/pull parser. * common.mk (BISON_PUSH_PULL_DECL_STYLE): New variable. * libinterp/Makefile.am (BUILT_DISTFILES): Include oct-parse.yy in the list. (EXTRA_DIST): Include oct-pase.in.yy in the list. (ULT_DIST_SRC): New variable. (SRC_DEF_FILES, TST_FILES_SRC): Use $(ULT_DIST_SRC) instead of $(DIST_SRC). * find-defun-files.sh: Transform .in.yy instead of .yy. * libinterp/parse-tree/module.mk (parse-tree/oct-parse.yy): New target and rule to substitute push-pull decl. * oct-parse.in.yy: Rename from oct-parse.yy Substitute %PUSH_PULL_DECL%.

author	John W. Eaton <jwe@octave.org>
date	Sat, 02 Mar 2013 12:26:42 -0500
parents	b309a5da17f5
children	7ce484126bb2

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
14138 72c96de7a403 maint: update copyright notices for 2012 John W. Eaton <jwe@octave.org> parents: 14043 diff changeset	3 dnl Copyright (C) 1995-2012 John W. Eaton
1232 5f1bb459e99c [project @ 1995-04-10 05:20:52 by jwe] jwe parents: diff changeset	4 dnl
5f1bb459e99c [project @ 1995-04-10 05:20:52 by jwe] jwe parents: diff changeset	5 dnl This file is part of Octave.
5f1bb459e99c [project @ 1995-04-10 05:20:52 by jwe] jwe parents: diff changeset	6 dnl
5f1bb459e99c [project @ 1995-04-10 05:20:52 by jwe] jwe parents: diff changeset	7 dnl Octave is free software; you can redistribute it and/or modify it
5f1bb459e99c [project @ 1995-04-10 05:20:52 by jwe] jwe parents: diff changeset	8 dnl under the terms of the GNU General Public License as published by the
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6955 diff changeset	9 dnl Free Software Foundation; either version 3 of the License, or (at
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6955 diff changeset	10 dnl your option) any later version.
1232 5f1bb459e99c [project @ 1995-04-10 05:20:52 by jwe] jwe parents: diff changeset	11 dnl
5f1bb459e99c [project @ 1995-04-10 05:20:52 by jwe] jwe parents: diff changeset	12 dnl Octave is distributed in the hope that it will be useful, but WITHOUT
5f1bb459e99c [project @ 1995-04-10 05:20:52 by jwe] jwe parents: diff changeset	13 dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
5f1bb459e99c [project @ 1995-04-10 05:20:52 by jwe] jwe parents: diff changeset	14 dnl FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
5f1bb459e99c [project @ 1995-04-10 05:20:52 by jwe] jwe parents: diff changeset	15 dnl for more details.
5f1bb459e99c [project @ 1995-04-10 05:20:52 by jwe] jwe parents: diff changeset	16 dnl
5f1bb459e99c [project @ 1995-04-10 05:20:52 by jwe] jwe parents: diff changeset	17 dnl You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6955 diff changeset	18 dnl along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6955 diff changeset	19 dnl <http://www.gnu.org/licenses/>.
2548 b50cc31aa0cd [project @ 1996-11-20 06:43:26 by jwe] jwe parents: 2491 diff changeset	20 dnl
9525 691545147aca compatibility for earlier autoconfs Jaroslav Hajek <highegg@gmail.com> parents: 9523 diff changeset	21 dnl
9577 b03062e16c6f copyirght & FIXME in aclocal.m4 Jaroslav Hajek <highegg@gmail.com> parents: 9568 diff changeset	22 dnl Copyright (C) 2008 - 2009 Free Software Foundation, Inc.
b03062e16c6f copyirght & FIXME in aclocal.m4 Jaroslav Hajek <highegg@gmail.com> parents: 9568 diff changeset	23 dnl
9525 691545147aca compatibility for earlier autoconfs Jaroslav Hajek <highegg@gmail.com> parents: 9523 diff changeset	24 dnl If needed, define the m4_ifblank and m4_ifnblank macros from autoconf 2.64
691545147aca compatibility for earlier autoconfs Jaroslav Hajek <highegg@gmail.com> parents: 9523 diff changeset	25 dnl This allows us to run with earlier Autoconfs as well.
9577 b03062e16c6f copyirght & FIXME in aclocal.m4 Jaroslav Hajek <highegg@gmail.com> parents: 9568 diff changeset	26 dnl FIXME: these should go away once Autoconf 2.64 is required or ubiquitous.
b03062e16c6f copyirght & FIXME in aclocal.m4 Jaroslav Hajek <highegg@gmail.com> parents: 9568 diff changeset	27 dnl
9525 691545147aca compatibility for earlier autoconfs Jaroslav Hajek <highegg@gmail.com> parents: 9523 diff changeset	28 ifdef([m4_ifblank],[],[
691545147aca compatibility for earlier autoconfs Jaroslav Hajek <highegg@gmail.com> parents: 9523 diff changeset	29 m4_define([m4_ifblank],
691545147aca compatibility for earlier autoconfs Jaroslav Hajek <highegg@gmail.com> parents: 9523 diff changeset	30 [m4_if(m4_translit([[$1]], [ ][ ][
691545147aca compatibility for earlier autoconfs Jaroslav Hajek <highegg@gmail.com> parents: 9523 diff changeset	31 ]), [], [$2], [$3])])])
691545147aca compatibility for earlier autoconfs Jaroslav Hajek <highegg@gmail.com> parents: 9523 diff changeset	32 dnl
691545147aca compatibility for earlier autoconfs Jaroslav Hajek <highegg@gmail.com> parents: 9523 diff changeset	33 ifdef([m4_ifnblank],[],[
691545147aca compatibility for earlier autoconfs Jaroslav Hajek <highegg@gmail.com> parents: 9523 diff changeset	34 m4_define([m4_ifnblank],
691545147aca compatibility for earlier autoconfs Jaroslav Hajek <highegg@gmail.com> parents: 9523 diff changeset	35 [m4_if(m4_translit([[$1]], [ ][ ][
691545147aca compatibility for earlier autoconfs Jaroslav Hajek <highegg@gmail.com> parents: 9523 diff changeset	36 ]), [], [$3], [$2])])])
691545147aca compatibility for earlier autoconfs Jaroslav Hajek <highegg@gmail.com> parents: 9523 diff changeset	37 dnl
2813 d45d48b3dcde [project @ 1997-03-13 22:39:15 by jwe] jwe parents: 2641 diff changeset	38 dnl ----------------------------------------------------------------------
d45d48b3dcde [project @ 1997-03-13 22:39:15 by jwe] jwe parents: 2641 diff changeset	39 dnl
3130 02766207b74c [project @ 1998-01-25 08:27:23 by jwe] jwe parents: 3126 diff changeset	40
2813 d45d48b3dcde [project @ 1997-03-13 22:39:15 by jwe] jwe parents: 2641 diff changeset	41 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	42 dnl Alphabetical list of macros in the OCTAVE_ namespace
4360 1d7180ab9df1 [project @ 2003-02-24 02:57:24 by jwe] jwe parents: 4192 diff changeset	43 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	44
4366 ad851d04b396 [project @ 2003-03-05 09:49:18 by jwe] jwe parents: 4360 diff changeset	45 dnl
15133 f91eac1bc66d m4/acinclude.m4: Correct typos, use consistent style for describing macros. Rik <rik@octave.org> parents: 15126 diff changeset	46 dnl Check if the Carbon Framework defines CGDisplayBitsPerPixel.
10380 60acc47c203f configure checks for complex element setter/reference accessor methods John W. Eaton <jwe@octave.org> parents: 10331 diff changeset	47 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	48 AC_DEFUN([OCTAVE_CARBON_CGDISPLAYBITSPERPIXEL], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	49 AC_CACHE_CHECK([whether CGDisplayBitsPerPixel is defined in the Carbon Framework],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	50 [octave_cv_func_carbon_cgdisplaybitsperpixel],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	51 [AC_LANG_PUSH(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	52 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	53 #include <Carbon/Carbon.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	54 ]], [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	55 CGDirectDisplayID display = CGMainDisplayID ();
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	56 size_t depth = CGDisplayBitsPerPixel (display);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	57 ]])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	58 octave_cv_func_carbon_cgdisplaybitsperpixel=yes,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	59 octave_cv_func_carbon_cgdisplaybitsperpixel=no)
3888 70ebd3d672a1 [project @ 2002-04-04 01:05:53 by jwe] jwe parents: 3887 diff changeset	60 AC_LANG_POP(C++)
3107 a8dcfbf87ea3 [project @ 1997-11-19 22:34:59 by jwe] jwe parents: 3089 diff changeset	61 ])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	62 if test $octave_cv_func_carbon_cgdisplaybitsperpixel = yes; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	63 AC_DEFINE(HAVE_CARBON_CGDISPLAYBITSPERPIXEL, 1,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	64 [Define to 1 if Carbon Framework has CGDisplayBitsPerPixel.])
3107 a8dcfbf87ea3 [project @ 1997-11-19 22:34:59 by jwe] jwe parents: 3089 diff changeset	65 fi
a8dcfbf87ea3 [project @ 1997-11-19 22:34:59 by jwe] jwe parents: 3089 diff changeset	66 ])
3126 0f6ec7b761a6 [project @ 1998-01-16 05:15:43 by jwe] jwe parents: 3107 diff changeset	67 dnl
15133 f91eac1bc66d m4/acinclude.m4: Correct typos, use consistent style for describing macros. Rik <rik@octave.org> parents: 15126 diff changeset	68 dnl Check if C compiler handles FLAG command line option. If two
f91eac1bc66d m4/acinclude.m4: Correct typos, use consistent style for describing macros. Rik <rik@octave.org> parents: 15126 diff changeset	69 dnl arguments are specified, execute the second arg as shell commands.
f91eac1bc66d m4/acinclude.m4: Correct typos, use consistent style for describing macros. Rik <rik@octave.org> parents: 15126 diff changeset	70 dnl Otherwise, add FLAG to CFLAGS if the compiler accepts the flag.
3126 0f6ec7b761a6 [project @ 1998-01-16 05:15:43 by jwe] jwe parents: 3107 diff changeset	71 dnl
9654 a307a6f77fb3 aclocal.m4: consistently quote first arg to AC_DEFUN John W. Eaton <jwe@octave.org> parents: 9645 diff changeset	72 AC_DEFUN([OCTAVE_CC_FLAG], [
14994 bbc825cb2ea0 Use -I instead of -isystem if -isystem is not avaiable Max Brister <max@2bass.com> parents: 14776 diff changeset	73 ac_safe=`echo "$1" \| sed 'y% ./+-:=%___p___%'`
10012 2441327485a3 use m4 quating in aclocal.m4 autoconf macros with variable expansion Rik <rdrider0-list@yahoo.com> parents: 10011 diff changeset	74 AC_MSG_CHECKING([whether ${CC-cc} accepts $1])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	75 AC_CACHE_VAL([octave_cv_cc_flag_$ac_safe],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	76 [AC_LANG_PUSH(C)
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	77 ac_octave_save_CFLAGS="$CFLAGS"
3126 0f6ec7b761a6 [project @ 1998-01-16 05:15:43 by jwe] jwe parents: 3107 diff changeset	78 CFLAGS="$CFLAGS $1"
5177 86fa011d6404 [project @ 2005-03-03 00:32:34 by jwe] jwe parents: 5094 diff changeset	79 AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	80 [eval "octave_cv_cc_flag_$ac_safe=yes"],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	81 [eval "octave_cv_cc_flag_$ac_safe=no"])
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	82 CFLAGS="$ac_octave_save_CFLAGS"
3888 70ebd3d672a1 [project @ 2002-04-04 01:05:53 by jwe] jwe parents: 3887 diff changeset	83 AC_LANG_POP(C)
3126 0f6ec7b761a6 [project @ 1998-01-16 05:15:43 by jwe] jwe parents: 3107 diff changeset	84 ])
0f6ec7b761a6 [project @ 1998-01-16 05:15:43 by jwe] jwe parents: 3107 diff changeset	85 if eval "test \"`echo '$octave_cv_cc_flag_'$ac_safe`\" = yes"; then
15319 daf74ce2afdc m4/acinclude.m4: Use more consistent m4 quoting of arguments to macros. Rik <rik@octave.org> parents: 15302 diff changeset	86 AC_MSG_RESULT([yes])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	87 ifelse([$2], ,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	88 [CFLAGS="$CFLAGS $1"
3131 9c5160c83bd2 [project @ 1998-01-29 04:46:33 by jwe] jwe parents: 3130 diff changeset	89 AC_MSG_RESULT([adding $1 to CFLAGS])], [$2])
3126 0f6ec7b761a6 [project @ 1998-01-16 05:15:43 by jwe] jwe parents: 3107 diff changeset	90 else
15319 daf74ce2afdc m4/acinclude.m4: Use more consistent m4 quoting of arguments to macros. Rik <rik@octave.org> parents: 15302 diff changeset	91 AC_MSG_RESULT([no])
3126 0f6ec7b761a6 [project @ 1998-01-16 05:15:43 by jwe] jwe parents: 3107 diff changeset	92 ifelse([$3], , , [$3])
0f6ec7b761a6 [project @ 1998-01-16 05:15:43 by jwe] jwe parents: 3107 diff changeset	93 fi
0f6ec7b761a6 [project @ 1998-01-16 05:15:43 by jwe] jwe parents: 3107 diff changeset	94 ])
0f6ec7b761a6 [project @ 1998-01-16 05:15:43 by jwe] jwe parents: 3107 diff changeset	95 dnl
15969 139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	96 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	97 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	98 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	99 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	100 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	101 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	102 dnl ahead of the main FFTW library.
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	103 dnl
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	104 AC_DEFUN([OCTAVE_CHECK_FFTW_THREADS], [
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	105 ac_octave_save_CPPFLAGS="$CPPFLAGS"
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	106 ac_octave_save_LDFLAGS="$LDFLAGS"
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	107 ac_octave_save_LIBS="$LIBS"
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	108 CPPFLAGS="$m4_toupper([$1])_CPPFLAGS $CPPFLAGS"
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	109 LDFLAGS="$m4_toupper([$1])_LDFLAGS $LDFLAGS"
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	110 LIBS="$m4_toupper([$1])_LIBS $LIBS"
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	111 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	112 [octave_cv_[$1]_threads_lib],
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	113 [AC_LINK_IFELSE([AC_LANG_PROGRAM([[
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	114 #include <fftw3.h>
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	115 ]], [[
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	116 $2 (2);
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	117 ]])],
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	118 [octave_cv_[$1]_threads_lib=yes],
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	119 [LIBS="-l[$1]_threads $LIBS"
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	120 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	121 #include <fftw3.h>
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	122 ]], [[
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	123 $2 (2);
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	124 ]])],
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	125 [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	126 [octave_cv_[$1]_threads_lib=no])
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	127 ])
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	128 ])
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	129 case $octave_cv_[$1]_threads_lib in
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	130 -l*)
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	131 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	132 ;;
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	133 no)
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	134 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	135 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	136 ;;
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	137 esac
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	138 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	139 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	140 [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	141 fi
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	142 CPPFLAGS="$ac_octave_save_CPPFLAGS"
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	143 LDFLAGS="$ac_octave_save_LDFLAGS"
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	144 LIBS="$ac_octave_save_LIBS"
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	145 ])
139f4b19a3ac build: Improve detection of FFTW multi-threading Mike Miller <mtmiller@ieee.org> parents: 15863 diff changeset	146 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	147 dnl Check whether a math mapper function is available in <cmath>.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	148 dnl Will define HAVE_CMATH_FUNC if there is a double variant and
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	149 dnl HAVE_CMATH_FUNCF if there is a float variant.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	150 dnl Currently capable of checking for functions with single
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	151 dnl argument and returning bool/int/real.
3126 0f6ec7b761a6 [project @ 1998-01-16 05:15:43 by jwe] jwe parents: 3107 diff changeset	152 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	153 AC_DEFUN([OCTAVE_CHECK_FUNC_CMATH], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	154 ac_safe=`echo "$1" \| sed 'y% ./+-:=%___p___%'`
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	155
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	156 AC_CACHE_CHECK([for std::$1 in <cmath>],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	157 [octave_cv_func_cmath_$ac_safe],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	158 [AC_LANG_PUSH(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	159 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	160 #include <cmath>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	161 void take_func (bool (*func) (double x));
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	162 void take_func (int (*func) (double x));
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	163 void take_func (double (*func) (double x));
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	164 ]], [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	165 take_func(std::$1);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	166 ]])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	167 [eval "octave_cv_func_cmath_$ac_safe=yes"],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	168 [eval "octave_cv_func_cmath_$ac_safe=no"])
3888 70ebd3d672a1 [project @ 2002-04-04 01:05:53 by jwe] jwe parents: 3887 diff changeset	169 AC_LANG_POP(C++)
3126 0f6ec7b761a6 [project @ 1998-01-16 05:15:43 by jwe] jwe parents: 3107 diff changeset	170 ])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	171 if eval "test \"`echo '$octave_cv_func_cmath_'$ac_safe`\" = yes"; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	172 AC_DEFINE(AS_TR_CPP([[HAVE_CMATH_][$1]]), 1,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	173 [Define to 1 if <cmath> provides $1.])
3126 0f6ec7b761a6 [project @ 1998-01-16 05:15:43 by jwe] jwe parents: 3107 diff changeset	174 fi
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	175
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	176 AC_CACHE_CHECK([for std::$1 (float variant) in <cmath>],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	177 [octave_cv_func_cmath_f$ac_safe],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	178 [AC_LANG_PUSH(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	179 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	180 #include <cmath>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	181 void take_func (bool (*func) (float x));
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	182 void take_func (int (*func) (float x));
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	183 void take_func (float (*func) (float x));
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	184 ]], [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	185 take_func(std::$1);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	186 ]])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	187 [eval "octave_cv_func_cmath_f$ac_safe=yes"],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	188 [eval "octave_cv_func_cmath_f$ac_safe=no"])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	189 AC_LANG_POP(C++)
5076 dc5f6082aa74 [project @ 2004-11-12 03:49:26 by jwe] jwe parents: 4853 diff changeset	190 ])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	191 if eval "test \"`echo '$octave_cv_func_cmath_f'$ac_safe`\" = yes"; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	192 AC_DEFINE(AS_TR_CPP([[HAVE_CMATH_][$1][F]]), 1,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	193 [Define to 1 if <cmath> provides float variant of $1.])
3126 0f6ec7b761a6 [project @ 1998-01-16 05:15:43 by jwe] jwe parents: 3107 diff changeset	194 fi
0f6ec7b761a6 [project @ 1998-01-16 05:15:43 by jwe] jwe parents: 3107 diff changeset	195 ])
3130 02766207b74c [project @ 1998-01-25 08:27:23 by jwe] jwe parents: 3126 diff changeset	196 dnl
15291 7ae14907ae43 build: Add tests for specific Qt functions to configure.ac Rik <rik@octave.org> parents: 15250 diff changeset	197 dnl Check whether Qscintilla FindFirst function is old (16 inputs) or
7ae14907ae43 build: Add tests for specific Qt functions to configure.ac Rik <rik@octave.org> parents: 15250 diff changeset	198 dnl new (17 inputs).
7ae14907ae43 build: Add tests for specific Qt functions to configure.ac Rik <rik@octave.org> parents: 15250 diff changeset	199 dnl FIXME: This test uses a version number. It potentially could
7ae14907ae43 build: Add tests for specific Qt functions to configure.ac Rik <rik@octave.org> parents: 15250 diff changeset	200 dnl be re-written to actually call the function, but is it worth it?
5076 dc5f6082aa74 [project @ 2004-11-12 03:49:26 by jwe] jwe parents: 4853 diff changeset	201 dnl
15291 7ae14907ae43 build: Add tests for specific Qt functions to configure.ac Rik <rik@octave.org> parents: 15250 diff changeset	202 AC_DEFUN([OCTAVE_CHECK_FUNC_FINDFIRST_MODERN], [
15293 2981cdbb955f acinclude.m4: Correct message for OCTAVE_CHECK_FUNC_FIRDFIRST_MODERN. Rik <rik@octave.org> parents: 15291 diff changeset	203 AC_CACHE_CHECK([whether Qscintilla FindFirst uses 17 input arguments],
15291 7ae14907ae43 build: Add tests for specific Qt functions to configure.ac Rik <rik@octave.org> parents: 15250 diff changeset	204 [octave_cv_func_findfirst_modern],
7ae14907ae43 build: Add tests for specific Qt functions to configure.ac Rik <rik@octave.org> parents: 15250 diff changeset	205 [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	206 ac_octave_save_CPPFLAGS="$CPPFLAGS"
15596 5f031158c693 Use pkg-config to discover Qt (pkg-config is already a requirement anyway). Michael Goffioul <michael.goffioul@gmail.com> parents: 15360 diff changeset	207 CPPFLAGS="$QT_CPPFLAGS $CPPFLAGS"
15291 7ae14907ae43 build: Add tests for specific Qt functions to configure.ac Rik <rik@octave.org> parents: 15250 diff changeset	208 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
7ae14907ae43 build: Add tests for specific Qt functions to configure.ac Rik <rik@octave.org> parents: 15250 diff changeset	209 #include <Qsci/qsciglobal.h>
7ae14907ae43 build: Add tests for specific Qt functions to configure.ac Rik <rik@octave.org> parents: 15250 diff changeset	210 ]], [[
7ae14907ae43 build: Add tests for specific Qt functions to configure.ac Rik <rik@octave.org> parents: 15250 diff changeset	211 #if QSCINTILLA_VERSION < 0x020600
15295 43e484fa7e42 build: Clean up configure macros for building GUI. Rik <rik@octave.org> parents: 15294 diff changeset	212 #error Old FindFirst function found.
15291 7ae14907ae43 build: Add tests for specific Qt functions to configure.ac Rik <rik@octave.org> parents: 15250 diff changeset	213 #endif
7ae14907ae43 build: Add tests for specific Qt functions to configure.ac Rik <rik@octave.org> parents: 15250 diff changeset	214 ]])],
7ae14907ae43 build: Add tests for specific Qt functions to configure.ac Rik <rik@octave.org> parents: 15250 diff changeset	215 octave_cv_func_findfirst_modern=yes,
7ae14907ae43 build: Add tests for specific Qt functions to configure.ac Rik <rik@octave.org> parents: 15250 diff changeset	216 octave_cv_func_findfirst_modern=no)
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	217 CPPFLAGS="$ac_octave_save_CPPFLAGS"
15291 7ae14907ae43 build: Add tests for specific Qt functions to configure.ac Rik <rik@octave.org> parents: 15250 diff changeset	218 AC_LANG_POP(C++)
5076 dc5f6082aa74 [project @ 2004-11-12 03:49:26 by jwe] jwe parents: 4853 diff changeset	219 ])
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	220 if test $octave_cv_func_findfirst_modern = yes; then
15291 7ae14907ae43 build: Add tests for specific Qt functions to configure.ac Rik <rik@octave.org> parents: 15250 diff changeset	221 AC_DEFINE(HAVE_FINDFIRST_MODERN, 1,
7ae14907ae43 build: Add tests for specific Qt functions to configure.ac Rik <rik@octave.org> parents: 15250 diff changeset	222 [Define to 1 if Qscintilla FindFirst uses modern form with 17 inputs.])
5076 dc5f6082aa74 [project @ 2004-11-12 03:49:26 by jwe] jwe parents: 4853 diff changeset	223 fi
dc5f6082aa74 [project @ 2004-11-12 03:49:26 by jwe] jwe parents: 4853 diff changeset	224 ])
dc5f6082aa74 [project @ 2004-11-12 03:49:26 by jwe] jwe parents: 4853 diff changeset	225 dnl
15133 f91eac1bc66d m4/acinclude.m4: Correct typos, use consistent style for describing macros. Rik <rik@octave.org> parents: 15126 diff changeset	226 dnl Check if Fortran compiler has the intrinsic function ISNAN.
14550 bc4c574ab3b6 Add configure check for isnan in fortran. Carlo de Falco <cdf@users.sourceforge.net> parents: 14419 diff changeset	227 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	228 AC_DEFUN([OCTAVE_CHECK_FUNC_FORTRAN_ISNAN], [
14550 bc4c574ab3b6 Add configure check for isnan in fortran. Carlo de Falco <cdf@users.sourceforge.net> parents: 14419 diff changeset	229 AC_CACHE_CHECK([whether $F77 has the intrinsic function ISNAN],
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	230 [octave_cv_func_fortran_isnan],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	231 [AC_LANG_PUSH(Fortran 77)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	232 AC_COMPILE_IFELSE(
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	233 [[ program foo
14550 bc4c574ab3b6 Add configure check for isnan in fortran. Carlo de Falco <cdf@users.sourceforge.net> parents: 14419 diff changeset	234 implicit none
bc4c574ab3b6 Add configure check for isnan in fortran. Carlo de Falco <cdf@users.sourceforge.net> parents: 14419 diff changeset	235 real x
bc4c574ab3b6 Add configure check for isnan in fortran. Carlo de Falco <cdf@users.sourceforge.net> parents: 14419 diff changeset	236 double precision y
bc4c574ab3b6 Add configure check for isnan in fortran. Carlo de Falco <cdf@users.sourceforge.net> parents: 14419 diff changeset	237 if (isnan(x)) then
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	238 print *, 'x is NaN'
14550 bc4c574ab3b6 Add configure check for isnan in fortran. Carlo de Falco <cdf@users.sourceforge.net> parents: 14419 diff changeset	239 end if
bc4c574ab3b6 Add configure check for isnan in fortran. Carlo de Falco <cdf@users.sourceforge.net> parents: 14419 diff changeset	240 if (isnan(y)) then
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	241 print *, 'y is NaN'
14550 bc4c574ab3b6 Add configure check for isnan in fortran. Carlo de Falco <cdf@users.sourceforge.net> parents: 14419 diff changeset	242 end if
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	243 end program
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	244 ]],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	245 octave_cv_func_fortran_isnan=yes, octave_cv_func_fortran_isnan=no)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	246 AC_LANG_POP(Fortran 77)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	247 ])
14550 bc4c574ab3b6 Add configure check for isnan in fortran. Carlo de Falco <cdf@users.sourceforge.net> parents: 14419 diff changeset	248 ])
9596 f26229391ea1 configure.in, aclocal.m4: check fortran integer size John W. Eaton <jwe@octave.org> parents: 9577 diff changeset	249 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	250 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	251 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	252 AC_DEFUN([OCTAVE_CHECK_FUNC_GLUTESSCALLBACK_THREEDOTS], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	253 AC_CACHE_CHECK([whether gluTessCallback is called with "(...)"],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	254 [octave_cv_func_glutesscallback_threedots],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	255 [AC_LANG_PUSH(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	256 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	257 #ifdef HAVE_GL_GLU_H
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	258 # include <GL/glu.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	259 #elif defined HAVE_OPENGL_GLU_H \|\| defined HAVE_FRAMEWORK_OPENGL
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	260 # include <OpenGL/glu.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	261 #endif
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	262 ]], [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	263 GLvoid (*func)(...);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	264 gluTessCallback(0, 0, func);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	265 ]])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	266 octave_cv_func_glutesscallback_threedots=yes,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	267 octave_cv_func_glutesscallback_threedots=no)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	268 AC_LANG_POP(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	269 ])
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	270 if test $octave_cv_func_glutesscallback_threedots = yes; then
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	271 AC_DEFINE(HAVE_GLUTESSCALLBACK_THREEDOTS, 1,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	272 [Define to 1 if gluTessCallback is called with (...).])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	273 fi
9596 f26229391ea1 configure.in, aclocal.m4: check fortran integer size John W. Eaton <jwe@octave.org> parents: 9577 diff changeset	274 ])
f26229391ea1 configure.in, aclocal.m4: check fortran integer size John W. Eaton <jwe@octave.org> parents: 9577 diff changeset	275 dnl
15291 7ae14907ae43 build: Add tests for specific Qt functions to configure.ac Rik <rik@octave.org> parents: 15250 diff changeset	276 dnl Check whether Qscintilla SetPlaceholderText function exists.
7ae14907ae43 build: Add tests for specific Qt functions to configure.ac Rik <rik@octave.org> parents: 15250 diff changeset	277 dnl FIXME: This test uses a version number. It potentially could
7ae14907ae43 build: Add tests for specific Qt functions to configure.ac Rik <rik@octave.org> parents: 15250 diff changeset	278 dnl be re-written to actually call the function, but is it worth it?
9519 ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	279 dnl
15291 7ae14907ae43 build: Add tests for specific Qt functions to configure.ac Rik <rik@octave.org> parents: 15250 diff changeset	280 AC_DEFUN([OCTAVE_CHECK_FUNC_SETPLACEHOLDERTEXT], [
7ae14907ae43 build: Add tests for specific Qt functions to configure.ac Rik <rik@octave.org> parents: 15250 diff changeset	281 AC_CACHE_CHECK([whether Qt has SetPlaceholderText function],
7ae14907ae43 build: Add tests for specific Qt functions to configure.ac Rik <rik@octave.org> parents: 15250 diff changeset	282 [octave_cv_func_setplaceholdertext],
7ae14907ae43 build: Add tests for specific Qt functions to configure.ac Rik <rik@octave.org> parents: 15250 diff changeset	283 [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	284 ac_octave_save_CPPFLAGS="$CPPFLAGS"
15596 5f031158c693 Use pkg-config to discover Qt (pkg-config is already a requirement anyway). Michael Goffioul <michael.goffioul@gmail.com> parents: 15360 diff changeset	285 CPPFLAGS="$QT_CPPFLAGS $CPPFLAGS"
15291 7ae14907ae43 build: Add tests for specific Qt functions to configure.ac Rik <rik@octave.org> parents: 15250 diff changeset	286 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
7ae14907ae43 build: Add tests for specific Qt functions to configure.ac Rik <rik@octave.org> parents: 15250 diff changeset	287 #include <Qt/qglobal.h>
7ae14907ae43 build: Add tests for specific Qt functions to configure.ac Rik <rik@octave.org> parents: 15250 diff changeset	288 ]], [[
7ae14907ae43 build: Add tests for specific Qt functions to configure.ac Rik <rik@octave.org> parents: 15250 diff changeset	289 #if QT_VERSION < 0x040700
15295 43e484fa7e42 build: Clean up configure macros for building GUI. Rik <rik@octave.org> parents: 15294 diff changeset	290 #error No SetPlacholderText function available.
15291 7ae14907ae43 build: Add tests for specific Qt functions to configure.ac Rik <rik@octave.org> parents: 15250 diff changeset	291 #endif
7ae14907ae43 build: Add tests for specific Qt functions to configure.ac Rik <rik@octave.org> parents: 15250 diff changeset	292 ]])],
7ae14907ae43 build: Add tests for specific Qt functions to configure.ac Rik <rik@octave.org> parents: 15250 diff changeset	293 octave_cv_func_setplaceholdertext=yes,
7ae14907ae43 build: Add tests for specific Qt functions to configure.ac Rik <rik@octave.org> parents: 15250 diff changeset	294 octave_cv_func_setplaceholdertext=no)
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	295 CPPFLAGS="$ac_octave_save_CPPFLAGS"
15291 7ae14907ae43 build: Add tests for specific Qt functions to configure.ac Rik <rik@octave.org> parents: 15250 diff changeset	296 AC_LANG_POP(C++)
7ae14907ae43 build: Add tests for specific Qt functions to configure.ac Rik <rik@octave.org> parents: 15250 diff changeset	297 ])
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	298 if test $octave_cv_func_setplaceholdertext = yes; then
15291 7ae14907ae43 build: Add tests for specific Qt functions to configure.ac Rik <rik@octave.org> parents: 15250 diff changeset	299 AC_DEFINE(HAVE_SETPLACEHOLDERTEXT, 1,
7ae14907ae43 build: Add tests for specific Qt functions to configure.ac Rik <rik@octave.org> parents: 15250 diff changeset	300 [Define to 1 if you have the Qt SetPlaceholderText function.])
7ae14907ae43 build: Add tests for specific Qt functions to configure.ac Rik <rik@octave.org> parents: 15250 diff changeset	301 fi
7ae14907ae43 build: Add tests for specific Qt functions to configure.ac Rik <rik@octave.org> parents: 15250 diff changeset	302 ])
7ae14907ae43 build: Add tests for specific Qt functions to configure.ac Rik <rik@octave.org> parents: 15250 diff changeset	303 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	304 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	305 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	306 AC_DEFUN([OCTAVE_CHECK_HDF5_HAS_VER_16_API], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	307 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	308 [octave_cv_hdf5_has_ver_16_api],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	309 [AC_LINK_IFELSE([AC_LANG_PROGRAM([[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	310 #include <hdf5.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	311 ]], [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	312 H5Eset_auto (0, 0);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	313 ]])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	314 octave_cv_hdf5_has_ver_16_api=yes,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	315 octave_cv_hdf5_has_ver_16_api=no)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	316 ])
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	317 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	318 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	319 fi
14605 28e53daab1f8 Cleanup on autoconf warnings Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14550 diff changeset	320 ])
28e53daab1f8 Cleanup on autoconf warnings Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14550 diff changeset	321 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	322 dnl Usage:
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	323 dnl OCTAVE_CHECK_LIB(LIBRARY, DOC-NAME, WARN-MSG, HEADER, FUNC,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	324 dnl LANG, DOC-STRING, EXTRA-CHECK)
14605 28e53daab1f8 Cleanup on autoconf warnings Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14550 diff changeset	325 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	326 AC_DEFUN([OCTAVE_CHECK_LIB], [
9523 0ce82753dd72 more configure changes for libraries John W. Eaton <jwe@octave.org> parents: 9520 diff changeset	327 AC_ARG_WITH([$1-includedir],
9519 ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	328 [AS_HELP_STRING([--with-$1-includedir=DIR],
ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	329 [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	330 [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	331 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	332
9523 0ce82753dd72 more configure changes for libraries John W. Eaton <jwe@octave.org> parents: 9520 diff changeset	333 AC_ARG_WITH([$1-libdir],
9519 ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	334 [AS_HELP_STRING([--with-$1-libdir=DIR],
ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	335 [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	336 [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	337 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	338
9523 0ce82753dd72 more configure changes for libraries John W. Eaton <jwe@octave.org> parents: 9520 diff changeset	339 AC_ARG_WITH([$1],
0ce82753dd72 more configure changes for libraries John W. Eaton <jwe@octave.org> parents: 9520 diff changeset	340 [m4_ifblank([$7],
0ce82753dd72 more configure changes for libraries John W. Eaton <jwe@octave.org> parents: 9520 diff changeset	341 [AS_HELP_STRING([--without-$1], [don't use $2 library])],
0ce82753dd72 more configure changes for libraries John W. Eaton <jwe@octave.org> parents: 9520 diff changeset	342 [AS_HELP_STRING([--without-$1], [$7])])],
9519 ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	343 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	344
ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	345 m4_toupper([$1])_LIBS=
ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	346 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	347 no)
41a74dcd14df Clear QHULL_LIBS etc on errors. Interpret --without-qhull etc correctly. David Grundberg <individ@acc.umu.se> parents: 9531 diff changeset	348 m4_toupper([$1])_LIBS=
41a74dcd14df Clear QHULL_LIBS etc on errors. Interpret --without-qhull etc correctly. David Grundberg <individ@acc.umu.se> parents: 9531 diff changeset	349 ;;
9519 ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	350 yes \| "")
ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	351 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	352 ;;
ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	353 -* \| / \| .a \| .so \| .so. \| *.o)
ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	354 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	355 ;;
ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	356 *)
ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	357 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	358 ;;
ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	359 esac
ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	360
ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	361 [TEXINFO_]m4_toupper([$1])=
ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	362 warn_$1="$3"
14605 28e53daab1f8 Cleanup on autoconf warnings Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14550 diff changeset	363 m4_set_add([summary_warning_list], [warn_$1])
28e53daab1f8 Cleanup on autoconf warnings Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14550 diff changeset	364
9519 ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	365 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	366 ac_octave_save_CPPFLAGS="$CPPFLAGS"
15350 6a0c0d3d60b6 build: Implement some caching for OCTAVE_CHECK_LIB macro. Rik <rik@octave.org> parents: 15338 diff changeset	367 ac_octave_save_LDFLAGS="$LDFLAGS"
6a0c0d3d60b6 build: Implement some caching for OCTAVE_CHECK_LIB macro. Rik <rik@octave.org> parents: 15338 diff changeset	368 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	369 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	370 LDFLAGS="$m4_toupper([$1])_LDFLAGS $LDFLAGS"
6a0c0d3d60b6 build: Implement some caching for OCTAVE_CHECK_LIB macro. Rik <rik@octave.org> parents: 15338 diff changeset	371 LIBS="$m4_toupper([$1])_LIBS $LIBS"
9523 0ce82753dd72 more configure changes for libraries John W. Eaton <jwe@octave.org> parents: 9520 diff changeset	372 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	373 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	374 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	375 [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	376 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	377 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	378 [octave_cv_lib_$1],
6a0c0d3d60b6 build: Implement some caching for OCTAVE_CHECK_LIB macro. Rik <rik@octave.org> parents: 15338 diff changeset	379 [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	380 [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	381 ])
6a0c0d3d60b6 build: Implement some caching for OCTAVE_CHECK_LIB macro. Rik <rik@octave.org> parents: 15338 diff changeset	382 if test "$octave_cv_lib_$1" = yes; then
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	383 m4_ifblank([$8], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	384 warn_$1=
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	385 AC_DEFINE([HAVE_]m4_toupper([$1]), 1,
15063 36cbcc37fdb8 Refactor configure.ac to make it more understandable. Rik <rik@octave.org> parents: 15013 diff changeset	386 [Define to 1 if $2 is available.])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	387 [TEXINFO_]m4_toupper([$1])="@set [HAVE_]m4_toupper([$1])"], [$8])
9519 ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	388 fi
9568 d3fccc4c4b9e use OCTAVE_CHECK_LIBRARY to check for ARPACK John W. Eaton <jwe@octave.org> parents: 9543 diff changeset	389 fi
9523 0ce82753dd72 more configure changes for libraries John W. Eaton <jwe@octave.org> parents: 9520 diff changeset	390 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	391 CPPFLAGS="$ac_octave_save_CPPFLAGS"
15350 6a0c0d3d60b6 build: Implement some caching for OCTAVE_CHECK_LIB macro. Rik <rik@octave.org> parents: 15338 diff changeset	392 LDFLAGS="$ac_octave_save_LDFLAGS"
6a0c0d3d60b6 build: Implement some caching for OCTAVE_CHECK_LIB macro. Rik <rik@octave.org> parents: 15338 diff changeset	393 LIBS="$ac_octave_save_LIBS"
9519 ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	394 fi
15350 6a0c0d3d60b6 build: Implement some caching for OCTAVE_CHECK_LIB macro. Rik <rik@octave.org> parents: 15338 diff changeset	395
9519 ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	396 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	397 AC_SUBST([TEXINFO_]m4_toupper([$1]))
ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	398 if test -n "$warn_$1"; then
10012 2441327485a3 use m4 quating in aclocal.m4 autoconf macros with variable expansion Rik <rdrider0-list@yahoo.com> parents: 10011 diff changeset	399 AC_MSG_WARN([$warn_$1])
9539 41a74dcd14df Clear QHULL_LIBS etc on errors. Interpret --without-qhull etc correctly. David Grundberg <individ@acc.umu.se> parents: 9531 diff changeset	400 m4_toupper([$1])_LIBS=
9519 ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	401 fi
ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	402 ])
ee99f9f37505 improve configure checks for qhull and curl libs John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	403 dnl
15133 f91eac1bc66d m4/acinclude.m4: Correct typos, use consistent style for describing macros. Rik <rik@octave.org> parents: 15126 diff changeset	404 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	405 dnl
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	406 dnl Using a pure Fortran program doesn't seem to crash when linked
15133 f91eac1bc66d m4/acinclude.m4: Correct typos, use consistent style for describing macros. Rik <rik@octave.org> parents: 15126 diff changeset	407 dnl with the buggy ARPACK library but the C++ program does. Maybe it
f91eac1bc66d m4/acinclude.m4: Correct typos, use consistent style for describing macros. Rik <rik@octave.org> parents: 15126 diff changeset	408 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	409 dnl allocated arrays in Fortran does not?
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	410 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	411 AC_DEFUN([OCTAVE_CHECK_LIB_ARPACK_OK], [
14144 834df9f10963 remove ARPACK files from sources and restore configure checks for external ARPACK library John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	412 AC_CACHE_CHECK([whether the arpack library works],
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	413 [octave_cv_lib_arpack_ok],
15294 d1751eee9a42 acinclude.m4: Use AC_LANG_PUSH macro with AC_CACHE_CHECK for greater efficiency. Rik <rik@octave.org> parents: 15293 diff changeset	414 [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	415 AC_RUN_IFELSE([AC_LANG_PROGRAM([[
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	416 // External functions from ARPACK library
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	417 extern "C" int
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	418 F77_FUNC (dnaupd, DNAUPD) (int&, const char , const int&, const char ,
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	419 int&, const double&, double*, const int&,
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	420 double, const int&, int, int, double,
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	421 double*, const int&, int&, long int, long int);
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	422
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	423 extern "C" int
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	424 F77_FUNC (dneupd, DNEUPD) (const int&, const char , int, double*,
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	425 double, double, const int&,
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	426 const double&, const double&, double*,
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	427 const char, const int&, const char ,
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	428 int&, const double&, double*, const int&,
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	429 double, const int&, int, int, double,
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	430 double*, const int&, int&, long int,
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	431 long int, long int);
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	432
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	433 extern "C" int
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	434 F77_FUNC (dgemv, DGEMV) (const char *, const int&, const int&,
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	435 const double&, const double*, const int&,
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	436 const double*, const int&, const double&,
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	437 double*, const int&, long int);
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	438
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	439 #include <cfloat>
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	440
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	441 void
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	442 doit (void)
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	443 {
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	444 // 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	445
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	446 // Problem matrix. See bug #31479
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	447 int n = 4;
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	448 double m = new double [n n];
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	449 m[0] = 1, m[4] = 0, m[8] = 0, m[12] = -1;
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	450 m[1] = 0, m[5] = 1, m[9] = 0, m[13] = 0;
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	451 m[2] = 0, m[6] = 0, m[10] = 1, m[14] = 0;
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	452 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	453
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	454 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	455
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	456 resid[0] = 0.960966;
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	457 resid[1] = 0.741195;
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	458 resid[2] = 0.150143;
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	459 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	460
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	461 int *ip = new 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	462
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	463 ip[0] = 1; // ishift
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	464 ip[1] = 0; // ip[1] not referenced
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	465 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	466 ip[3] = 1; // NB blocksize in recurrence
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	467 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	468 ip[5] = 0; // ip[5] not referenced
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	469 ip[6] = 1; // mode
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	470 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	471 ip[8] = 0;
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	472 ip[9] = 0;
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	473 ip[10] = 0;
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	474
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	475 int *ipntr = new 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	476
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	477 int k = 1;
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	478 int p = 3;
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	479 int lwork = 3 * p * (p + 2);
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	480
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	481 double v = new double [n (p + 1)];
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	482 double *workl = new double [lwork + 1];
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	483 double workd = new double [3 n + 1];
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	484
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	485 int ido = 0;
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	486 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	487
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	488 double tol = DBL_EPSILON;
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	489
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	490 do
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	491 {
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	492 F77_FUNC (dnaupd, DNAUPD) (ido, "I", n, "LM", k, tol, resid, p,
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	493 v, n, ip, ipntr, workd, workl, lwork,
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	494 info, 1L, 2L);
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	495
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	496 if (ido == -1 \|\| ido == 1 \|\| ido == 2)
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	497 {
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	498 double *x = workd + ipntr[0] - 1;
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	499 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	500
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	501 F77_FUNC (dgemv, DGEMV) ("N", n, n, 1.0, m, n, x, 1, 0.0,
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	502 y, 1, 1L);
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	503 }
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	504 else
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	505 {
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	506 if (info < 0)
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	507 {
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	508 return; // Error
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	509 }
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	510
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	511 break;
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	512 }
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	513 }
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	514 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	515
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	516 int *sel = new 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	517
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	518 // 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	519 double *dr = new double [k + 1];
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	520 double *di = new double [k + 1];
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	521 double workev = new double [3 p];
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	522
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	523 for (int i = 0; i < k + 1; i++)
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	524 dr[i] = di[i] = 0.;
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	525
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	526 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	527
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	528 double sigmar = 0.0;
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	529 double sigmai = 0.0;
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	530
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	531 // 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	532 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	533
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	534 F77_FUNC (dneupd, DNEUPD) (rvec, "A", sel, dr, di, z, n, sigmar,
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	535 sigmai, workev, "I", n, "LM", k, tol,
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	536 resid, p, v, n, ip, ipntr, workd,
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	537 workl, lwork, info, 1L, 1L, 2L);
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	538 }
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	539
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	540 ]], [[
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	541
14147 71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	542 for (int i = 0; i < 10; i++)
71e28fda7be9 use C++ program to test ARPACK John W. Eaton <jwe@octave.org> parents: 14144 diff changeset	543 doit ();
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	544 ]])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	545 octave_cv_lib_arpack_ok=yes,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	546 octave_cv_lib_arpack_ok=no,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	547 octave_cv_lib_arpack_ok=yes)
15294 d1751eee9a42 acinclude.m4: Use AC_LANG_PUSH macro with AC_CACHE_CHECK for greater efficiency. Rik <rik@octave.org> parents: 15293 diff changeset	548 AC_LANG_POP(C++)
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	549 ])
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	550 if test $octave_cv_lib_arpack_ok = yes; then
14144 834df9f10963 remove ARPACK files from sources and restore configure checks for external ARPACK library John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	551 $1
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	552 :
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	553 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	554 $2
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	555 :
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	556 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	557 ])
834df9f10963 remove ARPACK files from sources and restore configure checks for external ARPACK library John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	558 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	559 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	560 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	561 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	562 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	563 AC_DEFUN([OCTAVE_CHECK_LIB_HDF5_DLL], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	564 AC_CACHE_CHECK([if _HDF5USEDLL_ needs to be defined],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	565 [octave_cv_lib_hdf5_dll],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	566 [AC_LINK_IFELSE([AC_LANG_PROGRAM([[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	567 #include <hdf5.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	568 ]], [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	569 hid_t x = H5T_NATIVE_DOUBLE;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	570 return x
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	571 ]])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	572 [octave_cv_lib_hdf5_dll=no],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	573 [save_CFLAGS="$CFLAGS"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	574 CFLAGS="$CFLAGS -DWIN32 -D_HDF5USEDLL_"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	575 save_LIBS="$LIBS"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	576 LIBS="$HDF5_LIBS $LIBS"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	577 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	578 #include <hdf5.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	579 ]], [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	580 hid_t x = H5T_NATIVE_DOUBLE;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	581 return x
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	582 ]])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	583 octave_cv_lib_hdf5_dll=yes,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	584 octave_cv_lib_hdf5_dll=no)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	585 CFLAGS="$save_CFLAGS"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	586 LIBS="$save_LIBS"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	587 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	588 ])
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	589 if test $octave_cv_lib_hdf5_dll = yes; then
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	590 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	591 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	592 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	593 dnl
15133 f91eac1bc66d m4/acinclude.m4: Correct typos, use consistent style for describing macros. Rik <rik@octave.org> parents: 15126 diff changeset	594 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	595 dnl
15063 36cbcc37fdb8 Refactor configure.ac to make it more understandable. Rik <rik@octave.org> parents: 15013 diff changeset	596 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	597 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	598 dnl
15063 36cbcc37fdb8 Refactor configure.ac to make it more understandable. Rik <rik@octave.org> parents: 15013 diff changeset	599 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	600 dnl libraries and header files?
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: 7361 diff changeset	601 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	602 AC_DEFUN([OCTAVE_CHECK_LIB_OPENGL], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	603 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	604
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	605 ## On MacOSX systems the OpenGL framework can be used
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	606 OCTAVE_HAVE_FRAMEWORK(OpenGL, [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	607 #include <OpenGL/gl.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	608 #include <OpenGL/glu.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	609 ]], [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	610 GLint par; glGetIntegerv (GL_VIEWPORT, &par);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	611 ]],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	612 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	613
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	614 if test $have_framework_opengl = yes; then
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	615 AC_DEFINE(HAVE_FRAMEWORK_OPENGL, 1,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	616 [Define to 1 if framework OPENGL is available.])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	617 OPENGL_LIBS="-Wl,-framework -Wl,OpenGL"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	618 AC_MSG_NOTICE([adding -Wl,-framework -Wl,OpenGL to OPENGL_LIBS])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	619 OCTAVE_CHECK_FUNC_GLUTESSCALLBACK_THREEDOTS
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	620 else
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	621 case $canonical_host_type in
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	622 --mingw32* \| --msdosmsvc)
15319 daf74ce2afdc m4/acinclude.m4: Use more consistent m4 quoting of arguments to macros. Rik <rik@octave.org> parents: 15302 diff changeset	623 AC_CHECK_HEADERS([windows.h])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	624 ;;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	625 esac
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	626 have_opengl_incs=no
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	627 AC_CHECK_HEADERS([GL/gl.h OpenGL/gl.h],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	628 [AC_CHECK_HEADERS([GL/glu.h OpenGL/glu.h],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	629 [have_opengl_incs=yes; break], [], [
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: 7361 diff changeset	630 #ifdef HAVE_WINDOWS_H
7954 3ffc34caec65 configure fixes John W. Eaton <jwe@octave.org> parents: 7945 diff changeset	631 #include <windows.h>
3ffc34caec65 configure fixes John W. Eaton <jwe@octave.org> parents: 7945 diff changeset	632 #endif
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	633 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	634 break
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	635 ], [], [
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: 7361 diff changeset	636 #ifdef HAVE_WINDOWS_H
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	637 # include <windows.h>
7954 3ffc34caec65 configure fixes John W. Eaton <jwe@octave.org> parents: 7945 diff changeset	638 #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	639 ])
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	640
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	641 if test "$have_opengl_incs" = yes; then
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	642 case $canonical_host_type in
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	643 --mingw32* \| --msdosmsvc)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	644 save_LIBS="$LIBS"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	645 LIBS="$LIBS -lopengl32"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	646 AC_MSG_CHECKING([for glEnable in -lopengl32])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	647 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	648 #if HAVE_WINDOWS_H
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	649 # include <windows.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	650 #endif
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	651 #if defined (HAVE_GL_GL_H)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	652 # include <GL/gl.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	653 #elif defined (HAVE_OPENGL_GL_H)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	654 # include <OpenGL/gl.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	655 #endif
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	656 ]], [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	657 glEnable(GL_SMOOTH);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	658 ]])], [OPENGL_LIBS="-lopengl32 -lglu32"])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	659
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	660 LIBS="$save_LIBS"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	661 if test "x$OPENGL_LIBS" != "x"; then
15319 daf74ce2afdc m4/acinclude.m4: Use more consistent m4 quoting of arguments to macros. Rik <rik@octave.org> parents: 15302 diff changeset	662 AC_MSG_RESULT([yes])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	663 else
15319 daf74ce2afdc m4/acinclude.m4: Use more consistent m4 quoting of arguments to macros. Rik <rik@octave.org> parents: 15302 diff changeset	664 AC_MSG_RESULT([no])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	665 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	666 ;;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	667 *)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	668 ## 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	669 AC_CHECK_LIB([GL], [glEnable], [OPENGL_LIBS="-lGL -lGLU"])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	670 ;;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	671 esac
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	672 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	673 fi
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	674 AC_SUBST(OPENGL_LIBS)
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: 7361 diff changeset	675 ])
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: 7825 diff changeset	676 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	677 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	678 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	679 AC_DEFUN([OCTAVE_CHECK_LIB_QHULL_OK], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	680 AC_CACHE_CHECK([whether the qhull library works],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	681 [octave_cv_lib_qhull_ok],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	682 [AC_RUN_IFELSE([AC_LANG_PROGRAM([[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	683 #include <stdio.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	684 #if defined (HAVE_LIBQHULL_LIBQHULL_H)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	685 # include <libqhull/libqhull.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	686 # include <libqhull/qset.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	687 # include <libqhull/geom.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	688 # include <libqhull/poly.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	689 # include <libqhull/io.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	690 #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	691 # if defined (HAVE_QHULL_LIBQHULL_H)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	692 # include <qhull/libqhull.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	693 # else
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	694 # include <qhull/qhull.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	695 # endif
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	696 # include <qhull/qset.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	697 # include <qhull/geom.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	698 # include <qhull/poly.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	699 # include <qhull/io.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	700 #elif defined (HAVE_LIBQHULL_H) \|\| defined (HAVE_QHULL_H)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	701 # if defined (HAVE_LIBQHULL_H)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	702 # include <libqhull.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	703 # else
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	704 # include <qhull.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	705 # endif
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	706 # include <qset.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	707 # include <geom.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	708 # include <poly.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	709 # include <io.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	710 #endif
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	711 #ifdef NEED_QHULL_VERSION
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	712 char *qh_version = "version";
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	713 #endif
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	714 ]], [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	715 int dim = 2;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	716 int n = 4;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	717 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	718 boolT ismalloc = 0;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	719 return qh_new_qhull (dim, n, points, ismalloc, "qhull ", 0, stderr);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	720 ]])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	721 octave_cv_lib_qhull_ok=yes,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	722 octave_cv_lib_qhull_ok=no,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	723 octave_cv_lib_qhull_ok=yes)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	724 ])
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	725 if test $octave_cv_lib_qhull_ok = yes; then
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	726 $1
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	727 :
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	728 else
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	729 $2
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	730 :
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	731 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	732 ])
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	733 dnl
15302 a8cfbc1911e4 build: Set TERM_LIBS before checking for READLINE. Rik <rik@octave.org> parents: 15295 diff changeset	734 dnl Find a suitable termlib to use.
a8cfbc1911e4 build: Set TERM_LIBS before checking for READLINE. Rik <rik@octave.org> parents: 15295 diff changeset	735 dnl
a8cfbc1911e4 build: Set TERM_LIBS before checking for READLINE. Rik <rik@octave.org> parents: 15295 diff changeset	736 AC_DEFUN([OCTAVE_CHECK_LIB_TERMLIB], [
a8cfbc1911e4 build: Set TERM_LIBS before checking for READLINE. Rik <rik@octave.org> parents: 15295 diff changeset	737 TERM_LIBS=
15338 dc39c1d84c5b build: Use caching on more intermediate results to speed up configure. Rik <rik@octave.org> parents: 15336 diff changeset	738 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	739 AC_SEARCH_LIBS([tputs],
dc39c1d84c5b build: Use caching on more intermediate results to speed up configure. Rik <rik@octave.org> parents: 15336 diff changeset	740 [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	741 [], [])
dc39c1d84c5b build: Use caching on more intermediate results to speed up configure. Rik <rik@octave.org> parents: 15336 diff changeset	742 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	743 case "$ac_cv_search_tputs" in
dc39c1d84c5b build: Use caching on more intermediate results to speed up configure. Rik <rik@octave.org> parents: 15336 diff changeset	744 -l*)
dc39c1d84c5b build: Use caching on more intermediate results to speed up configure. Rik <rik@octave.org> parents: 15336 diff changeset	745 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	746 ;;
dc39c1d84c5b build: Use caching on more intermediate results to speed up configure. Rik <rik@octave.org> parents: 15336 diff changeset	747 no)
dc39c1d84c5b build: Use caching on more intermediate results to speed up configure. Rik <rik@octave.org> parents: 15336 diff changeset	748 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	749 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	750 ;;
dc39c1d84c5b build: Use caching on more intermediate results to speed up configure. Rik <rik@octave.org> parents: 15336 diff changeset	751 esac
15302 a8cfbc1911e4 build: Set TERM_LIBS before checking for READLINE. Rik <rik@octave.org> parents: 15295 diff changeset	752
15338 dc39c1d84c5b build: Use caching on more intermediate results to speed up configure. Rik <rik@octave.org> parents: 15336 diff changeset	753 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	754 dnl
dc39c1d84c5b build: Use caching on more intermediate results to speed up configure. Rik <rik@octave.org> parents: 15336 diff changeset	755 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	756 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	757 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	758 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	759 dnl break])
dc39c1d84c5b build: Use caching on more intermediate results to speed up configure. Rik <rik@octave.org> parents: 15336 diff changeset	760 dnl done
dc39c1d84c5b build: Use caching on more intermediate results to speed up configure. Rik <rik@octave.org> parents: 15336 diff changeset	761
15302 a8cfbc1911e4 build: Set TERM_LIBS before checking for READLINE. Rik <rik@octave.org> parents: 15295 diff changeset	762 AC_SUBST(TERM_LIBS)
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: 7361 diff changeset	763 ])
7834 caab78e7e377 added checks for fltk & freetype in configure script Shai Ayal <shaiay@sourceforge.net> parents: 7825 diff changeset	764 dnl
15133 f91eac1bc66d m4/acinclude.m4: Correct typos, use consistent style for describing macros. Rik <rik@octave.org> parents: 15126 diff changeset	765 dnl Check for support of OpenMP with a given compiler flag.
f91eac1bc66d m4/acinclude.m4: Correct typos, use consistent style for describing macros. Rik <rik@octave.org> parents: 15126 diff changeset	766 dnl If found define HAVE_OPENMP and add the compile flag
f91eac1bc66d m4/acinclude.m4: Correct typos, use consistent style for describing macros. Rik <rik@octave.org> parents: 15126 diff changeset	767 dnl to CFLAGS and CXXFLAGS.
10471 bcabc1c4f20c Add detection of OpenMP support to configure. Disabled by default David Bateman <dbateman@free.fr> parents: 10380 diff changeset	768 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	769 AC_DEFUN([OCTAVE_CHECK_OPENMP], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	770 AC_MSG_CHECKING([for support of OpenMP])
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	771 ac_octave_save_CFLAGS="$CFLAGS"
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	772 CFLAGS="$CFLAGS $1"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	773 AC_CACHE_VAL([octave_cv_check_openmp],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	774 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	775 #include <omp.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	776 #include <stdio.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	777 ]], [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	778 int main(int argc, char* argv[])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	779 {
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	780 _Pragma("omp parallel")
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	781 printf("Hello, world.\n");
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	782 return 0;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	783 }
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	784 ]])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	785 octave_cv_openmp=yes, octave_cv_openmmp=no, octave_cv_openmp=no)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	786 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	787 AC_MSG_RESULT([$octave_cv_openmp])
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	788 if test $octave_cv_openmp = yes; then
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	789 AC_DEFINE(HAVE_OPENMP, 1, [Define to 1 if compiler supports OpenMP.])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	790 CXXFLAGS="$CXXFLAGS $1"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	791 else
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	792 CFLAGS="$ac_octave_save_CFLAGS"
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	793 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	794 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	795 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	796 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	797 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	798 AC_DEFUN([OCTAVE_CHECK_QHULL_VERSION], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	799 AC_CACHE_CHECK([for qh_version in $QHULL_LIBS],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	800 [octave_cv_lib_qhull_version],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	801 [AC_LINK_IFELSE([AC_LANG_PROGRAM([[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	802 #include <stdio.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	803 #if defined (HAVE_LIBQHULL_LIBQHULL_H)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	804 # include <libqhull/libqhull.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	805 # include <libqhull/qset.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	806 # include <libqhull/geom.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	807 # include <libqhull/poly.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	808 # include <libqhull/io.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	809 #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	810 # if defined (HAVE_QHULL_LIBQHULL_H)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	811 # include <qhull/libqhull.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	812 # else
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	813 # include <qhull/qhull.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	814 # endif
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	815 # include <qhull/qset.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	816 # include <qhull/geom.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	817 # include <qhull/poly.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	818 # include <qhull/io.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	819 #elif defined (HAVE_LIBQHULL_H) \|\| defined (HAVE_QHULL_H)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	820 # if defined (HAVE_LIBQHULL_H)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	821 # include <libqhull.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	822 # else
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	823 # include <qhull.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	824 # endif
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	825 # include <qset.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	826 # include <geom.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	827 # include <poly.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	828 # include <io.h>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	829 #endif
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	830 ]], [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	831 const char *tmp = qh_version;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	832 ]])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	833 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	834 ])
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	835 if test $octave_cv_lib_qhull_version = no; then
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	836 AC_DEFINE(NEED_QHULL_VERSION, 1,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	837 [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	838 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	839 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	840 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	841 dnl Check if the default Fortran INTEGER is 64 bits wide.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	842 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	843 AC_DEFUN([OCTAVE_CHECK_SIZEOF_FORTRAN_INTEGER], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	844 AC_CACHE_CHECK([whether $F77 generates correct size integers],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	845 [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	846 [ac_octave_save_FFLAGS="$FFLAGS"
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	847 FFLAGS="$FFLAGS $F77_INTEGER_8_FLAG"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	848 AC_LANG_PUSH(Fortran 77)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	849 AC_COMPILE_IFELSE(
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	850 [[ subroutine foo(n, in, out)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	851 integer n, in(n), out(n)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	852 integer i
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	853 do 10 i = 1, n
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	854 out(i) = in(i)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	855 10 continue
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	856 return
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	857 end
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	858 ]],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	859 [mv conftest.$ac_objext fintsize.$ac_objext
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	860 ac_octave_save_LIBS="$LIBS"
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	861 LIBS="fintsize.$ac_objext $[]_AC_LANG_PREFIX[]LIBS"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	862 AC_LANG_PUSH(C)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	863 AC_RUN_IFELSE([AC_LANG_PROGRAM([[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	864 #include <assert.h> ]], [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	865 #ifdef USE_64_BIT_IDX_T
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	866 #if IDX_TYPE_LONG
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	867 typedef long octave_idx_type;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	868 #else
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	869 typedef int octave_idx_type;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	870 #endif
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	871 #else
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	872 typedef int octave_idx_type;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	873 #endif
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	874 octave_idx_type n = 2;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	875 octave_idx_type in[2];
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	876 octave_idx_type out[2];
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	877 in[0] = 13;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	878 in[0] = 42;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	879 F77_FUNC(foo,FOO) (&n, &in, &out);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	880 assert (in[0] == out[0] && in[1] == out[1]);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	881 ]])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	882 octave_cv_sizeof_fortran_integer=yes,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	883 octave_cv_sizeof_fortran_integer=no,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	884 octave_cv_sizeof_fortran_integer=yes)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	885 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	886 LIBS="$ac_octave_save_LIBS"
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	887 rm -f conftest.$ac_objext fintsize.$ac_objext],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	888 [rm -f conftest.$ac_objext
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	889 AC_MSG_FAILURE([cannot compile a simple Fortran program])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	890 octave_cv_sizeof_fortran_integer=no])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	891 AC_LANG_POP(Fortran 77)
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	892 FFLAGS="$ac_octave_save_FFLAGS"
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	893 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	894 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	895 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	896 dnl Add warning to final summary.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	897 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	898 AC_DEFUN([OCTAVE_CONFIGURE_WARNING], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	899 AC_MSG_WARN([$][$1])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	900 m4_set_add([summary_warning_list], [$1])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	901 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	902 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	903 dnl Print final summary.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	904 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	905 AC_DEFUN([OCTAVE_CONFIGURE_WARNING_SUMMARY], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	906 m4_set_foreach([summary_warning_list], [elt], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	907 if test -n "[$]elt"; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	908 AC_MSG_WARN([$]elt)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	909 warn_msg_printed=true
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	910 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	911 ])
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	912 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	913 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	914 dnl templates defined.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	915 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	916 AC_DEFUN([OCTAVE_CXX_BITWISE_OP_TEMPLATES], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	917 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	918 [octave_cv_cxx_bitwise_op_templates],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	919 [AC_LANG_PUSH(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	920 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	921 #include <functional>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	922 ]], [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	923 int x = 0;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	924 int y = 1;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	925 int z1 = std::bit_and<int>() (x, y);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	926 int z2 = std::bit_or<int>() (x, y);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	927 int z3 = std::bit_xor<int>() (x, y);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	928 ]])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	929 octave_cv_cxx_bitwise_op_templates=yes,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	930 octave_cv_cxx_bitwise_op_templates=no)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	931 AC_LANG_POP(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	932 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	933 if test $octave_cv_cxx_bitwise_op_templates = yes; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	934 AC_DEFINE(HAVE_CXX_BITWISE_OP_TEMPLATES, 1,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	935 [Define to 1 if C++ library has templated bitwise operators.])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	936 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	937 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	938 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	939 dnl Check if C++ reinterpret cast works for function pointers.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	940 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	941 AC_DEFUN([OCTAVE_CXX_BROKEN_REINTERPRET_CAST],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	942 [AC_REQUIRE([AC_PROG_CXX])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	943 AC_CACHE_CHECK([for broken C++ reinterpret_cast],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	944 [octave_cv_cxx_broken_reinterpret_cast],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	945 [AC_LANG_PUSH(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	946 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	947 #include <cmath> ]], [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	948 typedef double (*fptr) (double);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	949 fptr psin = sin;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	950 void vptr = reinterpret_cast<void > (psin);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	951 psin = reinterpret_cast<fptr> (vptr);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	952 ]])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	953 octave_cv_cxx_broken_reinterpret_cast=no,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	954 octave_cv_cxx_broken_reinterpret_cast=yes)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	955 AC_LANG_POP(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	956 ])
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	957 if test $octave_cv_cxx_broken_reinterpret_cast = yes; then
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	958 AC_DEFINE(CXX_BROKEN_REINTERPRET_CAST, 1,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	959 [Define to 1 if C++ reinterpret_cast fails for function pointers.])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	960 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	961 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	962 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	963 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	964 dnl parts of complex numbers independently via references.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	965 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	966 AC_DEFUN([OCTAVE_CXX_COMPLEX_REFERENCE_ACCESSORS], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	967 AC_CACHE_CHECK([whether complex class can reference components independently],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	968 [octave_cv_cxx_complex_reference_accessors],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	969 [AC_LANG_PUSH(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	970 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	971 #include <complex>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	972 ]], [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	973 std::complex<double> x;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	974 x.real () = 1.0;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	975 x.imag () = 1.0;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	976 ]])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	977 octave_cv_cxx_complex_reference_accessors=yes,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	978 octave_cv_cxx_complex_reference_accessors=no)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	979 AC_LANG_POP(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	980 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	981 if test $octave_cv_cxx_complex_reference_accessors = yes; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	982 AC_DEFINE(HAVE_CXX_COMPLEX_REFERENCE_ACCESSORS, 1,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	983 [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	984 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	985 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	986 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	987 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	988 dnl parts of complex numbers independently.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	989 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	990 AC_DEFUN([OCTAVE_CXX_COMPLEX_SETTERS], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	991 AC_CACHE_CHECK([whether complex class can set components independently],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	992 [octave_cv_cxx_complex_setters],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	993 [AC_LANG_PUSH(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	994 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	995 #include <complex>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	996 ]], [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	997 std::complex<double> x;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	998 x.real (1.0);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	999 x.imag (2.0);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1000 ]])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1001 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	1002 AC_LANG_POP(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1003 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1004 if test $octave_cv_cxx_complex_setters = yes; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1005 AC_DEFINE(HAVE_CXX_COMPLEX_SETTERS, 1,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1006 [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	1007 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1008 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1009 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1010 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	1011 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1012 AC_DEFUN([OCTAVE_CXX_DYNAMIC_AUTO_ARRAYS], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1013 AC_CACHE_CHECK([whether C++ supports dynamic auto arrays],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1014 [octave_cv_cxx_dynamic_auto_arrays],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1015 [AC_LANG_PUSH(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1016 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1017 void test(char *);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1018 int length();
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1019 char x[length()];
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1020 test(x);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1021 ]])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1022 octave_cv_cxx_dynamic_auto_arrays=yes,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1023 octave_cv_cxx_dynamic_auto_arrays=no)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1024 AC_LANG_POP(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1025 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1026 if test $octave_cv_cxx_dynamic_auto_arrays = yes; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1027 AC_DEFINE(HAVE_DYNAMIC_AUTO_ARRAYS, 1,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1028 [Define to 1 if C++ supports dynamic auto arrays.])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1029 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1030 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1031 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1032 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	1033 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	1034 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	1035 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1036 AC_DEFUN([OCTAVE_CXX_FLAG], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1037 ac_safe=`echo "$1" \| sed 'y%./+-:=%__p___%'`
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1038 AC_MSG_CHECKING([whether ${CXX-g++} accepts $1])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1039 AC_CACHE_VAL([octave_cv_cxx_flag_$ac_safe],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1040 [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	1041 ac_octave_save_CXXFLAGS="$CXXFLAGS"
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1042 CXXFLAGS="$CXXFLAGS $1"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1043 AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1044 eval "octave_cv_cxx_flag_$ac_safe=yes",
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1045 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	1046 CXXFLAGS="$ac_octave_save_CXXFLAGS"
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1047 AC_LANG_POP(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1048 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1049 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	1050 AC_MSG_RESULT([yes])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1051 ifelse([$2], ,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1052 [CXXFLAGS="$CXXFLAGS $1"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1053 AC_MSG_RESULT([adding $1 to CXXFLAGS])], [$2])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1054 else
15319 daf74ce2afdc m4/acinclude.m4: Use more consistent m4 quoting of arguments to macros. Rik <rik@octave.org> parents: 15302 diff changeset	1055 AC_MSG_RESULT([no])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1056 ifelse([$3], , , [$3])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1057 fi
10471 bcabc1c4f20c Add detection of OpenMP support to configure. Disabled by default David Bateman <dbateman@free.fr> parents: 10380 diff changeset	1058 ])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1059 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1060 dnl Check if the C++ library is ISO compliant.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1061 dnl FIXME: This is obviously very simplistic, and trivially fooled.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1062 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1063 AC_DEFUN([OCTAVE_CXX_ISO_COMPLIANT_LIBRARY], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1064 AC_REQUIRE([AC_PROG_CXX])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1065 AC_MSG_CHECKING([if C++ library is ISO compliant])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1066 AC_CACHE_VAL([octave_cv_cxx_iso_compliant_library],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1067 [AC_LANG_PUSH(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1068 rm -f conftest.h
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1069 ## Omitting cwctype for now, since it is broken with gcc-3.0.x and
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1070 ## possibly other versions...
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1071 for inc in algorithm bitset cassert cctype cerrno cfloat ciso646 \
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1072 climits clocale cmath complex csetjmp csignal cstdarg cstddef \
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1073 cstdio cstdlib cstring ctime cwchar deque exception \
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1074 fstream functional iomanip ios iosfwd iostream istream iterator \
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1075 limits list locale map memory new numeric ostream queue set \
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1076 sstream stack stdexcept streambuf string strstream typeinfo \
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1077 utility valarray vector; do
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1078 echo "#include <$inc>" >> conftest.h
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1079 done
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1080 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1081 #include "conftest.h"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1082 ]], [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1083 std::bitset<50> flags;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1084 flags.set();
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1085 int digits = std::numeric_limits<unsigned long>::digits;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1086 digits = 0;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1087 ]])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1088 octave_cv_cxx_iso_compliant_library=yes,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1089 octave_cv_cxx_iso_compliant_library=no)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1090 AC_LANG_POP(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1091 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1092 AC_MSG_RESULT([$octave_cv_cxx_iso_compliant_library])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1093 if test $octave_cv_cxx_iso_compliant_library = yes; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1094 AC_DEFINE(CXX_ISO_COMPLIANT_LIBRARY, 1,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1095 [Define to 1 if your C++ runtime library is ISO compliant.])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1096 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1097 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1098 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1099 dnl Check if C++ compiler needs the new friend template declaration
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1100 dnl syntax.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1101 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1102 AC_DEFUN([OCTAVE_CXX_NEW_FRIEND_TEMPLATE_DECL], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1103 AC_REQUIRE([AC_PROG_CXX])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1104 AC_MSG_CHECKING([for C++ support for new friend template declaration])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1105 AC_CACHE_VAL([octave_cv_cxx_new_friend_template_decl],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1106 [AC_LANG_PUSH(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1107 rm -f conftest.h
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1108 cat > conftest.h <<EOB
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1109 struct A {
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1110 friend int operator== (const A&, const A&);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1111 A (int) { }
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1112 };
8169 66bc6f9b4f72 rewrite integer arithmetics and conversions Jaroslav Hajek <highegg@gmail.com> parents: 8019 diff changeset	1113
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1114 template <class T> int
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1115 operator== (const T&, const T&)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1116 {
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1117 return 0;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1118 }
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1119 EOB
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1120 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1121 #include "conftest.h"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1122 ]], [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1123 A a (1);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1124 return a == A(1);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1125 ]])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1126 octave_cv_cxx_new_friend_template_decl=no,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1127 octave_cv_cxx_new_friend_template_decl=yes)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1128 AC_LANG_POP(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1129 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1130 AC_MSG_RESULT([$octave_cv_cxx_new_friend_template_decl])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1131 if test $octave_cv_cxx_new_friend_template_decl = yes; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1132 AC_DEFINE(CXX_NEW_FRIEND_TEMPLATE_DECL, 1,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1133 [Define to 1 if your compiler supports `<>' stuff for template friends.])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1134 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1135 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1136 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1137 dnl Check if the compiler supports placement delete.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1138 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1139 AC_DEFUN([OCTAVE_CXX_PLACEMENT_DELETE], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1140 AC_CACHE_CHECK([whether <new> defines placement delete operator],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1141 [octave_cv_cxx_placement_delete],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1142 [AC_LANG_PUSH(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1143 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1144 #include <new>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1145 ]], [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1146 operator delete((void )0, (void )0);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1147 ]])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1148 octave_cv_cxx_placement_delete=yes,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1149 octave_cv_cxx_placement_delete=no)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1150 AC_LANG_POP(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1151 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1152 if test $octave_cv_cxx_placement_delete = yes; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1153 AC_DEFINE(HAVE_PLACEMENT_DELETE, 1,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1154 [Define to 1 if C++ supports operator delete(void , void ).])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1155 fi
8998 a48fba01e4ac optimize isnan/isinf/isfinite mappers Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1156 ])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1157 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1158 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	1159 dnl readline.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1160 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1161 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	1162 USE_READLINE=yes
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1163 READLINE_LIBS=
15319 daf74ce2afdc m4/acinclude.m4: Use more consistent m4 quoting of arguments to macros. Rik <rik@octave.org> parents: 15302 diff changeset	1164 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	1165 [AS_HELP_STRING([--disable-readline],
c4779a180134 avoid confusing --disable-foo (default is yes) configure help messages John W. Eaton <jwe@octave.org> parents: 15166 diff changeset	1166 [use readline library])],
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1167 [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	1168 USE_READLINE=no
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1169 warn_readline="command editing and history features require GNU Readline"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1170 fi])
16068 b309a5da17f5 use yes/no instead of true/false in confgure scripts John W. Eaton <jwe@octave.org> parents: 16012 diff changeset	1171 if test $USE_READLINE = yes; then
15302 a8cfbc1911e4 build: Set TERM_LIBS before checking for READLINE. Rik <rik@octave.org> parents: 15295 diff changeset	1172 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	1173 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	1174 ac_octave_save_LIBS="$LIBS"
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1175 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	1176 AC_CHECK_LIB([readline], [rl_set_keyboard_input_timeout],
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1177 [READLINE_LIBS="-lreadline"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1178 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	1179 ],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1180 [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	1181 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	1182 ])
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	1183 LIBS="$ac_octave_save_LIBS"
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1184 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1185 AC_SUBST(READLINE_LIBS)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1186 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1187 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1188 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	1189 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	1190 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	1191 dnl the flag.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1192 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1193 AC_DEFUN([OCTAVE_F77_FLAG], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1194 ac_safe=`echo "$1" \| sed 'y%./+-:=%__p___%'`
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1195 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	1196 AC_CACHE_VAL([octave_cv_f77_flag_$ac_safe], [
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1197 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	1198 ac_octave_save_FFLAGS="$FFLAGS"
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1199 FFLAGS="$FFLAGS $1"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1200 AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1201 eval "octave_cv_f77_flag_$ac_safe=yes",
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1202 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	1203 FFLAGS="$ac_octave_save_FFLAGS"
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1204 AC_LANG_POP(Fortran 77)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1205 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1206 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	1207 AC_MSG_RESULT([yes])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1208 ifelse([$2], ,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1209 [FFLAGS="$FFLAGS $1"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1210 AC_MSG_RESULT([adding $1 to FFLAGS])], [$2])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1211 else
15319 daf74ce2afdc m4/acinclude.m4: Use more consistent m4 quoting of arguments to macros. Rik <rik@octave.org> parents: 15302 diff changeset	1212 AC_MSG_RESULT([no])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1213 ifelse([$3], , , [$3])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1214 fi
10471 bcabc1c4f20c Add detection of OpenMP support to configure. Disabled by default David Bateman <dbateman@free.fr> parents: 10380 diff changeset	1215 ])
bcabc1c4f20c Add detection of OpenMP support to configure. Disabled by default David Bateman <dbateman@free.fr> parents: 10380 diff changeset	1216 dnl
8169 66bc6f9b4f72 rewrite integer arithmetics and conversions Jaroslav Hajek <highegg@gmail.com> parents: 8019 diff changeset	1217 dnl Check whether fast signed integer arithmetics using bit tricks
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1218 dnl can be used in oct-inttypes.h. Defines HAVE_FAST_INT_OPS if
8169 66bc6f9b4f72 rewrite integer arithmetics and conversions Jaroslav Hajek <highegg@gmail.com> parents: 8019 diff changeset	1219 dnl the following conditions hold:
66bc6f9b4f72 rewrite integer arithmetics and conversions Jaroslav Hajek <highegg@gmail.com> parents: 8019 diff changeset	1220 dnl 1. Signed numbers are represented by twos complement
66bc6f9b4f72 rewrite integer arithmetics and conversions Jaroslav Hajek <highegg@gmail.com> parents: 8019 diff changeset	1221 dnl (see <http://en.wikipedia.org/wiki/Two%27s_complement>)
66bc6f9b4f72 rewrite integer arithmetics and conversions Jaroslav Hajek <highegg@gmail.com> parents: 8019 diff changeset	1222 dnl 2. static_cast to unsigned int counterpart works like interpreting
66bc6f9b4f72 rewrite integer arithmetics and conversions Jaroslav Hajek <highegg@gmail.com> parents: 8019 diff changeset	1223 dnl the signed bit pattern as unsigned (and is thus zero-cost).
66bc6f9b4f72 rewrite integer arithmetics and conversions Jaroslav Hajek <highegg@gmail.com> parents: 8019 diff changeset	1224 dnl 3. Signed addition and subtraction yield the same bit results as unsigned.
66bc6f9b4f72 rewrite integer arithmetics and conversions Jaroslav Hajek <highegg@gmail.com> parents: 8019 diff changeset	1225 dnl (We use casts to prevent optimization interference, so there is no
66bc6f9b4f72 rewrite integer arithmetics and conversions Jaroslav Hajek <highegg@gmail.com> parents: 8019 diff changeset	1226 dnl need for things like -ftrapv).
66bc6f9b4f72 rewrite integer arithmetics and conversions Jaroslav Hajek <highegg@gmail.com> parents: 8019 diff changeset	1227 dnl 4. Bit operations on signed integers work like on unsigned integers,
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1228 dnl except for the shifts. Shifts are arithmetic.
8169 66bc6f9b4f72 rewrite integer arithmetics and conversions Jaroslav Hajek <highegg@gmail.com> parents: 8019 diff changeset	1229 dnl
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1230 AC_DEFUN([OCTAVE_FAST_INT_OPS], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1231 AC_CACHE_CHECK([whether fast integer arithmetics is usable],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1232 [octave_cv_fast_int_ops],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1233 [AC_LANG_PUSH(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1234 AC_RUN_IFELSE([AC_LANG_PROGRAM([[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1235 #include <limits>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1236 template<class UT, class ST>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1237 static bool
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1238 do_test (UT, ST)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1239 {
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1240 volatile ST s = std::numeric_limits<ST>::min () / 3;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1241 volatile UT u = static_cast<UT> (s);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1242 if ((reinterpret_cast<volatile ST > (&u)) != s) return true;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1243
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1244 u = 0; u = ~u;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1245 if ((reinterpret_cast<volatile ST > (&u)) != -1) return true;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1246
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1247 ST sx, sy;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1248 sx = std::numeric_limits<ST>::max () / 2 + 1;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1249 sy = std::numeric_limits<ST>::max () / 2 + 2;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1250 if (static_cast<ST> (static_cast<UT> (sx) + static_cast<UT> (sy))
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1251 != std::numeric_limits<ST>::min () + 1) return true;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1252 if (static_cast<ST> (static_cast<UT> (sx) - static_cast<UT> (sy))
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1253 != -1) return true;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1254
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1255 if ((sx & sy) != (static_cast<UT> (sx) & static_cast<UT> (sy)))
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1256 return true;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1257 if ((sx \| sy) != (static_cast<UT> (sx) \| static_cast<UT> (sy)))
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1258 return true;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1259 if ((sx ^ sy) != (static_cast<UT> (sx) ^ static_cast<UT> (sy)))
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1260 return true;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1261 if ((-1 >> 1) != -1) return true;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1262 return false;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1263 }
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1264
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1265 #define DO_TEST(T) \
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1266 if (do_test (static_cast<unsigned T> (0), static_cast<signed T> (0)))\
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1267 return sizeof (T);
8169 66bc6f9b4f72 rewrite integer arithmetics and conversions Jaroslav Hajek <highegg@gmail.com> parents: 8019 diff changeset	1268
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1269 ]],[[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1270
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1271 DO_TEST(char)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1272 DO_TEST(short)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1273 DO_TEST(int)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1274 DO_TEST(long)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1275 #if (defined(HAVE_LONG_LONG_INT) && defined(HAVE_UNSIGNED_LONG_LONG_INT))
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1276 DO_TEST(long long)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1277 #endif
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1278 ]])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1279 octave_cv_fast_int_ops=yes,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1280 octave_cv_fast_int_ops=no,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1281 octave_cv_fast_int_ops=yes)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1282 AC_LANG_POP(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1283 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1284 if test $octave_cv_fast_int_ops = yes; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1285 AC_DEFINE(HAVE_FAST_INT_OPS, 1,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1286 [Define to 1 if signed integers use two's complement.])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1287 fi
13957 c510048901cc set cross compile defaults for AC_RUN_IFELSE John W. Eaton <jwe@octave.org> parents: 13728 diff changeset	1288 ])
8595 dee5d60257e4 Use Carbon framework to determine ScreenSize on Mac. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8169 diff changeset	1289 dnl
dee5d60257e4 Use Carbon framework to determine ScreenSize on Mac. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8169 diff changeset	1290 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	1291 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	1292 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	1293 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	1294 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	1295 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	1296 dnl
9654 a307a6f77fb3 aclocal.m4: consistently quote first arg to AC_DEFUN John W. Eaton <jwe@octave.org> parents: 9645 diff changeset	1297 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	1298 AC_MSG_CHECKING([whether ${LD-ld} accepts -framework $1])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1299 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	1300 [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	1301 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	1302 AC_LANG_PUSH(C++)
8595 dee5d60257e4 Use Carbon framework to determine ScreenSize on Mac. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8169 diff changeset	1303 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	1304 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	1305 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	1306 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	1307 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	1308 ])
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	1309 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	1310 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	1311 AC_ARG_WITH(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	1312 [AS_HELP_STRING([--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	1313 [don't use framework $1])],
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1314 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	1315 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	1316 [$4]
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	1317 :
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	1318 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	1319 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	1320 [$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	1321 fi
8595 dee5d60257e4 Use Carbon framework to determine ScreenSize on Mac. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8169 diff changeset	1322 else
15319 daf74ce2afdc m4/acinclude.m4: Use more consistent m4 quoting of arguments to macros. Rik <rik@octave.org> parents: 15302 diff changeset	1323 AC_MSG_RESULT([no])
8595 dee5d60257e4 Use Carbon framework to determine ScreenSize on Mac. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8169 diff changeset	1324 [$5]
dee5d60257e4 Use Carbon framework to determine ScreenSize on Mac. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8169 diff changeset	1325 fi
dee5d60257e4 Use Carbon framework to determine ScreenSize on Mac. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8169 diff changeset	1326 ])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1327 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1328 dnl Figure out the hardware-vendor-os info.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1329 dnl
15863 b316429bfa89 build: Use $host_os variable to clarify configure.ac Rik <rik@octave.org> parents: 15834 diff changeset	1330 AC_DEFUN([OCTAVE_CANONICAL_HOST], [
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1331 AC_CANONICAL_HOST
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1332 if test -z "$host"; then
15863 b316429bfa89 build: Use $host_os variable to clarify configure.ac Rik <rik@octave.org> parents: 15834 diff changeset	1333 host=unknown-unknown-unknown
b316429bfa89 build: Use $host_os variable to clarify configure.ac Rik <rik@octave.org> parents: 15834 diff changeset	1334 AC_MSG_WARN([configuring Octave for unknown system type])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1335 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1336 canonical_host_type=$host
15863 b316429bfa89 build: Use $host_os variable to clarify configure.ac Rik <rik@octave.org> parents: 15834 diff changeset	1337 AC_SUBST(canonical_host_type)
b316429bfa89 build: Use $host_os variable to clarify configure.ac Rik <rik@octave.org> parents: 15834 diff changeset	1338 if test -z "$host_cpu"; then
b316429bfa89 build: Use $host_os variable to clarify configure.ac Rik <rik@octave.org> parents: 15834 diff changeset	1339 host_cpu=unknown
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1340 fi
15863 b316429bfa89 build: Use $host_os variable to clarify configure.ac Rik <rik@octave.org> parents: 15834 diff changeset	1341 if test -z "$host_vendor"; then
b316429bfa89 build: Use $host_os variable to clarify configure.ac Rik <rik@octave.org> parents: 15834 diff changeset	1342 host_vendor=unknown
b316429bfa89 build: Use $host_os variable to clarify configure.ac Rik <rik@octave.org> parents: 15834 diff changeset	1343 fi
b316429bfa89 build: Use $host_os variable to clarify configure.ac Rik <rik@octave.org> parents: 15834 diff changeset	1344 if test -z "$host_os"; then
b316429bfa89 build: Use $host_os variable to clarify configure.ac Rik <rik@octave.org> parents: 15834 diff changeset	1345 host_os=unknown
b316429bfa89 build: Use $host_os variable to clarify configure.ac Rik <rik@octave.org> parents: 15834 diff changeset	1346 fi
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1347 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1348 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1349 dnl Check for IEEE 754 data format.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1350 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1351 AC_DEFUN([OCTAVE_IEEE754_DATA_FORMAT], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1352 AC_MSG_CHECKING([for IEEE 754 data format])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1353 AC_CACHE_VAL([octave_cv_ieee754_data_format],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1354 [AC_RUN_IFELSE([AC_LANG_SOURCE([[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1355 int
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1356 main (void)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1357 {
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1358 typedef union { unsigned char c[8]; double d; } ieeebytes;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1359
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1360 ieeebytes l = {0x1c, 0xbc, 0x6e, 0xf2, 0x54, 0x8b, 0x11, 0x43};
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1361 ieeebytes b = {0x43, 0x11, 0x8b, 0x54, 0xf2, 0x6e, 0xbc, 0x1c};
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1362
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1363 return l.d != 1234567891234567.0 && b.d != 1234567891234567.0;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1364 }
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1365 ]])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1366 octave_cv_ieee754_data_format=yes,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1367 octave_cv_ieee754_data_format=no,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1368 octave_cv_ieee754_data_format=yes)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1369 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1370 if test "$cross_compiling" = yes; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1371 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	1372 else
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1373 AC_MSG_RESULT([$octave_cv_ieee754_data_format])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1374 fi
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	1375 if test $octave_cv_ieee754_data_format = yes; then
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1376 AC_DEFINE(HAVE_IEEE754_DATA_FORMAT, 1,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1377 [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	1378 else
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1379 ## 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	1380 ## useful system, so we will abort here. Anyone wishing to
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1381 ## experiment with building Octave on a system without IEEE
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1382 ## floating point should be capable of removing this check and
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1383 ## 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	1384 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	1385 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1386 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1387 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1388 dnl Check for ar.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1389 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1390 AC_DEFUN([OCTAVE_PROG_AR], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1391 if test -z "$AR"; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1392 AR=ar
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1393 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1394 AC_SUBST(AR)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1395
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1396 if test -z "$ARFLAGS"; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1397 ARFLAGS="rc"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1398 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1399 AC_SUBST(ARFLAGS)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1400 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1401 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1402 dnl Check for bison.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1403 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1404 AC_DEFUN([OCTAVE_PROG_BISON], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1405 AC_PROG_YACC
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1406 case "$YACC" in
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1407 bison*)
16174 39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1408 AC_CACHE_CHECK([syntax of bison push/pull declaration],
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1409 [octave_cv_bison_push_pull_decl_style], [
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1410 style="dash underscore"
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1411 quote="noquote quote"
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1412 for s in $style; do
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1413 for q in $quote; do
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1414 if test $s = "dash"; then
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1415 def="%define api.push-pull"
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1416 else
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1417 def="%define api.push_pull"
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1418 fi
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1419 if test $q = "quote"; then
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1420 def="$def \"both\""
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1421 else
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1422 def="$def both"
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1423 fi
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1424 cat << EOF > conftest.yy
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1425 $def
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1426 %start input
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1427 %%
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1428 input:;
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1429 %%
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1430 EOF
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1431 $YACC conftest.yy > /dev/null 2>&1
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1432 ac_status=$?
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1433 if test $ac_status -eq 0; then
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1434 if test $q = noquote; then
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1435 q=
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1436 fi
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1437 octave_cv_bison_push_pull_decl_style="$s $q"
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1438 break
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1439 fi
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1440 done
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1441 if test $ac_status -eq 0; then
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1442 break
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1443 fi
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1444 done
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1445 rm -f conftest.yy y.tab.h
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1446 ])
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1447 ;;
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1448 esac
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1449
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1450 AC_SUBST(BISON_PUSH_PULL_DECL_STYLE, $octave_cv_bison_push_pull_decl_style)
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1451
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1452 if test -z "$octave_cv_bison_push_pull_decl_style"; then
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1453 YACC=
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1454 warn_bison_push_pull_decl_style="
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1455
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1456 I wasn't able to find a suitable style for declaring a push-pull
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1457 parser in a bison input file so I'm disabling bison.
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1458 "
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1459 OCTAVE_CONFIGURE_WARNING([warn_bison_push_pull_decl_style])
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1460 fi
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1461
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1462 case "$YACC" in
39096b290a2f check syntax used to enable bison push/pull parser John W. Eaton <jwe@octave.org> parents: 16068 diff changeset	1463 bison*)
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1464 ;;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1465 *)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1466 YACC='$(top_srcdir)/build-aux/missing bison'
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1467 warn_bison="
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1468
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1469 I didn't find bison, but it's only a problem if you need to
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1470 reconstruct parse.cc, which is the case if you're building from VCS
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1471 sources.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1472 "
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1473 OCTAVE_CONFIGURE_WARNING([warn_bison])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1474 ;;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1475 esac
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1476 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1477 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1478 dnl Find desktop-file-install program.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1479 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1480 AC_DEFUN([OCTAVE_PROG_DESKTOP_FILE_INSTALL], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1481 AC_CHECK_PROG(DESKTOP_FILE_INSTALL, desktop-file-install, desktop-file-install, [])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1482 AC_SUBST(DESKTOP_FILE_INSTALL)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1483 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1484 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1485 dnl Find find program.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1486 dnl
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	1487 ## Prefer GNU find if found.
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1488 AN_MAKEVAR([FIND], [OCTAVE_PROG_FIND])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1489 AN_PROGRAM([gfind], [OCTAVE_PROG_FIND])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1490 AN_PROGRAM([find], [OCTAVE_PROG_FIND])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1491 AC_DEFUN([OCTAVE_PROG_FIND], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1492 AC_CHECK_PROGS(FIND, [gfind find])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1493 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1494 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1495 dnl Check for flex.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1496 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1497 AC_DEFUN([OCTAVE_PROG_FLEX], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1498 ## 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	1499 ## it, and it might not be installed.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1500 ##
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1501 ## 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	1502 ## using flex.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1503 AC_PROG_LEX
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1504 case "$LEX" in
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1505 flex*)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1506 LFLAGS="-I"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1507 AC_MSG_RESULT([defining LFLAGS to be $LFLAGS])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1508 LEXLIB=
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1509 ;;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1510 *)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1511 LEX='$(top_srcdir)/build-aux/missing flex'
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1512 warn_flex="
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1513
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1514 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	1515 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	1516 "
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1517 OCTAVE_CONFIGURE_WARNING([warn_flex])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1518 ;;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1519 esac
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1520 AC_SUBST(LFLAGS)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1521 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1522 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1523 dnl Check for ghostscript.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1524 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1525 AC_DEFUN([OCTAVE_PROG_GHOSTSCRIPT], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1526 case "$canonical_host_type" in
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1527 --mingw* \| --msdosmsvc)
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	1528 ac_octave_gs_names="gswin32c gs mgs"
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1529 ;;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1530 *)
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	1531 ac_octave_gs_names="gs"
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1532 ;;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1533 esac
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	1534 AC_CHECK_PROGS(GHOSTSCRIPT, [$ac_octave_gs_names])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1535 if test -z "$GHOSTSCRIPT"; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1536 GHOSTSCRIPT='$(top_srcdir)/build-aux/missing gs'
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1537 warn_ghostscript="
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1538
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1539 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	1540 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	1541 using Octave
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1542 "
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1543 OCTAVE_CONFIGURE_WARNING([warn_ghostscript])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1544 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1545 AC_SUBST(GHOSTSCRIPT)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1546 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1547 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1548 dnl Check for gnuplot.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1549 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1550 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	1551 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	1552 ac_octave_gp_default="gnuplot"
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1553 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	1554 GNUPLOT="$ac_octave_gp_default"
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1555 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	1556 else
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	1557 AC_CHECK_PROGS(GNUPLOT, [$ac_octave_gp_names])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1558 if test -z "$GNUPLOT"; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1559 GNUPLOT="$gp_default"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1560 warn_gnuplot="
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1561
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1562 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	1563 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	1564 Octave's plotting commands.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1565 "
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1566 OCTAVE_CONFIGURE_WARNING([warn_gnuplot])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1567 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1568 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1569 AC_SUBST(GNUPLOT)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1570 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1571 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1572 dnl Check for gperf.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1573 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1574 AC_DEFUN([OCTAVE_PROG_GPERF], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1575 AC_CHECK_PROG(GPERF, gperf, gperf, [])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1576 if test -z "$GPERF"; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1577 GPERF='$(top_srcdir)/build-aux/missing gperf'
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1578 warn_gperf="
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1579
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1580 I didn't find gperf, but it's only a problem if you need to
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1581 reconstruct oct-gperf.h
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1582 "
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1583 OCTAVE_CONFIGURE_WARNING([warn_gperf])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1584 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1585 AC_SUBST(GPERF)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1586 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1587 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1588 dnl Check for makeinfo.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1589 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1590 AC_DEFUN([OCTAVE_PROG_MAKEINFO], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1591 dnl use MKINFO, not MAKEINFO, for variable name because Automake
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1592 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	1593 dnl exist which will then fool the 'test -z' line.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1594 AC_CHECK_PROG(MKINFO, makeinfo, makeinfo, [])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1595 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	1596 warn_makeinfo="
ca37c6023a79 don't abort configure if makeinfo is missing John W. Eaton <jwe@octave.org> parents: 15969 diff changeset	1597
ca37c6023a79 don't abort configure if makeinfo is missing John W. Eaton <jwe@octave.org> parents: 15969 diff changeset	1598 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	1599 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	1600 "
ca37c6023a79 don't abort configure if makeinfo is missing John W. Eaton <jwe@octave.org> parents: 15969 diff changeset	1601 OCTAVE_CONFIGURE_WARNING([warn_makeinfo])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1602 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1603 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1604 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1605 dnl What pager should we use?
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1606 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1607 AC_DEFUN([OCTAVE_PROG_PAGER], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1608 if test "$cross_compiling" = yes; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1609 DEFAULT_PAGER=less
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1610 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	1611 AC_SUBST(DEFAULT_PAGER)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1612 else
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	1613 ac_octave_possible_pagers="less more page pg"
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1614 case "$canonical_host_type" in
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1615 --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	1616 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	1617 ;;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1618 esac
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1619
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	1620 AC_CHECK_PROGS(DEFAULT_PAGER, [$ac_octave_possible_pagers], [])
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1621 if test -z "$DEFAULT_PAGER"; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1622 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	1623 OCTAVE_CONFIGURE_WARNING([warn_less])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1624 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1625 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1626 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1627 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1628 dnl Find Perl program.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1629 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1630 AC_DEFUN([OCTAVE_PROG_PERL], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1631 AC_CHECK_PROG(PERL, perl, perl, [])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1632 AC_SUBST(PERL)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1633 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1634 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1635 dnl Find Python program.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1636 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1637 AC_DEFUN([OCTAVE_PROG_PYTHON], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1638 AC_CHECK_PROG(PYTHON, python, python, [])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1639 AC_SUBST(PYTHON)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1640 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1641 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1642 dnl Find sed program.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1643 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1644 # Check for a fully-functional sed program, that truncates
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1645 # as few characters as possible and that supports "$X\\|Y$"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1646 # style regular expression alternation. Prefer GNU sed if found.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1647 AC_DEFUN([OCTAVE_PROG_SED], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1648 AC_MSG_CHECKING([for a usable sed])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1649 if test -z "$SED"; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1650 AC_CACHE_VAL([octave_cv_prog_sed],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1651 [# 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	1652 # Next, test potential sed programs in list for truncation.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1653 _AS_PATH_WALK([$PATH],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1654 [for ac_prog in sed gsed; do
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1655 for ac_exec_ext in '' $ac_executable_extensions; do
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1656 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	1657 _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	1658 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1659 done
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1660 done
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1661 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1662 AS_TMPDIR(sed)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1663 _max=0
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1664 _count=0
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1665 # 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	1666 # along with /bin/sed that truncates output.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1667 for _sed in $_sed_list /usr/xpg4/bin/sed; do
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1668 test ! -f ${_sed} && break
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1669 cat /dev/null > "$tmp/sed.in"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1670 _count=0
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1671 echo $ECHO_N "0123456789$ECHO_C" >"$tmp/sed.in"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1672 # 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	1673 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	1674 octave_cv_prog_sed=${_sed}
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1675 break;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1676 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1677 # Reject if RE alternation is not handled.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1678 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	1679 continue;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1680 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1681 while true; do
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1682 cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1683 mv "$tmp/sed.tmp" "$tmp/sed.in"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1684 cp "$tmp/sed.in" "$tmp/sed.nl"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1685 echo >>"$tmp/sed.nl"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1686 ${_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	1687 cmp -s "$tmp/sed.out" "$tmp/sed.nl" \|\| break
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1688 # 10000 chars as input seems more than enough
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1689 test $_count -gt 10 && break
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1690 _count=`expr $_count + 1`
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1691 if test $_count -gt $_max; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1692 _max=$_count
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1693 octave_cv_prog_sed=$_sed
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1694 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1695 done
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1696 done
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1697 rm -rf "$tmp"
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1698 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1699 SED=$octave_cv_prog_sed
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1700 if test -z "$SED"; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1701 AC_MSG_ERROR([no usable version of sed found])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1702 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1703 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1704 AC_SUBST(SED)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1705 AC_MSG_RESULT([$SED])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1706 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1707 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1708 dnl Check for texi2dvi.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1709 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1710 AC_DEFUN([OCTAVE_PROG_TEXI2DVI], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1711 AC_CHECK_PROG(TEXI2DVI, texi2dvi, texi2dvi, [])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1712 if test -z "$TEXI2DVI"; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1713 TEXI2DVI='$(top_srcdir)/build-aux/missing texi2dvi'
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1714 warn_texi2dvi="
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1715
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1716 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	1717 reconstruct the DVI version of the manual
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1718 "
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1719 OCTAVE_CONFIGURE_WARNING([warn_texi2dvi])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1720 fi
15250 87f337783d95 Cache texi2XXX intermediate results for faster builds. Rik <rik@octave.org> parents: 15247 diff changeset	1721 TEXI2DVI="$TEXI2DVI"' --build-dir=t2d_cache'
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1722 AC_SUBST(TEXI2DVI)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1723 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1724 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1725 dnl Check for texi2pdf.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1726 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1727 AC_DEFUN([OCTAVE_PROG_TEXI2PDF], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1728 AC_REQUIRE([OCTAVE_PROG_TEXI2DVI])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1729 AC_CHECK_PROG(TEXI2PDF, texi2pdf, texi2pdf, [])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1730 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	1731 ac_octave_texi2pdf_missing=yes;
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1732 if test -n "$TEXI2DVI"; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1733 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	1734 ac_octave_texi2pdf_missing=no;
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1735 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1736 else
16068 b309a5da17f5 use yes/no instead of true/false in confgure scripts John W. Eaton <jwe@octave.org> parents: 16012 diff changeset	1737 ac_octave_texi2pdf_missing=no;
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1738 fi
16068 b309a5da17f5 use yes/no instead of true/false in confgure scripts John W. Eaton <jwe@octave.org> parents: 16012 diff changeset	1739 if test $ac_octave_texi2pdf_missing = yes; then
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1740 TEXI2PDF='$(top_srcdir)/build-aux/missing texi2pdf'
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1741 warn_texi2pdf="
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1742
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1743 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	1744 reconstruct the PDF version of the manual
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1745 "
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1746 OCTAVE_CONFIGURE_WARNING([warn_texi2pdf])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1747 fi
15250 87f337783d95 Cache texi2XXX intermediate results for faster builds. Rik <rik@octave.org> parents: 15247 diff changeset	1748 TEXI2PDF="$TEXI2PDF"' --build-dir=t2d_cache'
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1749 AC_SUBST(TEXI2PDF)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1750 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1751 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1752 dnl Set default value for a variable and substitute it.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1753 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1754 AC_DEFUN([OCTAVE_SET_DEFAULT], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1755 ifelse($#, 2, [: ${$1=$2}
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1756 ])dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1757 AC_MSG_RESULT([defining $1 to be $$1])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1758 AC_SUBST($1)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1759 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1760 dnl
15329 719ffb2f35a6 Fix Octave builds with SuiteSparse >=4.0 (bug #37031) Rik <rik@octave.org> parents: 15319 diff changeset	1761 dnl Check whether SuiteSparse_time is required by UMFPACK.
719ffb2f35a6 Fix Octave builds with SuiteSparse >=4.0 (bug #37031) Rik <rik@octave.org> parents: 15319 diff changeset	1762 dnl UMFPACK >= 4 requires linking in another library for SuiteSparse_time.
719ffb2f35a6 Fix Octave builds with SuiteSparse >=4.0 (bug #37031) Rik <rik@octave.org> parents: 15319 diff changeset	1763 dnl
719ffb2f35a6 Fix Octave builds with SuiteSparse >=4.0 (bug #37031) Rik <rik@octave.org> parents: 15319 diff changeset	1764 dnl Macro assumes that the check for umfpack has already been performed.
719ffb2f35a6 Fix Octave builds with SuiteSparse >=4.0 (bug #37031) Rik <rik@octave.org> parents: 15319 diff changeset	1765 dnl
719ffb2f35a6 Fix Octave builds with SuiteSparse >=4.0 (bug #37031) Rik <rik@octave.org> parents: 15319 diff changeset	1766 AC_DEFUN([OCTAVE_UMFPACK_NEED_SUITESPARSE_TIME], [
719ffb2f35a6 Fix Octave builds with SuiteSparse >=4.0 (bug #37031) Rik <rik@octave.org> parents: 15319 diff changeset	1767 AC_CACHE_CHECK([whether UMFPACK needs SuiteSparse_time function],
719ffb2f35a6 Fix Octave builds with SuiteSparse >=4.0 (bug #37031) Rik <rik@octave.org> parents: 15319 diff changeset	1768 [octave_cv_umfpack_need_suitesparse_time],
719ffb2f35a6 Fix Octave builds with SuiteSparse >=4.0 (bug #37031) Rik <rik@octave.org> parents: 15319 diff changeset	1769 [AC_LANG_PUSH(C)
719ffb2f35a6 Fix Octave builds with SuiteSparse >=4.0 (bug #37031) Rik <rik@octave.org> parents: 15319 diff changeset	1770 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
719ffb2f35a6 Fix Octave builds with SuiteSparse >=4.0 (bug #37031) Rik <rik@octave.org> parents: 15319 diff changeset	1771 #if defined (HAVE_SUITESPARSE_UMFPACK_H)
719ffb2f35a6 Fix Octave builds with SuiteSparse >=4.0 (bug #37031) Rik <rik@octave.org> parents: 15319 diff changeset	1772 # include <suitesparse/umfpack.h>
719ffb2f35a6 Fix Octave builds with SuiteSparse >=4.0 (bug #37031) Rik <rik@octave.org> parents: 15319 diff changeset	1773 #elif defined (HAVE_UFSPARSE_UMFPACK_H)
719ffb2f35a6 Fix Octave builds with SuiteSparse >=4.0 (bug #37031) Rik <rik@octave.org> parents: 15319 diff changeset	1774 # include <ufsparse/umfpack.h>
719ffb2f35a6 Fix Octave builds with SuiteSparse >=4.0 (bug #37031) Rik <rik@octave.org> parents: 15319 diff changeset	1775 #elif defined (HAVE_UMFPACK_UMFPACK_H)
719ffb2f35a6 Fix Octave builds with SuiteSparse >=4.0 (bug #37031) Rik <rik@octave.org> parents: 15319 diff changeset	1776 # include <umfpack/umfpack.h>
719ffb2f35a6 Fix Octave builds with SuiteSparse >=4.0 (bug #37031) Rik <rik@octave.org> parents: 15319 diff changeset	1777 #elif defined (HAVE_UMFPACK_H)
719ffb2f35a6 Fix Octave builds with SuiteSparse >=4.0 (bug #37031) Rik <rik@octave.org> parents: 15319 diff changeset	1778 # include <umfpack.h>
719ffb2f35a6 Fix Octave builds with SuiteSparse >=4.0 (bug #37031) Rik <rik@octave.org> parents: 15319 diff changeset	1779 #endif
719ffb2f35a6 Fix Octave builds with SuiteSparse >=4.0 (bug #37031) Rik <rik@octave.org> parents: 15319 diff changeset	1780 ]], [[
719ffb2f35a6 Fix Octave builds with SuiteSparse >=4.0 (bug #37031) Rik <rik@octave.org> parents: 15319 diff changeset	1781 double stats [2];
719ffb2f35a6 Fix Octave builds with SuiteSparse >=4.0 (bug #37031) Rik <rik@octave.org> parents: 15319 diff changeset	1782 umfpack_tic (stats);
719ffb2f35a6 Fix Octave builds with SuiteSparse >=4.0 (bug #37031) Rik <rik@octave.org> parents: 15319 diff changeset	1783 ]])],
719ffb2f35a6 Fix Octave builds with SuiteSparse >=4.0 (bug #37031) Rik <rik@octave.org> parents: 15319 diff changeset	1784 octave_cv_umfpack_need_suitesparse_time=no,
719ffb2f35a6 Fix Octave builds with SuiteSparse >=4.0 (bug #37031) Rik <rik@octave.org> parents: 15319 diff changeset	1785 octave_cv_umfpack_need_suitesparse_time=yes)
719ffb2f35a6 Fix Octave builds with SuiteSparse >=4.0 (bug #37031) Rik <rik@octave.org> parents: 15319 diff changeset	1786 AC_LANG_POP(C)
719ffb2f35a6 Fix Octave builds with SuiteSparse >=4.0 (bug #37031) Rik <rik@octave.org> parents: 15319 diff changeset	1787 ])
719ffb2f35a6 Fix Octave builds with SuiteSparse >=4.0 (bug #37031) Rik <rik@octave.org> parents: 15319 diff changeset	1788 ])
719ffb2f35a6 Fix Octave builds with SuiteSparse >=4.0 (bug #37031) Rik <rik@octave.org> parents: 15319 diff changeset	1789 dnl
15144 9cc337ced51a build: Update OCTAVE_UMFPACK_SEPARATE_SPLIT macro to look for SuiteSparse header file. Rik <rik@octave.org> parents: 15141 diff changeset	1790 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	1791 dnl
15144 9cc337ced51a build: Update OCTAVE_UMFPACK_SEPARATE_SPLIT macro to look for SuiteSparse header file. Rik <rik@octave.org> parents: 15141 diff changeset	1792 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	1793 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1794 AC_DEFUN([OCTAVE_UMFPACK_SEPARATE_SPLIT], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1795 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	1796 AC_CACHE_VAL([octave_cv_umfpack_separate_split],
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1797 [AC_RUN_IFELSE([AC_LANG_SOURCE([[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1798 #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	1799 #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	1800 #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	1801 # 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	1802 #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	1803 # include <ufsparse/umfpack.h>
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1804 #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	1805 # include <umfpack/umfpack.h>
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1806 #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	1807 # include <umfpack.h>
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1808 #endif
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1809 int n = 5;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1810 int Ap[] = {0, 2, 5, 9, 10, 12};
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1811 int Ai[] = {0, 1, 0, 2, 4, 1, 2, 3, 4, 2, 1, 4};
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1812 double Ax[] = {2., 0., 3., 0., 3., 0., -1., 0., 4., 0., 4., 0.,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1813 -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	1814 double br[] = {8., 45., -3., 3., 19.};
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1815 double bi[] = {0., 0., 0., 0., 0.};
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1816 int main (void)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1817 {
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1818 double null = (double ) NULL ;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1819 double x = (double )malloc (2 * n * sizeof(double));
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1820 int i ;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1821 void Symbolic, Numeric ;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1822 (void) umfpack_zi_symbolic (n, n, Ap, Ai, Ax, null, &Symbolic, null, null) ;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1823 (void) umfpack_zi_numeric (Ap, Ai, Ax, null, Symbolic, &Numeric, null, null) ;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1824 umfpack_zi_free_symbolic (&Symbolic) ;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1825 (void) umfpack_zi_solve (0, Ap, Ai, Ax, null, x, null, br, bi,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1826 Numeric, null, null) ;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1827 umfpack_zi_free_numeric (&Numeric) ;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1828 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	1829 if (fabs (*x - i - 1.) > 1.e-13)
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1830 return (1);
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1831 return (0) ;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1832 }
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1833 ]])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1834 octave_cv_umfpack_separate_split=yes,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1835 octave_cv_umfpack_separate_split=no,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1836 octave_cv_umfpack_separate_split=yes)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1837 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1838 if test "$cross_compiling" = yes; then
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1839 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	1840 else
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1841 AC_MSG_RESULT([$octave_cv_umfpack_separate_split])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1842 fi
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	1843 if test $octave_cv_umfpack_separate_split = yes; then
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1844 AC_DEFINE(UMFPACK_SEPARATE_SPLIT, 1,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1845 [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	1846 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1847 ])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1848 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1849 dnl Check for unordered map headers and whether tr1 namespace is
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1850 dnl required.
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1851 dnl
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1852 AC_DEFUN([OCTAVE_UNORDERED_MAP_HEADERS], [
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1853 AC_CHECK_HEADERS([unordered_map], [],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1854 [AC_CHECK_HEADERS([tr1/unordered_map])])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1855 AC_CACHE_CHECK([whether unordered_map requires tr1 namespace],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1856 [octave_cv_header_require_tr1_namespace],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1857 [AC_LANG_PUSH(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1858 octave_cv_header_require_tr1_namespace=no
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	1859 if test $ac_cv_header_unordered_map = yes; then
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1860 ## Have <unordered_map>, but still have to check whether
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1861 ## tr1 namespace is required (like MSVC, for instance).
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1862 AC_COMPILE_IFELSE(
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1863 [AC_LANG_PROGRAM([[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1864 #include <unordered_map>
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1865 ]], [[
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1866 std::unordered_map<int,int> m;
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1867 ]])],
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1868 octave_cv_header_require_tr1_namespace=no,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1869 octave_cv_header_require_tr1_namespace=yes)
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	1870 elif test $ac_cv_header_tr1_unordered_map = yes; then
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1871 octave_cv_header_require_tr1_namespace=yes
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1872 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1873 AC_LANG_POP(C++)
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1874 ])
15336 5fff79162342 acinclude.m4: Put temporary shell variables in macros into ac_octave namespace. Rik <rik@octave.org> parents: 15330 diff changeset	1875 if test $octave_cv_header_require_tr1_namespace = yes; then
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1876 AC_DEFINE(USE_UNORDERED_MAP_WITH_TR1, 1,
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1877 [Define to 1 if unordered_map requires the use of tr1 namespace.])
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1878 fi
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1879 ])
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 9231 diff changeset	1880
15141 4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1881 dnl End of macros written by Octave developers
4388f6518440 build: Overhaul acinclude.m4 macros. Rik <rik@octave.org> parents: 15134 diff changeset	1882 dnl ------------------------------------------------------------
9645 4531741e5236 configure tweaks John W. Eaton <jwe@octave.org> parents: 9596 diff changeset	1883 dnl
4531741e5236 configure tweaks John W. Eaton <jwe@octave.org> parents: 9596 diff changeset	1884
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 9231 diff changeset	1885 ##############################################################################

Mercurial > hg > octave-lyh

annotate m4/acinclude.m4 @ 16174:39096b290a2f