mxe-octave: src/of-windows-1-fixes.patch annotate

annotate src/of-windows-1-fixes.patch @ 4043:b54e00ea56bc

of-fl-core: readd fl-core patch in dos mode * src/of-fl-core-1-fixes.patch: readd patch

author	John Donoghue
date	Fri, 02 Oct 2015 10:24:38 -0400
parents	02a0022a6f75
children

rev	line source
3906 02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	1 diff -ur Windows.orig/src/__COM__.cc Windows/src/__COM__.cc
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	2 --- Windows.orig/src/__COM__.cc 2015-04-15 19:22:06.000000000 -0400
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	3 +++ Windows/src/__COM__.cc 2015-04-15 19:22:30.000000000 -0400
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	4 @@ -157,15 +157,23 @@
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	5
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	6 dim_vector dims(void) const { static dim_vector dv(1, 1); return dv; }
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	7
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	8 - void print(std::ostream& os, bool pr_as_read_syntax = false) const
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	9 + void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	10 {
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	11 - os << "<COM object " << (com_typename.empty() ? std::string("Unknown") : com_typename) << " (0x" << (void*)iface << ")>";
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	12 - newline(os);
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	13 + os << "<COM object "
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	14 + << (com_typename.empty () ? std::string("Unknown") : com_typename)
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	15 + << " (0x" << (void*)iface << ")>";
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	16 + }
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	17 +
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	18 + void print (std::ostream& os, bool pr_as_read_syntax = false)
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	19 + {
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	20 + print_raw (os, pr_as_read_syntax);
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	21 + newline (os);
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	22 }
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	23
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	24 - void print_raw(std::ostream& os, bool pr_as_read_syntax = false) const
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	25 + void print (std::ostream& os, bool pr_as_read_syntax = false) const
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	26 {
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	27 - print(os, pr_as_read_syntax);
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	28 + print_raw (os, pr_as_read_syntax);
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	29 + newline (os);
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	30 }
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	31
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	32 octave_value_list subsref (const std::string& type, const std::list<octave_value_list>& idx, int nargout);
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	33 @@ -180,7 +188,9 @@
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	34
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	35 private:
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	36 // regular octave value declarations
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	37 + #if defined (DEFINE_OCTAVE_ALLOCATOR)
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	38 DECLARE_OCTAVE_ALLOCATOR
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	39 + #endif
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	40
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	41 DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	42
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	43 @@ -189,7 +199,9 @@
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	44 std::string com_typename;
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	45 };
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	46
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	47 +#if defined (DEFINE_OCTAVE_ALLOCATOR)
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	48 DEFINE_OCTAVE_ALLOCATOR (octave_com_object);
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	49 +#endif
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	50
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	51 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_com_object,
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	52 "octave_com_object",
3905 f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	53 diff -ur Windows.orig/src/configure Windows/src/configure
3906 02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	54 --- Windows.orig/src/configure 2015-04-15 19:22:06.000000000 -0400
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	55 +++ Windows/src/configure 2015-04-15 19:22:19.000000000 -0400
3905 f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	56 @@ -1,11 +1,9 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	57 #! /bin/sh
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	58 # Guess values for system-dependent variables and create Makefiles.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	59 -# Generated by GNU Autoconf 2.68.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	60 +# Generated by GNU Autoconf 2.69.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	61 #
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	62 #
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	63 -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	64 -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	65 -# Foundation, Inc.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	66 +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	67 #
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	68 #
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	69 # This configure script is free software; the Free Software Foundation
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	70 @@ -134,6 +132,31 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	71 # CDPATH.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	72 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	73
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	74 +# Use a proper internal environment variable to ensure we don't fall
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	75 + # into an infinite loop, continuously re-executing ourselves.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	76 + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	77 + _as_can_reexec=no; export _as_can_reexec;
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	78 + # We cannot yet assume a decent shell, so we have to provide a
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	79 +# neutralization value for shells without unset; and this also
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	80 +# works around shells that cannot unset nonexistent variables.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	81 +# Preserve -v and -x to the replacement shell.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	82 +BASH_ENV=/dev/null
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	83 +ENV=/dev/null
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	84 +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	85 +case $- in # ((((
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	86 + vx* \| xv* ) as_opts=-vx ;;
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	87 + v ) as_opts=-v ;;
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	88 + x ) as_opts=-x ;;
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	89 + * ) as_opts= ;;
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	90 +esac
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	91 +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	92 +# Admittedly, this is quite paranoid, since all the known shells bail
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	93 +# out after a failed `exec'.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	94 +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	95 +as_fn_exit 255
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	96 + fi
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	97 + # We don't want this to propagate to other subprocesses.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	98 + { _as_can_reexec=; unset _as_can_reexec;}
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	99 if test "x$CONFIG_SHELL" = x; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	100 as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	101 emulate sh
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	102 @@ -167,7 +190,8 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	103 else
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	104 exitcode=1; echo positional parameters were not saved.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	105 fi
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	106 -test x\$exitcode = x0 \|\| exit 1"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	107 +test x\$exitcode = x0 \|\| exit 1
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	108 +test -x / \|\| exit 1"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	109 as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	110 as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	111 eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	112 @@ -211,21 +235,25 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	113
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	114
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	115 if test "x$CONFIG_SHELL" != x; then :
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	116 - # We cannot yet assume a decent shell, so we have to provide a
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	117 - # neutralization value for shells without unset; and this also
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	118 - # works around shells that cannot unset nonexistent variables.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	119 - # Preserve -v and -x to the replacement shell.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	120 - BASH_ENV=/dev/null
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	121 - ENV=/dev/null
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	122 - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	123 - export CONFIG_SHELL
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	124 - case $- in # ((((
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	125 - vx* \| xv* ) as_opts=-vx ;;
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	126 - v ) as_opts=-v ;;
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	127 - x ) as_opts=-x ;;
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	128 - * ) as_opts= ;;
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	129 - esac
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	130 - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	131 + export CONFIG_SHELL
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	132 + # We cannot yet assume a decent shell, so we have to provide a
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	133 +# neutralization value for shells without unset; and this also
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	134 +# works around shells that cannot unset nonexistent variables.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	135 +# Preserve -v and -x to the replacement shell.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	136 +BASH_ENV=/dev/null
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	137 +ENV=/dev/null
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	138 +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	139 +case $- in # ((((
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	140 + vx* \| xv* ) as_opts=-vx ;;
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	141 + v ) as_opts=-v ;;
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	142 + x ) as_opts=-x ;;
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	143 + * ) as_opts= ;;
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	144 +esac
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	145 +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	146 +# Admittedly, this is quite paranoid, since all the known shells bail
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	147 +# out after a failed `exec'.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	148 +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	149 +exit 255
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	150 fi
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	151
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	152 if test x$as_have_required = xno; then :
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	153 @@ -327,6 +355,14 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	154
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	155
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	156 } # as_fn_mkdir_p
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	157 +
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	158 +# as_fn_executable_p FILE
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	159 +# -----------------------
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	160 +# Test if FILE is an executable regular file.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	161 +as_fn_executable_p ()
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	162 +{
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	163 + test -f "$1" && test -x "$1"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	164 +} # as_fn_executable_p
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	165 # as_fn_append VAR VALUE
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	166 # ----------------------
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	167 # Append the text in VALUE to the end of the definition contained in VAR. Take
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	168 @@ -448,6 +484,10 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	169 chmod +x "$as_me.lineno" \|\|
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	170 { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	171
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	172 + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	173 + # already done that, so ensure we don't try to do so again and fall
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	174 + # in an infinite loop. This has already happened in practice.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	175 + _as_can_reexec=no; export _as_can_reexec
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	176 # Don't try to exec as it changes $[0], causing all sort of problems
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	177 # (the dirname of $[0] is not the place where we might find the
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	178 # original and so on. Autoconf is especially sensitive to this).
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	179 @@ -482,16 +522,16 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	180 # ... but there are two gotchas:
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	181 # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	182 # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	183 - # In both cases, we have to default to `cp -p'.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	184 + # In both cases, we have to default to `cp -pR'.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	185 ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe \|\|
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	186 - as_ln_s='cp -p'
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	187 + as_ln_s='cp -pR'
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	188 elif ln conf$$.file conf$$ 2>/dev/null; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	189 as_ln_s=ln
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	190 else
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	191 - as_ln_s='cp -p'
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	192 + as_ln_s='cp -pR'
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	193 fi
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	194 else
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	195 - as_ln_s='cp -p'
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	196 + as_ln_s='cp -pR'
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	197 fi
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	198 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	199 rmdir conf$$.dir 2>/dev/null
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	200 @@ -503,28 +543,8 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	201 as_mkdir_p=false
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	202 fi
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	203
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	204 -if test -x / >/dev/null 2>&1; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	205 - as_test_x='test -x'
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	206 -else
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	207 - if ls -dL / >/dev/null 2>&1; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	208 - as_ls_L_option=L
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	209 - else
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	210 - as_ls_L_option=
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	211 - fi
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	212 - as_test_x='
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	213 - eval sh -c '\''
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	214 - if test -d "$1"; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	215 - test -d "$1/.";
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	216 - else
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	217 - case $1 in #(
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	218 - -*)set "./$1";;
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	219 - esac;
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	220 - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	221 - ???[sx]):;;)false;;esac;fi
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	222 - '\'' sh
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	223 - '
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	224 -fi
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	225 -as_executable_p=$as_test_x
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	226 +as_test_x='test -x'
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	227 +as_executable_p=as_fn_executable_p
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	228
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	229 # Sed expression to map a string onto a valid CPP name.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	230 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	231 @@ -587,6 +607,7 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	232 mpath
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	233 subver
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	234 ver
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	235 +OCTAVE_CONFIG
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	236 MKOCTFILE
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	237 OBJEXT
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	238 EXEEXT
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	239 @@ -1110,8 +1131,6 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	240 if test "x$host_alias" != x; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	241 if test "x$build_alias" = x; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	242 cross_compiling=maybe
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	243 - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	244 - If a cross compiler is detected then cross compile mode will be used" >&2
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	245 elif test "x$build_alias" != "x$host_alias"; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	246 cross_compiling=yes
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	247 fi
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	248 @@ -1347,9 +1366,9 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	249 if $ac_init_version; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	250 cat <<\_ACEOF
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	251 configure
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	252 -generated by GNU Autoconf 2.68
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	253 +generated by GNU Autoconf 2.69
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	254
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	255 -Copyright (C) 2010 Free Software Foundation, Inc.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	256 +Copyright (C) 2012 Free Software Foundation, Inc.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	257 This configure script is free software; the Free Software Foundation
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	258 gives unlimited permission to copy, distribute and modify it.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	259 _ACEOF
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	260 @@ -1402,7 +1421,7 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	261 running configure, to aid debugging if configure makes a mistake.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	262
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	263 It was created by $as_me, which was
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	264 -generated by GNU Autoconf 2.68. Invocation command line was
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	265 +generated by GNU Autoconf 2.69. Invocation command line was
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	266
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	267 $ $0 $@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	268
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	269 @@ -1787,7 +1806,7 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	270 IFS=$as_save_IFS
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	271 test -z "$as_dir" && as_dir=.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	272 for ac_exec_ext in '' $ac_executable_extensions; do
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	273 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	274 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	275 ac_cv_prog_CC="${ac_tool_prefix}gcc"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	276 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	277 break 2
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	278 @@ -1827,7 +1846,7 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	279 IFS=$as_save_IFS
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	280 test -z "$as_dir" && as_dir=.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	281 for ac_exec_ext in '' $ac_executable_extensions; do
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	282 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	283 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	284 ac_cv_prog_ac_ct_CC="gcc"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	285 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	286 break 2
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	287 @@ -1880,7 +1899,7 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	288 IFS=$as_save_IFS
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	289 test -z "$as_dir" && as_dir=.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	290 for ac_exec_ext in '' $ac_executable_extensions; do
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	291 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	292 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	293 ac_cv_prog_CC="${ac_tool_prefix}cc"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	294 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	295 break 2
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	296 @@ -1921,7 +1940,7 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	297 IFS=$as_save_IFS
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	298 test -z "$as_dir" && as_dir=.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	299 for ac_exec_ext in '' $ac_executable_extensions; do
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	300 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	301 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	302 if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	303 ac_prog_rejected=yes
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	304 continue
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	305 @@ -1979,7 +1998,7 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	306 IFS=$as_save_IFS
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	307 test -z "$as_dir" && as_dir=.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	308 for ac_exec_ext in '' $ac_executable_extensions; do
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	309 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	310 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	311 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	312 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	313 break 2
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	314 @@ -2023,7 +2042,7 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	315 IFS=$as_save_IFS
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	316 test -z "$as_dir" && as_dir=.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	317 for ac_exec_ext in '' $ac_executable_extensions; do
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	318 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	319 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	320 ac_cv_prog_ac_ct_CC="$ac_prog"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	321 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	322 break 2
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	323 @@ -2469,8 +2488,7 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	324 /* end confdefs.h. */
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	325 #include <stdarg.h>
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	326 #include <stdio.h>
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	327 -#include <sys/types.h>
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	328 -#include <sys/stat.h>
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	329 +struct stat;
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	330 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	331 struct buf { int x; };
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	332 FILE * (rcsopen) (struct buf , struct stat *, int);
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	333 @@ -2575,7 +2593,7 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	334 IFS=$as_save_IFS
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	335 test -z "$as_dir" && as_dir=.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	336 for ac_exec_ext in '' $ac_executable_extensions; do
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	337 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	338 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	339 ac_cv_prog_MKOCTFILE="mkoctfile"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	340 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	341 break 2
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	342 @@ -2598,6 +2616,45 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	343
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	344 test -z "$MKOCTFILE" && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no mkoctfile found on path" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	345 $as_echo "$as_me: WARNING: no mkoctfile found on path" >&2;}
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	346 +# Extract the first word of "octave-config", so it can be a program name with args.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	347 +set dummy octave-config; ac_word=$2
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	348 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	349 +$as_echo_n "checking for $ac_word... " >&6; }
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	350 +if ${ac_cv_prog_OCTAVE_CONFIG+:} false; then :
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	351 + $as_echo_n "(cached) " >&6
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	352 +else
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	353 + if test -n "$OCTAVE_CONFIG"; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	354 + ac_cv_prog_OCTAVE_CONFIG="$OCTAVE_CONFIG" # Let the user override the test.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	355 +else
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	356 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	357 +for as_dir in $PATH
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	358 +do
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	359 + IFS=$as_save_IFS
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	360 + test -z "$as_dir" && as_dir=.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	361 + for ac_exec_ext in '' $ac_executable_extensions; do
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	362 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	363 + ac_cv_prog_OCTAVE_CONFIG="octave-config"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	364 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	365 + break 2
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	366 + fi
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	367 +done
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	368 + done
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	369 +IFS=$as_save_IFS
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	370 +
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	371 +fi
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	372 +fi
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	373 +OCTAVE_CONFIG=$ac_cv_prog_OCTAVE_CONFIG
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	374 +if test -n "$OCTAVE_CONFIG"; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	375 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCTAVE_CONFIG" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	376 +$as_echo "$OCTAVE_CONFIG" >&6; }
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	377 +else
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	378 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	379 +$as_echo "no" >&6; }
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	380 +fi
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	381 +
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	382 +
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	383 +test -z "$OCTAVE_CONFIG" && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no octave-config found on path" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	384 +$as_echo "$as_me: WARNING: no octave-config found on path" >&2;}
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	385
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	386
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	387
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	388 @@ -2777,6 +2834,8 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	389
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	390
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	391
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	392 +
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	393 +
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	394 # Extract the first word of "octave", so it can be a program name with args.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	395 set dummy octave; ac_word=$2
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	396 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	397 @@ -2793,7 +2852,7 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	398 IFS=$as_save_IFS
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	399 test -z "$as_dir" && as_dir=.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	400 for ac_exec_ext in '' $ac_executable_extensions; do
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	401 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	402 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	403 ac_cv_prog_OCTAVE="octave"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	404 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	405 break 2
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	406 @@ -2814,25 +2873,25 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	407 fi
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	408
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	409
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	410 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCTAVE_VERSION in Octave" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	411 -$as_echo_n "checking for OCTAVE_VERSION in Octave... " >&6; }
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	412 -OCTAVE_VERSION=`echo "disp(OCTAVE_VERSION)" \| $OCTAVE -qf`
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	413 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VERSION in octave-config" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	414 +$as_echo_n "checking for VERSION in octave-config... " >&6; }
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	415 +OCTAVE_VERSION=`$OCTAVE_CONFIG -p VERSION`
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	416 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCTAVE_VERSION" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	417 $as_echo "$OCTAVE_VERSION" >&6; }
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	418
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	419
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	420
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	421 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for octave_config_info('canonical_host_type') in Octave" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	422 -$as_echo_n "checking for octave_config_info('canonical_host_type') in Octave... " >&6; }
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	423 -canonical_host_type=`echo "disp(octave_config_info('canonical_host_type'))" \| $OCTAVE -qf`
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	424 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CANONICAL_HOST_TYPE in octave-config" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	425 +$as_echo_n "checking for CANONICAL_HOST_TYPE in octave-config... " >&6; }
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	426 +canonical_host_type=`$OCTAVE_CONFIG -p CANONICAL_HOST_TYPE`
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	427 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $canonical_host_type" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	428 $as_echo "$canonical_host_type" >&6; }
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	429
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	430
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	431
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	432 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for octave_config_info('SHLEXT') in Octave" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	433 -$as_echo_n "checking for octave_config_info('SHLEXT') in Octave... " >&6; }
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	434 -SHLEXT=`echo "disp(octave_config_info('SHLEXT'))" \| $OCTAVE -qf`
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	435 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHLEXT in octave-config" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	436 +$as_echo_n "checking for SHLEXT in octave-config... " >&6; }
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	437 +SHLEXT=`$OCTAVE_CONFIG -p SHLEXT`
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	438 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SHLEXT" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	439 $as_echo "$SHLEXT" >&6; }
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	440
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	441 @@ -2867,7 +2926,7 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	442 IFS=$as_save_IFS
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	443 test -z "$as_dir" && as_dir=.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	444 for ac_exec_ext in '' $ac_executable_extensions; do
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	445 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	446 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	447 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	448 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	449 break 2
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	450 @@ -2907,7 +2966,7 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	451 IFS=$as_save_IFS
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	452 test -z "$as_dir" && as_dir=.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	453 for ac_exec_ext in '' $ac_executable_extensions; do
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	454 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	455 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	456 ac_cv_prog_ac_ct_RANLIB="ranlib"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	457 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	458 break 2
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	459 @@ -2968,7 +3027,7 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	460 IFS=$as_save_IFS
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	461 test -z "$as_dir" && as_dir=.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	462 for ac_exec_ext in '' $ac_executable_extensions; do
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	463 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	464 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	465 ac_cv_prog_STRIP="$STRIP"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	466 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	467 break 2
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	468 @@ -3020,7 +3079,8 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	469
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	470 octave-forge is configured with
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	471 octave: $OCTAVE (version $OCTAVE_VERSION)
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	472 - mkoctfile: $MKOCTFILE for Octave $subver"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	473 + mkoctfile: $MKOCTFILE for Octave $OCTAVE_VERSION
3906 02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	474 + octave-config: $OCTAVE_CONFIG for Octave $OCTAVE_VERSION"
3905 f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	475 ac_config_files="$ac_config_files $CONFIGURE_OUTPUTS"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	476
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	477
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	478 @@ -3382,16 +3442,16 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	479 # ... but there are two gotchas:
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	480 # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	481 # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	482 - # In both cases, we have to default to `cp -p'.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	483 + # In both cases, we have to default to `cp -pR'.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	484 ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe \|\|
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	485 - as_ln_s='cp -p'
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	486 + as_ln_s='cp -pR'
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	487 elif ln conf$$.file conf$$ 2>/dev/null; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	488 as_ln_s=ln
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	489 else
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	490 - as_ln_s='cp -p'
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	491 + as_ln_s='cp -pR'
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	492 fi
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	493 else
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	494 - as_ln_s='cp -p'
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	495 + as_ln_s='cp -pR'
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	496 fi
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	497 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	498 rmdir conf$$.dir 2>/dev/null
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	499 @@ -3451,28 +3511,16 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	500 as_mkdir_p=false
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	501 fi
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	502
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	503 -if test -x / >/dev/null 2>&1; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	504 - as_test_x='test -x'
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	505 -else
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	506 - if ls -dL / >/dev/null 2>&1; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	507 - as_ls_L_option=L
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	508 - else
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	509 - as_ls_L_option=
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	510 - fi
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	511 - as_test_x='
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	512 - eval sh -c '\''
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	513 - if test -d "$1"; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	514 - test -d "$1/.";
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	515 - else
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	516 - case $1 in #(
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	517 - -*)set "./$1";;
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	518 - esac;
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	519 - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	520 - ???[sx]):;;)false;;esac;fi
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	521 - '\'' sh
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	522 - '
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	523 -fi
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	524 -as_executable_p=$as_test_x
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	525 +
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	526 +# as_fn_executable_p FILE
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	527 +# -----------------------
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	528 +# Test if FILE is an executable regular file.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	529 +as_fn_executable_p ()
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	530 +{
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	531 + test -f "$1" && test -x "$1"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	532 +} # as_fn_executable_p
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	533 +as_test_x='test -x'
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	534 +as_executable_p=as_fn_executable_p
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	535
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	536 # Sed expression to map a string onto a valid CPP name.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	537 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	538 @@ -3494,7 +3542,7 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	539 # values after options handling.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	540 ac_log="
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	541 This file was extended by $as_me, which was
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	542 -generated by GNU Autoconf 2.68. Invocation command line was
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	543 +generated by GNU Autoconf 2.69. Invocation command line was
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	544
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	545 CONFIG_FILES = $CONFIG_FILES
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	546 CONFIG_HEADERS = $CONFIG_HEADERS
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	547 @@ -3547,10 +3595,10 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	548 ac_cs_config="`$as_echo "$ac_configure_args" \| sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	549 ac_cs_version="\\
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	550 config.status
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	551 -configured by $0, generated by GNU Autoconf 2.68,
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	552 +configured by $0, generated by GNU Autoconf 2.69,
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	553 with options \\"\$ac_cs_config\\"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	554
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	555 -Copyright (C) 2010 Free Software Foundation, Inc.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	556 +Copyright (C) 2012 Free Software Foundation, Inc.
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	557 This config.status script is free software; the Free Software Foundation
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	558 gives unlimited permission to copy, distribute and modify it."
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	559
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	560 @@ -3627,7 +3675,7 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	561 _ACEOF
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	562 cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	563 if \$ac_cs_recheck; then
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	564 - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	565 + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	566 shift
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	567 \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	568 CONFIG_SHELL='$SHELL'
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	569 diff -ur Windows.orig/src/configure.base Windows/src/configure.base
3906 02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	570 --- Windows.orig/src/configure.base 2015-04-15 19:22:06.000000000 -0400
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	571 +++ Windows/src/configure.base 2015-04-15 19:22:19.000000000 -0400
3905 f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	572 @@ -49,6 +49,8 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	573 dnl Check for mkoctfile
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	574 AC_CHECK_PROG(MKOCTFILE,mkoctfile,mkoctfile)
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	575 test -z "$MKOCTFILE" && AC_MSG_WARN([no mkoctfile found on path])
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	576 +AC_CHECK_PROG(OCTAVE_CONFIG,octave-config,octave-config)
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	577 +test -z "$OCTAVE_CONFIG" && AC_MSG_WARN([no octave-config found on path])
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	578
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	579 AC_SUBST(ver)
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	580 AC_SUBST(subver)
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	581 @@ -257,15 +259,22 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	582 fi
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	583 ])
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	584
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	585 +AC_DEFUN(OCTAVE_CONFIG_EVAL,
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	586 +[AC_MSG_CHECKING([for $1 in octave-config])
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	587 +$2=`$OCTAVE_CONFIG -p $1`
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	588 +AC_MSG_RESULT($$2)
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	589 +AC_SUBST($2)
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	590 +])
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	591 +
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	592 dnl should check that $(OCTAVE) --version matches $(MKOCTFILE) --version
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	593 AC_CHECK_PROG(OCTAVE,octave,octave)
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	594 -OCTAVE_EVAL(OCTAVE_VERSION,OCTAVE_VERSION)
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	595 +OCTAVE_CONFIG_EVAL(VERSION,OCTAVE_VERSION)
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	596
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	597 dnl grab canonical host type so we can write system specific install stuff
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	598 -OCTAVE_EVAL(octave_config_info('canonical_host_type'),canonical_host_type)
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	599 +OCTAVE_CONFIG_EVAL(CANONICAL_HOST_TYPE,canonical_host_type)
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	600
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	601 dnl grab SHLEXT from octave config
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	602 -OCTAVE_EVAL(octave_config_info('SHLEXT'),SHLEXT)
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	603 +OCTAVE_CONFIG_EVAL(SHLEXT,SHLEXT)
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	604
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	605 AC_PROG_LN_S
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	606
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	607 @@ -351,4 +360,5 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	608
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	609 octave-forge is configured with
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	610 octave: $OCTAVE (version $OCTAVE_VERSION)
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	611 - mkoctfile: $MKOCTFILE for Octave $subver"
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	612 + mkoctfile: $MKOCTFILE for Octave $OCTAVE_VERSION
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	613 + octave-config: $OCTAVE_CONFIG for Octave $OCTAVE_VERSION"
3906 02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	614 diff -ur Windows.orig/src/grab.cc Windows/src/grab.cc
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	615 --- Windows.orig/src/grab.cc 2015-04-15 19:22:06.000000000 -0400
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	616 +++ Windows/src/grab.cc 2015-04-15 19:22:19.000000000 -0400
3905 f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	617 @@ -123,8 +123,8 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	618
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	619
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	620 /* Wait for a click */
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	621 - MArray<int> xc(maxpoints);
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	622 - MArray<int> yc(maxpoints);
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	623 + MArray<int> xc(dim_vector(maxpoints,1));
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	624 + MArray<int> yc(dim_vector(maxpoints,1));
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	625
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	626 int nb_elements = 0;
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	627 while (1) {
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	628 @@ -142,8 +142,8 @@
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	629 else break;
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	630
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	631 if (nb_elements == xc.length()) {
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	632 - xc.resize (xc.length()+maxpoints);
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	633 - yc.resize (yc.length()+maxpoints);
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	634 + xc.resize (dim_vector(xc.length()+maxpoints,1));
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	635 + yc.resize (dim_vector(yc.length()+maxpoints,1));
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	636 }
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	637 }
f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	638
3906 02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	639 diff -ur Windows.orig/src/Makeconf.in Windows/src/Makeconf.in
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	640 --- Windows.orig/src/Makeconf.in 2015-04-15 19:22:06.000000000 -0400
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	641 +++ Windows/src/Makeconf.in 2015-04-15 19:22:19.000000000 -0400
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	642 @@ -52,6 +52,7 @@
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	643 OCTAVE = @OCTAVE@
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	644 OCTAVE_VERSION = @OCTAVE_VERSION@
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	645 MKOCTFILE = @MKOCTFILE@ -DHAVE_OCTAVE_$(ver) -v
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	646 +OCTAVE_CONFIG = @OCTAVE_CONFIG@
02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	647 SHLEXT = @SHLEXT@
3905 f1fa61828986 of-windows: enable cross compile John Donoghue <john.donoghue@ieee.org> parents: diff changeset	648
3906 02a0022a6f75 of-windows: update of-windows patch to remove print error John Donoghue <john.donoghue@ieee.org> parents: 3905 diff changeset	649 ver = @ver@

Mercurial > mxe-octave

annotate src/of-windows-1-fixes.patch @ 4043:b54e00ea56bc