Mercurial > mxe-octave

comparison src/of-windows-1-fixes.patch @ 3905:f1fa61828986

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