diff --git a/externals/moocow/flite/configure b/externals/moocow/flite/configure
index c1fc1d746f86773b61b0efc3fe58ed0f12c780c6..aaab863edbca7d1df88fae5a80262588f181958b 100755
--- a/externals/moocow/flite/configure
+++ b/externals/moocow/flite/configure
@@ -1,13 +1,11 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for pdflite 0.02-2.
+# Generated by GNU Autoconf 2.69 for pdflite 0.02-2.
#
# Report bugs to <moocow@ling.uni-potsdam.de>.
#
#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
#
#
# This configure script is free software; the Free Software Foundation
@@ -136,6 +134,31 @@ export LANGUAGE
# CDPATH.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+# Use a proper internal environment variable to ensure we don't fall
+ # into an infinite loop, continuously re-executing ourselves.
+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+ _as_can_reexec=no; export _as_can_reexec;
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+ fi
+ # We don't want this to propagate to other subprocesses.
+ { _as_can_reexec=; unset _as_can_reexec;}
if test "x$CONFIG_SHELL" = x; then
as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
@@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
else
exitcode=1; echo positional parameters were not saved.
fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -213,21 +237,25 @@ IFS=$as_save_IFS
if test "x$CONFIG_SHELL" != x; then :
- # We cannot yet assume a decent shell, so we have to provide a
- # neutralization value for shells without unset; and this also
- # works around shells that cannot unset nonexistent variables.
- # Preserve -v and -x to the replacement shell.
- BASH_ENV=/dev/null
- ENV=/dev/null
- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
- export CONFIG_SHELL
- case $- in # ((((
- *v*x* | *x*v* ) as_opts=-vx ;;
- *v* ) as_opts=-v ;;
- *x* ) as_opts=-x ;;
- * ) as_opts= ;;
- esac
- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+ export CONFIG_SHELL
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
fi
if test x$as_have_required = xno; then :
@@ -330,6 +358,14 @@ $as_echo X"$as_dir" |
} # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
# as_fn_append VAR VALUE
# ----------------------
# Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -451,6 +487,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
chmod +x "$as_me.lineno" ||
{ $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+ # already done that, so ensure we don't try to do so again and fall
+ # in an infinite loop. This has already happened in practice.
+ _as_can_reexec=no; export _as_can_reexec
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
# original and so on. Autoconf is especially sensitive to this).
@@ -485,16 +525,16 @@ if (echo >conf$$.file) 2>/dev/null; then
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -506,28 +546,8 @@ else
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in #(
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -1085,8 +1105,6 @@ target=$target_alias
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used" >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
@@ -1318,9 +1336,9 @@ test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
pdflite configure 0.02-2
-generated by GNU Autoconf 2.68
+generated by GNU Autoconf 2.69
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -1427,7 +1445,7 @@ $as_echo "$ac_try_echo"; } >&5
test ! -s conftest.err
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
+ test -x conftest$ac_exeext
}; then :
ac_retval=0
else
@@ -1450,7 +1468,7 @@ This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by pdflite $as_me 0.02-2, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -1888,7 +1906,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -1928,7 +1946,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -1981,7 +1999,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2022,7 +2040,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
@@ -2080,7 +2098,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2124,7 +2142,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2570,8 +2588,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
struct buf { int x; };
FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -3408,16 +3425,16 @@ if (echo >conf$$.file) 2>/dev/null; then
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -3477,28 +3494,16 @@ else
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in #(
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -3520,7 +3525,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# values after options handling.
ac_log="
This file was extended by pdflite $as_me 0.02-2, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -3573,10 +3578,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
pdflite config.status 0.02-2
-configured by $0, generated by GNU Autoconf 2.68,
+configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -3653,7 +3658,7 @@ fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
if \$ac_cs_recheck; then
- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
shift
\$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
CONFIG_SHELL='$SHELL'
diff --git a/pd/src/config.h b/pd/src/config.h
index 6835ea96eb0f7dcb2c957c4560dffbb4b0f934a8..fb6ae9a72ea42e265009c50335b89e817b709482 100644
--- a/pd/src/config.h
+++ b/pd/src/config.h
@@ -83,7 +83,7 @@
/* #undef HAVE_LIBTCL8_4 */
/* Define to 1 if you have the `tcl8.5' library (-ltcl8.5). */
-#define HAVE_LIBTCL8_5 1
+/* #undef HAVE_LIBTCL8_5 */
/* Define to 1 if you have the `tk84' library (-ltk84). */
/* #undef HAVE_LIBTK84 */
@@ -104,7 +104,7 @@
/* #undef HAVE_LIBTK8_4 */
/* Define to 1 if you have the `tk8.5' library (-ltk8.5). */
-#define HAVE_LIBTK8_5 1
+/* #undef HAVE_LIBTK8_5 */
/* Define to 1 if you have the <limits.h> header file. */
#define HAVE_LIMITS_H 1
@@ -211,7 +211,7 @@
#define TIME_WITH_SYS_TIME 1
/* Number of bits in a file offset, on hosts where this is settable. */
-/* #undef _FILE_OFFSET_BITS */
+#define _FILE_OFFSET_BITS 64
/* Define for large files, on AIX-style hosts. */
/* #undef _LARGE_FILES */
diff --git a/pd/src/g_scalar.c b/pd/src/g_scalar.c
index ff1f6dd3196552af626d5ecdc59f8facf8bc30bf..444e7b602422af784e7084c6a951c4df85877e2e 100644
--- a/pd/src/g_scalar.c
+++ b/pd/src/g_scalar.c
@@ -225,7 +225,7 @@ int template_has_elemtemplate(t_template *t, t_template *elemtemplate)
if (t && elemtemplate)
{
int i;
- t_dataslot *d = t->t_vec;
+ t_dataslot *d = t->t_vec;
for (i = 0; i < t->t_n; i++, d++)
{
if (d->ds_type == DT_ARRAY)
@@ -281,11 +281,11 @@ static void scalar_getgrouprect(t_glist *owner, t_glist *groupcanvas,
for (y = groupcanvas->gl_list; y; y = y->g_next)
{
if (pd_class(&y->g_pd) == canvas_class &&
- ((t_canvas *)y)->gl_svg)
+ ((t_canvas *)y)->gl_svg)
{
/* todo: accumulate basex and basey for correct offset */
scalar_getgrouprect(owner, (t_glist *)y, data, template,
- basex, basey, x1, x2, y1, y2);
+ basex, basey, x1, x2, y1, y2);
}
else
{
@@ -351,8 +351,8 @@ static void scalar_getrect(t_gobj *z, t_glist *owner,
x1 = y1 = 0x7fffffff;
x2 = y2 = -0x7fffffff;
scalar_getgrouprect(owner, templatecanvas, x->sc_vec, template,
- basex, basey, &x1, &x2, &y1, &y2);
- if (x2 < x1 || y2 < y1)
+ basex, basey, &x1, &x2, &y1, &y2);
+ if (x2 < x1 || y2 < y1)
x1 = y1 = x2 = y2 = 0;
}
}
@@ -679,9 +679,9 @@ static void scalar_groupvis(t_scalar *x, t_glist *owner, t_template *template,
for (y = gl->gl_list; y; y = y->g_next)
{
if (pd_class(&y->g_pd) == canvas_class &&
- ((t_glist *)y)->gl_svg)
+ ((t_glist *)y)->gl_svg)
{
- scalar_groupvis(x, owner, template, (t_glist *)y, gl, vis);
+ scalar_groupvis(x, owner, template, (t_glist *)y, gl, vis);
}
t_parentwidgetbehavior *wb = pd_getparentwidget(&y->g_pd);
if (!wb) continue;
@@ -772,12 +772,14 @@ static void scalar_vis(t_gobj *z, t_glist *owner, int vis)
t_parentwidgetbehavior *wb = pd_getparentwidget(&y->g_pd);
if (!wb)
{
- /* check subpatches for more drawing commands. This
+ /* check subpatches for more drawing commands. This
can be optimized to only search [group] subpatches */
if (pd_class(&y->g_pd) == canvas_class &&
- ((t_glist *)y)->gl_svg)
+ ((t_glist *)y)->gl_svg)
+ {
scalar_groupvis(x, owner, template,
(t_glist *)y, templatecanvas, vis);
+ }
continue;
}
(*wb->w_parentvisfn)(y, owner, 0, x, x->sc_vec, template,
diff --git a/pd/src/g_template.c b/pd/src/g_template.c
index d1cde73e8beced30943a238fcb9115ac41b0b2f5..8f7b9125a16bc8bb61c6982113692f25c6daaa4f 100644
--- a/pd/src/g_template.c
+++ b/pd/src/g_template.c
@@ -1752,7 +1752,7 @@ void svg_stroke(t_svg *x, t_symbol *s, t_int argc, t_atom *argv)
else if (argc > 2)
{
int var = 0, i;
- t_fielddesc *fd = x->x_stroke;
+ t_fielddesc *fd = x->x_stroke;
for(i = 0; i < argc; i++)
var = (argv[i].a_type == A_SYMBOL) ? 1 : var;
if (var)
@@ -2204,7 +2204,7 @@ void svg_group_pathrect_cache(t_svg *x, int state)
if (pd_class(&y->g_pd) == draw_class)
{
t_svg *a = (t_svg *)(((t_draw *)y)->x_attr);
- if (a->x_pathrect_cache != -1)
+ if (a->x_pathrect_cache != -1)
a->x_pathrect_cache = state;
}
}
@@ -4491,7 +4491,7 @@ static void plot_getgrouprect(t_glist *glist, t_template *elemtemplate,
int *x1, int *y1, int *x2, int *y2)
{
t_gobj *y;
- for (y = groupcanvas->gl_list; y; y = y->g_next)
+ for (y = groupcanvas->gl_list; y; y = y->g_next)
{
if (pd_class(&y->g_pd) == canvas_class &&
((t_canvas *)y)->gl_svg)
diff --git a/pd/src/g_undo.c b/pd/src/g_undo.c
index 172139f8a41c03c38c700b231c4e2fd6a2cc1405..0c0c0b587d3f013187057e6a4d7bb6c7dd507d90 100644
--- a/pd/src/g_undo.c
+++ b/pd/src/g_undo.c
@@ -3,8 +3,9 @@
#include <stdio.h>
#include "g_undo.h"
-//used for canvas_objtext to differentiate between objects being created by user
-//vs. those (re)created by the undo/redo actions
+/* used for canvas_objtext to differentiate between objects being created
+ by user vs. those (re)created by the undo/redo actions */
+
int we_are_undoing = 0;
extern const char *canvas_undo_name;
@@ -12,203 +13,219 @@ extern void glob_preset_node_list_seek_hub(void);
t_undo_action *canvas_undo_init(t_canvas *x)
{
- t_undo_action *a = (t_undo_action *)getbytes(sizeof(*a));
+ t_undo_action *a = (t_undo_action *)getbytes(sizeof(*a));
- a->type = 0;
- a->x = x;
- a->next = NULL;
+ a->type = 0;
+ a->x = x;
+ a->next = NULL;
- if (!x->u_queue) {
- //this is the first init
- x->u_queue = a;
- x->u_last = a;
- a->prev = NULL;
- a->name = "no";
+ if (!x->u_queue)
+ {
+ //this is the first init
+ x->u_queue = a;
+ x->u_last = a;
+ a->prev = NULL;
+ a->name = "no";
sys_vgui("pdtk_undomenu .x%lx no no\n", (t_int)a->x);
- }
- else {
- if (x->u_last->next) {
- //we need to rebranch first then add the new action
- canvas_undo_rebranch(x);
- }
- x->u_last->next = a;
- a->prev = x->u_last;
- x->u_last = a;
- }
- //fprintf(stderr,"canvas_undo_init\n");
- return(a);
+ }
+ else
+ {
+ if (x->u_last->next)
+ {
+ //we need to rebranch first then add the new action
+ canvas_undo_rebranch(x);
+ }
+ x->u_last->next = a;
+ a->prev = x->u_last;
+ x->u_last = a;
+ }
+ //fprintf(stderr,"canvas_undo_init\n");
+ return(a);
}
-t_undo_action *canvas_undo_add(t_canvas *x, int type, const char *name, void *data)
+t_undo_action *canvas_undo_add(t_canvas *x, int type, const char *name,
+ void *data)
{
- //fprintf(stderr,"canvas_undo_add %d\n", type);
- t_undo_action *a = canvas_undo_init(x);
- a->type = type;
- a->data = (void *)data;
- a->name = (char *)name;
- canvas_undo_name = name;
+ //fprintf(stderr,"canvas_undo_add %d\n", type);
+ t_undo_action *a = canvas_undo_init(x);
+ a->type = type;
+ a->data = (void *)data;
+ a->name = (char *)name;
+ canvas_undo_name = name;
sys_vgui("pdtk_undomenu .x%lx %s no\n", x, a->name);
- return(a);
+ return(a);
}
void canvas_undo_undo(t_canvas *x)
{
- int dspwas = canvas_suspend_dsp();
- if (x->u_queue && x->u_last != x->u_queue) {
- we_are_undoing = 1;
- //fprintf(stderr,"canvas_undo_undo %d\n", x->u_last->type);
- glist_noselect(x);
- canvas_undo_name = x->u_last->name;
+ int dspwas = canvas_suspend_dsp();
+ if (x->u_queue && x->u_last != x->u_queue)
+ {
+ we_are_undoing = 1;
+ //fprintf(stderr,"canvas_undo_undo %d\n", x->u_last->type);
+ glist_noselect(x);
+ canvas_undo_name = x->u_last->name;
switch(x->u_last->type)
{
- case 1: canvas_undo_connect(x, x->u_last->data, UNDO_UNDO); break; //connect
- case 2: canvas_undo_disconnect(x, x->u_last->data, UNDO_UNDO); break; //disconnect
- case 3: canvas_undo_cut(x, x->u_last->data, UNDO_UNDO); break; //cut
- case 4: canvas_undo_move(x, x->u_last->data, UNDO_UNDO); break; //move
- case 5: canvas_undo_paste(x, x->u_last->data, UNDO_UNDO); break; //paste
- case 6: canvas_undo_apply(x, x->u_last->data, UNDO_UNDO); break; //apply
- case 7: canvas_undo_arrange(x, x->u_last->data, UNDO_UNDO); break; //arrange
- case 8: canvas_undo_canvas_apply(x, x->u_last->data, UNDO_UNDO); break; //canvas apply
- case 9: canvas_undo_create(x, x->u_last->data, UNDO_UNDO); break; //create
- case 10:canvas_undo_recreate(x, x->u_last->data, UNDO_UNDO); break; //recreate
- case 11:canvas_undo_font(x, x->u_last->data, UNDO_UNDO); break; //font
- default:
- error("canvas_undo_undo: unsupported undo command %d", x->u_last->type);
+ case 1: canvas_undo_connect(x, x->u_last->data, UNDO_UNDO); break; //connect
+ case 2: canvas_undo_disconnect(x, x->u_last->data, UNDO_UNDO); break; //disconnect
+ case 3: canvas_undo_cut(x, x->u_last->data, UNDO_UNDO); break; //cut
+ case 4: canvas_undo_move(x, x->u_last->data, UNDO_UNDO); break; //move
+ case 5: canvas_undo_paste(x, x->u_last->data, UNDO_UNDO); break; //paste
+ case 6: canvas_undo_apply(x, x->u_last->data, UNDO_UNDO); break; //apply
+ case 7: canvas_undo_arrange(x, x->u_last->data, UNDO_UNDO); break; //arrange
+ case 8: canvas_undo_canvas_apply(x, x->u_last->data, UNDO_UNDO); break; //canvas apply
+ case 9: canvas_undo_create(x, x->u_last->data, UNDO_UNDO); break; //create
+ case 10:canvas_undo_recreate(x, x->u_last->data, UNDO_UNDO); break; //recreate
+ case 11:canvas_undo_font(x, x->u_last->data, UNDO_UNDO); break; //font
+ default:
+ error("canvas_undo_undo: unsupported undo command %d", x->u_last->type);
}
- x->u_last = x->u_last->prev;
- char *undo_action = x->u_last->name;
- char *redo_action = x->u_last->next->name;
- we_are_undoing = 0;
- // here we call updating of all unpaired hubs and nodes since their regular call
- // will fail in case their position needed to be updated by undo/redo first to
- // reflect the old one
- glob_preset_node_list_seek_hub();
- if (glist_isvisible(x) && glist_istoplevel(x)) {
- sys_vgui("pdtk_undomenu .x%lx %s %s\n", x, undo_action, redo_action);
- sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", x);
- }
- canvas_dirty(x, 1);
- }
+ x->u_last = x->u_last->prev;
+ char *undo_action = x->u_last->name;
+ char *redo_action = x->u_last->next->name;
+ we_are_undoing = 0;
+ /* here we call updating of all unpaired hubs and nodes since
+ their regular call will fail in case their position needed
+ to be updated by undo/redo first to reflect the old one */
+ glob_preset_node_list_seek_hub();
+ if (glist_isvisible(x) && glist_istoplevel(x))
+ {
+ sys_vgui("pdtk_undomenu .x%lx %s %s\n",
+ x, undo_action, redo_action);
+ sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", x);
+ }
+ canvas_dirty(x, 1);
+ }
canvas_resume_dsp(dspwas);
}
void canvas_undo_redo(t_canvas *x)
{
- int dspwas = canvas_suspend_dsp();
- if (x->u_queue && x->u_last->next) {
- we_are_undoing = 1;
- x->u_last = x->u_last->next;
- //fprintf(stderr,"canvas_undo_redo %d\n", x->u_last->type);
- glist_noselect(x);
- canvas_undo_name = x->u_last->name;
+ int dspwas = canvas_suspend_dsp();
+ if (x->u_queue && x->u_last->next)
+ {
+ we_are_undoing = 1;
+ x->u_last = x->u_last->next;
+ //fprintf(stderr,"canvas_undo_redo %d\n", x->u_last->type);
+ glist_noselect(x);
+ canvas_undo_name = x->u_last->name;
switch(x->u_last->type)
{
- case 1: canvas_undo_connect(x, x->u_last->data, UNDO_REDO); break; //connect
- case 2: canvas_undo_disconnect(x, x->u_last->data, UNDO_REDO); break; //disconnect
- case 3: canvas_undo_cut(x, x->u_last->data, UNDO_REDO); break; //cut
- case 4: canvas_undo_move(x, x->u_last->data, UNDO_REDO); break; //move
- case 5: canvas_undo_paste(x, x->u_last->data, UNDO_REDO); break; //paste
- case 6: canvas_undo_apply(x, x->u_last->data, UNDO_REDO); break; //apply
- case 7: canvas_undo_arrange(x, x->u_last->data, UNDO_REDO); break; //arrange
- case 8: canvas_undo_canvas_apply(x, x->u_last->data, UNDO_REDO); break; //canvas apply
- case 9: canvas_undo_create(x, x->u_last->data, UNDO_REDO); break; //create
- case 10:canvas_undo_recreate(x, x->u_last->data, UNDO_REDO); break; //recreate
- case 11:canvas_undo_font(x, x->u_last->data, UNDO_REDO); break; //font
- default:
- error("canvas_undo_redo: unsupported redo command %d", x->u_last->type);
+ case 1: canvas_undo_connect(x, x->u_last->data, UNDO_REDO); break; //connect
+ case 2: canvas_undo_disconnect(x, x->u_last->data, UNDO_REDO); break; //disconnect
+ case 3: canvas_undo_cut(x, x->u_last->data, UNDO_REDO); break; //cut
+ case 4: canvas_undo_move(x, x->u_last->data, UNDO_REDO); break; //move
+ case 5: canvas_undo_paste(x, x->u_last->data, UNDO_REDO); break; //paste
+ case 6: canvas_undo_apply(x, x->u_last->data, UNDO_REDO); break; //apply
+ case 7: canvas_undo_arrange(x, x->u_last->data, UNDO_REDO); break; //arrange
+ case 8: canvas_undo_canvas_apply(x, x->u_last->data, UNDO_REDO); break; //canvas apply
+ case 9: canvas_undo_create(x, x->u_last->data, UNDO_REDO); break; //create
+ case 10:canvas_undo_recreate(x, x->u_last->data, UNDO_REDO); break; //recreate
+ case 11:canvas_undo_font(x, x->u_last->data, UNDO_REDO); break; //font
+ default:
+ error("canvas_undo_redo: unsupported redo command %d", x->u_last->type);
}
- char *undo_action = x->u_last->name;
- char *redo_action = (x->u_last->next ? x->u_last->next->name : "no");
- we_are_undoing = 0;
- // here we call updating of all unpaired hubs and nodes since their regular call
- // will fail in case their position needed to be updated by undo/redo first to
- // reflect the old one
- glob_preset_node_list_seek_hub();
- if (glist_isvisible(x) && glist_istoplevel(x)) {
- sys_vgui("pdtk_undomenu .x%lx %s %s\n", x, undo_action, redo_action);
- sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", x);
- }
- canvas_dirty(x, 1);
- }
+ char *undo_action = x->u_last->name;
+ char *redo_action = (x->u_last->next ? x->u_last->next->name : "no");
+ we_are_undoing = 0;
+ /* here we call updating of all unpaired hubs and nodes since their
+ regular call will fail in case their position needed to be updated
+ by undo/redo first to reflect the old one */
+ glob_preset_node_list_seek_hub();
+ if (glist_isvisible(x) && glist_istoplevel(x))
+ {
+ sys_vgui("pdtk_undomenu .x%lx %s %s\n",
+ x, undo_action, redo_action);
+ sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", x);
+ }
+ canvas_dirty(x, 1);
+ }
canvas_resume_dsp(dspwas);
}
void canvas_undo_rebranch(t_canvas *x)
{
- int dspwas = canvas_suspend_dsp();
- t_undo_action *a1, *a2;
- //fprintf(stderr,"canvas_undo_rebranch");
- if (x->u_last->next) {
- a1 = x->u_last->next;
- while(a1) {
- //fprintf(stderr,".");
- switch(a1->type)
- {
- case 1: canvas_undo_connect(x, a1->data, UNDO_FREE); break; //connect
- case 2: canvas_undo_disconnect(x, a1->data, UNDO_FREE); break; //disconnect
- case 3: canvas_undo_cut(x, a1->data, UNDO_FREE); break; //cut
- case 4: canvas_undo_move(x, a1->data, UNDO_FREE); break; //move
- case 5: canvas_undo_paste(x, a1->data, UNDO_FREE); break; //paste
- case 6: canvas_undo_apply(x, a1->data, UNDO_FREE); break; //apply
- case 7: canvas_undo_arrange(x, a1->data, UNDO_FREE); break; //arrange
- case 8: canvas_undo_canvas_apply(x, a1->data, UNDO_FREE); break; //canvas apply
- case 9: canvas_undo_create(x, a1->data, UNDO_FREE); break; //create
- case 10:canvas_undo_recreate(x, a1->data, UNDO_FREE); break; //recreate
- case 11:canvas_undo_font(x, a1->data, UNDO_FREE); break; //font
- default:
- error("canvas_undo_rebranch: unsupported undo command %d", a1->type);
- }
- a2 = a1->next;
- freebytes(a1, sizeof(*a1));
- a1 = a2;
- }
- }
+ int dspwas = canvas_suspend_dsp();
+ t_undo_action *a1, *a2;
+ //fprintf(stderr,"canvas_undo_rebranch");
+ if (x->u_last->next)
+ {
+ a1 = x->u_last->next;
+ while(a1)
+ {
+ //fprintf(stderr,".");
+ switch(a1->type)
+ {
+ case 1: canvas_undo_connect(x, a1->data, UNDO_FREE); break; //connect
+ case 2: canvas_undo_disconnect(x, a1->data, UNDO_FREE); break; //disconnect
+ case 3: canvas_undo_cut(x, a1->data, UNDO_FREE); break; //cut
+ case 4: canvas_undo_move(x, a1->data, UNDO_FREE); break; //move
+ case 5: canvas_undo_paste(x, a1->data, UNDO_FREE); break; //paste
+ case 6: canvas_undo_apply(x, a1->data, UNDO_FREE); break; //apply
+ case 7: canvas_undo_arrange(x, a1->data, UNDO_FREE); break; //arrange
+ case 8: canvas_undo_canvas_apply(x, a1->data, UNDO_FREE); break; //canvas apply
+ case 9: canvas_undo_create(x, a1->data, UNDO_FREE); break; //create
+ case 10:canvas_undo_recreate(x, a1->data, UNDO_FREE); break; //recreate
+ case 11:canvas_undo_font(x, a1->data, UNDO_FREE); break; //font
+ default:
+ error("canvas_undo_rebranch: unsupported undo command %d", a1->type);
+ }
+ a2 = a1->next;
+ freebytes(a1, sizeof(*a1));
+ a1 = a2;
+ }
+ }
canvas_resume_dsp(dspwas);
- //fprintf(stderr,"done!\n");
+ //fprintf(stderr,"done!\n");
}
void canvas_undo_check_canvas_pointers(t_canvas *x)
{
- //currently unnecessary unless we decide to implement one central undo for all patchers
+ /* currently unnecessary unless we decide to implement one central undo
+ for all patchers */
}
void canvas_undo_purge_abstraction_actions(t_canvas *x)
{
- //currently unnecessary unless we decide to implement one central undo for all patchers
+ /* currently unnecessary unless we decide to implement one central undo
+ for all patchers */
}
void canvas_undo_free(t_canvas *x)
{
- int dspwas = canvas_suspend_dsp();
- t_undo_action *a1, *a2;
- //fprintf(stderr,"canvas_undo_free");
- if (x->u_queue) {
- a1 = x->u_queue;
- while(a1) {
- //fprintf(stderr,".");
- switch(a1->type)
- {
- case 0: break; //init
- case 1: canvas_undo_connect(x, a1->data, UNDO_FREE); break; //connect
- case 2: canvas_undo_disconnect(x, a1->data, UNDO_FREE); break; //disconnect
- case 3: canvas_undo_cut(x, a1->data, UNDO_FREE); break; //cut
- case 4: canvas_undo_move(x, a1->data, UNDO_FREE); break; //move
- case 5: canvas_undo_paste(x, a1->data, UNDO_FREE); break; //paste
- case 6: canvas_undo_apply(x, a1->data, UNDO_FREE); break; //apply
- case 7: canvas_undo_arrange(x, a1->data, UNDO_FREE); break; //arrange
- case 8: canvas_undo_canvas_apply(x, a1->data, UNDO_FREE); break; //canvas apply
- case 9: canvas_undo_create(x, a1->data, UNDO_FREE); break; //create
- case 10:canvas_undo_recreate(x, a1->data, UNDO_FREE); break; //recreate
- case 11:canvas_undo_font(x, a1->data, UNDO_FREE); break; //font
- default:
- error("canvas_undo_free: unsupported undo command %d", a1->type);
- }
- a2 = a1->next;
- freebytes(a1, sizeof(*a1));
- a1 = a2;
- }
- }
+ int dspwas = canvas_suspend_dsp();
+ t_undo_action *a1, *a2;
+ //fprintf(stderr,"canvas_undo_free");
+ if (x->u_queue)
+ {
+ a1 = x->u_queue;
+ while(a1)
+ {
+ //fprintf(stderr,".");
+ switch(a1->type)
+ {
+ case 0: break; //init
+ case 1: canvas_undo_connect(x, a1->data, UNDO_FREE); break; //connect
+ case 2: canvas_undo_disconnect(x, a1->data, UNDO_FREE); break; //disconnect
+ case 3: canvas_undo_cut(x, a1->data, UNDO_FREE); break; //cut
+ case 4: canvas_undo_move(x, a1->data, UNDO_FREE); break; //move
+ case 5: canvas_undo_paste(x, a1->data, UNDO_FREE); break; //paste
+ case 6: canvas_undo_apply(x, a1->data, UNDO_FREE); break; //apply
+ case 7: canvas_undo_arrange(x, a1->data, UNDO_FREE); break; //arrange
+ case 8: canvas_undo_canvas_apply(x, a1->data, UNDO_FREE); break; //canvas apply
+ case 9: canvas_undo_create(x, a1->data, UNDO_FREE); break; //create
+ case 10:canvas_undo_recreate(x, a1->data, UNDO_FREE); break; //recreate
+ case 11:canvas_undo_font(x, a1->data, UNDO_FREE); break; //font
+ default:
+ error("canvas_undo_free: unsupported undo command %d", a1->type);
+ }
+ a2 = a1->next;
+ freebytes(a1, sizeof(*a1));
+ a1 = a2;
+ }
+ }
canvas_resume_dsp(dspwas);
- //fprintf(stderr,"done!\n");
+ //fprintf(stderr,"done!\n");
}
diff --git a/pd/src/g_vdial.c b/pd/src/g_vdial.c
index d31eea5b0ada843fa497515b5c5f5d9ed06d10bb..52bec44fdadfb55feca804d70402bc5372635e2e 100644
--- a/pd/src/g_vdial.c
+++ b/pd/src/g_vdial.c
@@ -62,43 +62,54 @@ void vradio_draw_new(t_vradio *x, t_glist *glist)
int xx11=text_xpix(&x->x_gui.x_obj, glist), xx12=xx11+dy;
int xx21=xx11+s4, xx22=xx12-s4;
- t_scalehandle *sh = (t_scalehandle *)x->x_gui.x_handle;
- sprintf(sh->h_pathname, ".x%lx.h%lx", (t_int)canvas, (t_int)sh);
- t_scalehandle *lh = (t_scalehandle *)x->x_gui.x_lhandle;
- sprintf(lh->h_pathname, ".x%lx.h%lx", (t_int)canvas, (t_int)lh);
-
- //if (glist_isvisible(canvas)) {
-
- char *nlet_tag = iem_get_tag(glist, (t_iemgui *)x);
-
- for(i=0; i<n; i++)
- {
- sys_vgui(".x%lx.c create prect %d %d %d %d -stroke $pd_colors(iemgui_border) -fill #%6.6x -tags {%lxBASE%d %lxVRDO %s text iemgui border}\n",
- canvas, xx11, yy11, xx12, yy12,
- x->x_gui.x_bcol, x, i, x, nlet_tag);
- sys_vgui(".x%lx.c create prect %d %d %d %d -fill #%6.6x -stroke #%6.6x -tags {%lxBUT%d %lxVRDO %s text iemgui}\n",
- canvas, xx21, yy21, xx22, yy22,
- (x->x_on==i)?x->x_gui.x_fcol:x->x_gui.x_bcol,
- (x->x_on==i)?x->x_gui.x_fcol:x->x_gui.x_bcol, x, i, x, nlet_tag);
- yy11 += dy;
- yy12 += dy;
- yy21 += dy;
- yy22 += dy;
- x->x_drawn = x->x_on;
- }
- sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \
- -font {{%s} -%d %s} -fill #%6.6x -tags {%lxLABEL %lxVRDO %s text iemgui}\n",
- canvas, xx11+x->x_gui.x_ldx, yy11b+x->x_gui.x_ldy,
- strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"",
- x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
- x->x_gui.x_lcol, x, x, nlet_tag);
- if(!x->x_gui.x_fsf.x_snd_able && canvas == x->x_gui.x_glist)
- sys_vgui(".x%lx.c create prect %d %d %d %d -stroke $pd_colors(iemgui_nlet) -tags {%lxVRDO%so%d %so%d %lxVRDO %s outlet iemgui}\n",
- canvas, xx11, yy11-1, xx11 + IOWIDTH, yy11, x, nlet_tag, 0, nlet_tag, 0, x, nlet_tag);
- if(!x->x_gui.x_fsf.x_rcv_able && canvas == x->x_gui.x_glist)
- sys_vgui(".x%lx.c create prect %d %d %d %d -stroke $pd_colors(iemgui_nlet) -tags {%lxVRDO%si%d %si%d %lxVRDO %s inlet iemgui}\n",
- canvas, xx11, yy11b, xx11 + IOWIDTH, yy11b+1, x, nlet_tag, 0, nlet_tag, 0, x, nlet_tag);
- //}
+ t_scalehandle *sh = (t_scalehandle *)x->x_gui.x_handle;
+ sprintf(sh->h_pathname, ".x%lx.h%lx", (t_int)canvas, (t_int)sh);
+ t_scalehandle *lh = (t_scalehandle *)x->x_gui.x_lhandle;
+ sprintf(lh->h_pathname, ".x%lx.h%lx", (t_int)canvas, (t_int)lh);
+
+ //if (glist_isvisible(canvas)) {
+
+ char *nlet_tag = iem_get_tag(glist, (t_iemgui *)x);
+
+ for(i=0; i<n; i++)
+ {
+ sys_vgui(".x%lx.c create prect %d %d %d %d "
+ "-stroke $pd_colors(iemgui_border) -fill #%6.6x "
+ "-tags {%lxBASE%d %lxVRDO %s text iemgui border}\n",
+ canvas, xx11, yy11, xx12, yy12,
+ x->x_gui.x_bcol, x, i, x, nlet_tag);
+ sys_vgui(".x%lx.c create prect %d %d %d %d -fill #%6.6x "
+ "-stroke #%6.6x -tags {%lxBUT%d %lxVRDO %s text iemgui}\n",
+ canvas, xx21, yy21, xx22, yy22,
+ (x->x_on==i)?x->x_gui.x_fcol:x->x_gui.x_bcol,
+ (x->x_on==i)?x->x_gui.x_fcol:x->x_gui.x_bcol,
+ x, i, x, nlet_tag);
+ yy11 += dy;
+ yy12 += dy;
+ yy21 += dy;
+ yy22 += dy;
+ x->x_drawn = x->x_on;
+ }
+ sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w "
+ "-font {{%s} -%d %s} -fill #%6.6x "
+ "-tags {%lxLABEL %lxVRDO %s text iemgui}\n",
+ canvas, xx11+x->x_gui.x_ldx, yy11b+x->x_gui.x_ldy,
+ strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"",
+ x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
+ x->x_gui.x_lcol, x, x, nlet_tag);
+ if(!x->x_gui.x_fsf.x_snd_able && canvas == x->x_gui.x_glist)
+ sys_vgui(".x%lx.c create prect %d %d %d %d "
+ "-stroke $pd_colors(iemgui_nlet) "
+ "-tags {%lxVRDO%so%d %so%d %lxVRDO %s outlet iemgui}\n",
+ canvas, xx11, yy11-1, xx11 + IOWIDTH, yy11,
+ x, nlet_tag, 0, nlet_tag, 0, x, nlet_tag);
+ if(!x->x_gui.x_fsf.x_rcv_able && canvas == x->x_gui.x_glist)
+ sys_vgui(".x%lx.c create prect %d %d %d %d "
+ "-stroke $pd_colors(iemgui_nlet) "
+ "-tags {%lxVRDO%si%d %si%d %lxVRDO %s inlet iemgui}\n",
+ canvas, xx11, yy11b, xx11 + IOWIDTH, yy11b+1,
+ x, nlet_tag, 0, nlet_tag, 0, x, nlet_tag);
+ //}
}
void vradio_draw_move(t_vradio *x, t_glist *glist)
@@ -111,33 +122,34 @@ void vradio_draw_move(t_vradio *x, t_glist *glist)
int xx11=text_xpix(&x->x_gui.x_obj, glist), xx12=xx11+dy;
int xx21=xx11+s4, xx22=xx12-s4;
- if (glist_isvisible(canvas)) {
-
- char *nlet_tag = iem_get_tag(glist, (t_iemgui *)x);
-
- for(i=0; i<n; i++)
- {
- sys_vgui(".x%lx.c coords %lxBASE%d %d %d %d %d\n",
- canvas, x, i, xx11, yy11, xx12, yy12);
- sys_vgui(".x%lx.c coords %lxBUT%d %d %d %d %d\n",
- canvas, x, i, xx21, yy21, xx22, yy22);
- yy11 += dy;
- yy12 += dy;
- yy21 += dy;
- yy22 += dy;
- }
- sys_vgui(".x%lx.c coords %lxLABEL %d %d\n",
- canvas, x, xx11+x->x_gui.x_ldx, yy11b+x->x_gui.x_ldy);
- if(!x->x_gui.x_fsf.x_snd_able && canvas == x->x_gui.x_glist)
- sys_vgui(".x%lx.c coords %lxVRDO%so%d %d %d %d %d\n",
- canvas, x, nlet_tag, 0, xx11, yy11-1, xx11 + IOWIDTH, yy11);
- if(!x->x_gui.x_fsf.x_rcv_able && canvas == x->x_gui.x_glist)
- sys_vgui(".x%lx.c coords %lxVRDO%si%d %d %d %d %d\n",
- canvas, x, nlet_tag, 0, xx11, yy11b, xx11 + IOWIDTH, yy11b+1);
- /* redraw scale handle rectangle if selected */
- if (x->x_gui.x_fsf.x_selected)
- vradio_draw_select(x, x->x_gui.x_glist);
- }
+ if (glist_isvisible(canvas))
+ {
+
+ char *nlet_tag = iem_get_tag(glist, (t_iemgui *)x);
+
+ for(i=0; i<n; i++)
+ {
+ sys_vgui(".x%lx.c coords %lxBASE%d %d %d %d %d\n",
+ canvas, x, i, xx11, yy11, xx12, yy12);
+ sys_vgui(".x%lx.c coords %lxBUT%d %d %d %d %d\n",
+ canvas, x, i, xx21, yy21, xx22, yy22);
+ yy11 += dy;
+ yy12 += dy;
+ yy21 += dy;
+ yy22 += dy;
+ }
+ sys_vgui(".x%lx.c coords %lxLABEL %d %d\n",
+ canvas, x, xx11+x->x_gui.x_ldx, yy11b+x->x_gui.x_ldy);
+ if(!x->x_gui.x_fsf.x_snd_able && canvas == x->x_gui.x_glist)
+ sys_vgui(".x%lx.c coords %lxVRDO%so%d %d %d %d %d\n",
+ canvas, x, nlet_tag, 0, xx11, yy11-1, xx11 + IOWIDTH, yy11);
+ if(!x->x_gui.x_fsf.x_rcv_able && canvas == x->x_gui.x_glist)
+ sys_vgui(".x%lx.c coords %lxVRDO%si%d %d %d %d %d\n",
+ canvas, x, nlet_tag, 0, xx11, yy11b, xx11 + IOWIDTH, yy11b+1);
+ /* redraw scale handle rectangle if selected */
+ if (x->x_gui.x_fsf.x_selected)
+ vradio_draw_select(x, x->x_gui.x_glist);
+ }
}
void vradio_draw_erase(t_vradio* x, t_glist* glist)
@@ -145,16 +157,17 @@ void vradio_draw_erase(t_vradio* x, t_glist* glist)
t_canvas *canvas=glist_getcanvas(glist);
int n=x->x_number, i;
- sys_vgui(".x%lx.c delete %lxVRDO\n", canvas, x);
- sys_vgui(".x%lx.c dtag all %lxVRDO\n", canvas, x);
- if (x->x_gui.x_fsf.x_selected) {
- t_scalehandle *sh = (t_scalehandle *)(x->x_gui.x_handle);
- sys_vgui("destroy %s\n", sh->h_pathname);
- sys_vgui(".x%lx.c delete %lxSCALE\n", canvas, x);
- t_scalehandle *lh = (t_scalehandle *)(x->x_gui.x_lhandle);
- sys_vgui("destroy %s\n", lh->h_pathname);
- sys_vgui(".x%lx.c delete %lxLABELH\n", canvas, x);
- }
+ sys_vgui(".x%lx.c delete %lxVRDO\n", canvas, x);
+ sys_vgui(".x%lx.c dtag all %lxVRDO\n", canvas, x);
+ if (x->x_gui.x_fsf.x_selected)
+ {
+ t_scalehandle *sh = (t_scalehandle *)(x->x_gui.x_handle);
+ sys_vgui("destroy %s\n", sh->h_pathname);
+ sys_vgui(".x%lx.c delete %lxSCALE\n", canvas, x);
+ t_scalehandle *lh = (t_scalehandle *)(x->x_gui.x_lhandle);
+ sys_vgui("destroy %s\n", lh->h_pathname);
+ sys_vgui(".x%lx.c delete %lxLABELH\n", canvas, x);
+ }
}
void vradio_draw_config(t_vradio* x, t_glist* glist)
@@ -162,32 +175,42 @@ void vradio_draw_config(t_vradio* x, t_glist* glist)
t_canvas *canvas=glist_getcanvas(glist);
int n=x->x_number, i;
- /*
- char color[64];
- if (x->x_gui.x_fsf.x_selected)
- sprintf(color, "$pd_colors(selection)");
- else
- sprintf(color, "#%6.6x", x->x_gui.x_lcol);
- */
-
- if (x->x_gui.x_fsf.x_selected && x->x_gui.x_glist == canvas)
- sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} -%d %s} -fill $pd_colors(selection) -text {%s} \n",
- canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
- strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"");
- else
- sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} -%d %s} -fill #%6.6x -text {%s} \n",
- canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
- x->x_gui.x_lcol,
- strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"");
+ /*
+ char color[64];
+ if (x->x_gui.x_fsf.x_selected)
+ sprintf(color, "$pd_colors(selection)");
+ else
+ sprintf(color, "#%6.6x", x->x_gui.x_lcol);
+ */
+
+ if (x->x_gui.x_fsf.x_selected && x->x_gui.x_glist == canvas)
+ sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} -%d %s} "
+ "-fill $pd_colors(selection) -text {%s} \n",
+ canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
+ strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"");
+ else
+ sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} -%d %s} "
+ "-fill #%6.6x -text {%s} \n",
+ canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
+ x->x_gui.x_lcol,
+ strcmp(x->x_gui.x_lab->s_name, "empty") ?
+ x->x_gui.x_lab->s_name : "");
for(i=0; i<n; i++)
{
- sys_vgui(".x%lx.c itemconfigure %lxBASE%d -fill #%6.6x\n .x%lx.c itemconfigure %lxBUT%d -fill #%6.6x -stroke #%6.6x\n",
- canvas, x, i, x->x_gui.x_bcol, canvas, x, i,
- (x->x_on==i)?x->x_gui.x_fcol:x->x_gui.x_bcol,
- (x->x_on==i)?x->x_gui.x_fcol:x->x_gui.x_bcol);
- /*sys_vgui(".x%lx.c itemconfigure %lxBUT%d -fill #%6.6x -outline #%6.6x\n", canvas, x, i,
- (x->x_on==i)?x->x_gui.x_fcol:x->x_gui.x_bcol,
- (x->x_on==i)?x->x_gui.x_fcol:x->x_gui.x_bcol);*/
+ sys_vgui(".x%lx.c itemconfigure %lxBASE%d "
+ "-fill #%6.6x\n "
+ ".x%lx.c itemconfigure %lxBUT%d "
+ "-fill #%6.6x -stroke #%6.6x\n",
+ canvas, x, i,
+ x->x_gui.x_bcol,
+ canvas, x, i,
+ (x->x_on==i) ? x->x_gui.x_fcol : x->x_gui.x_bcol,
+ (x->x_on==i) ? x->x_gui.x_fcol : x->x_gui.x_bcol);
+ /*sys_vgui(".x%lx.c itemconfigure %lxBUT%d -fill #%6.6x "
+ "-outline #%6.6x\n", canvas, x, i,
+ (x->x_on==i) ? x->x_gui.x_fcol : x->x_gui.x_bcol,
+ (x->x_on==i) ? x->x_gui.x_fcol : x->x_gui.x_bcol);
+ */
}
}
@@ -197,305 +220,369 @@ void vradio_draw_io(t_vradio* x, t_glist* glist, int old_snd_rcv_flags)
int xpos=text_xpix(&x->x_gui.x_obj, glist);
int ypos=text_ypix(&x->x_gui.x_obj, glist);
- if (glist_isvisible(canvas) && canvas == x->x_gui.x_glist) {
-
- char *nlet_tag = iem_get_tag(glist, (t_iemgui *)x);
-
- if((old_snd_rcv_flags & IEM_GUI_OLD_SND_FLAG) && !x->x_gui.x_fsf.x_snd_able)
- sys_vgui(".x%lx.c create prect %d %d %d %d -stroke $pd_colors(iemgui_nlet) -tags {%lxVRDO%so%d %so%d %lxVRDO %s outlet iemgui}\n",
- canvas, xpos,
- ypos+(x->x_number*x->x_gui.x_h)-1,
- xpos+ IOWIDTH,
- ypos+(x->x_number*x->x_gui.x_h), x, nlet_tag, 0, nlet_tag, 0, x, nlet_tag);
- if(!(old_snd_rcv_flags & IEM_GUI_OLD_SND_FLAG) && x->x_gui.x_fsf.x_snd_able)
- sys_vgui(".x%lx.c delete %lxVRDO%so%d\n", canvas, x, nlet_tag, 0);
- if((old_snd_rcv_flags & IEM_GUI_OLD_RCV_FLAG) && !x->x_gui.x_fsf.x_rcv_able)
- sys_vgui(".x%lx.c create prect %d %d %d %d -stroke $pd_colors(iemgui_nlet) -tags {%lxVRDO%si%d %si%d %lxVRDO %s inlet iemgui}\n",
- canvas, xpos, ypos,
- xpos+ IOWIDTH, ypos+1,
- x, nlet_tag, 0, nlet_tag, 0, x, nlet_tag);
- if(!(old_snd_rcv_flags & IEM_GUI_OLD_RCV_FLAG) && x->x_gui.x_fsf.x_rcv_able)
- sys_vgui(".x%lx.c delete %lxVRDO%si%d\n", canvas, x, nlet_tag, 0);
- }
+ if (glist_isvisible(canvas) && canvas == x->x_gui.x_glist)
+ {
+
+ char *nlet_tag = iem_get_tag(glist, (t_iemgui *)x);
+
+ if((old_snd_rcv_flags & IEM_GUI_OLD_SND_FLAG) &&
+ !x->x_gui.x_fsf.x_snd_able)
+ sys_vgui(".x%lx.c create prect %d %d %d %d "
+ "-stroke $pd_colors(iemgui_nlet) "
+ "-tags {%lxVRDO%so%d %so%d %lxVRDO %s outlet iemgui}\n",
+ canvas, xpos,
+ ypos+(x->x_number*x->x_gui.x_h)-1,
+ xpos+ IOWIDTH,
+ ypos+(x->x_number*x->x_gui.x_h),
+ x, nlet_tag, 0, nlet_tag, 0, x, nlet_tag);
+ if(!(old_snd_rcv_flags & IEM_GUI_OLD_SND_FLAG) &&
+ x->x_gui.x_fsf.x_snd_able)
+ sys_vgui(".x%lx.c delete %lxVRDO%so%d\n", canvas, x, nlet_tag, 0);
+ if((old_snd_rcv_flags & IEM_GUI_OLD_RCV_FLAG) &&
+ !x->x_gui.x_fsf.x_rcv_able)
+ sys_vgui(".x%lx.c create prect %d %d %d %d "
+ "-stroke $pd_colors(iemgui_nlet) "
+ "-tags {%lxVRDO%si%d %si%d %lxVRDO %s inlet iemgui}\n",
+ canvas, xpos, ypos,
+ xpos+ IOWIDTH, ypos+1,
+ x, nlet_tag, 0, nlet_tag, 0, x, nlet_tag);
+ if(!(old_snd_rcv_flags & IEM_GUI_OLD_RCV_FLAG) &&
+ x->x_gui.x_fsf.x_rcv_able)
+ sys_vgui(".x%lx.c delete %lxVRDO%si%d\n", canvas, x, nlet_tag, 0);
+ }
}
void vradio_draw_select(t_vradio* x, t_glist* glist)
{
t_canvas *canvas=glist_getcanvas(glist);
- t_scalehandle *sh = (t_scalehandle *)(x->x_gui.x_handle);
- t_scalehandle *lh = (t_scalehandle *)(x->x_gui.x_lhandle);
+ t_scalehandle *sh = (t_scalehandle *)(x->x_gui.x_handle);
+ t_scalehandle *lh = (t_scalehandle *)(x->x_gui.x_lhandle);
int n=x->x_number, i;
- //if (glist_isvisible(canvas)) {
-
- if(x->x_gui.x_fsf.x_selected)
- {
-
- // check if we are drawing inside a gop abstraction visible on parent canvas
- // if so, disable highlighting
- if (x->x_gui.x_glist == glist_getcanvas(glist)) {
-
- char *nlet_tag = iem_get_tag(glist, (t_iemgui *)x);
-
- for(i=0; i<n; i++)
- {
- sys_vgui(".x%lx.c itemconfigure %lxBASE%d -stroke $pd_colors(selection)\n", canvas, x, i);
- }
- sys_vgui(".x%lx.c itemconfigure %lxLABEL -fill $pd_colors(selection)\n", canvas, x);
-
- if (x->x_gui.scale_vis) {
- sys_vgui("destroy %s\n", sh->h_pathname);
- sys_vgui(".x%lx.c delete %lxSCALE\n", canvas, x);
- }
-
- sys_vgui("canvas %s -width %d -height %d -bg $pd_colors(selection) -bd 0 -cursor bottom_right_corner\n",
- sh->h_pathname, SCALEHANDLE_WIDTH, SCALEHANDLE_HEIGHT);
- sys_vgui(".x%x.c create window %d %d -anchor nw -width %d -height %d -window %s -tags {%lxSCALE %lxVRDO %s}\n",
- canvas, x->x_gui.x_obj.te_xpix + x->x_gui.x_w - SCALEHANDLE_WIDTH - 1,
- x->x_gui.x_obj.te_ypix + x->x_gui.x_h * x->x_number - SCALEHANDLE_HEIGHT - 1,
- SCALEHANDLE_WIDTH, SCALEHANDLE_HEIGHT,
- sh->h_pathname, x, x, nlet_tag);
- sys_vgui("bind %s <Button> {pd [concat %s _click 1 %%x %%y \\;]}\n",
- sh->h_pathname, sh->h_bindsym->s_name);
- sys_vgui("bind %s <ButtonRelease> {pd [concat %s _click 0 0 0 \\;]}\n",
- sh->h_pathname, sh->h_bindsym->s_name);
- sys_vgui("bind %s <Motion> {pd [concat %s _motion %%x %%y \\;]}\n",
- sh->h_pathname, sh->h_bindsym->s_name);
- x->x_gui.scale_vis = 1;
-
- if (strcmp(x->x_gui.x_lab->s_name, "empty") != 0)
- {
- if (x->x_gui.label_vis) {
- sys_vgui("destroy %s\n", lh->h_pathname);
- sys_vgui(".x%lx.c delete %lxLABELH\n", canvas, x);
- }
-
- sys_vgui("canvas %s -width %d -height %d -bg $pd_colors(selection) -bd 0 -cursor crosshair\n",
- lh->h_pathname, LABELHANDLE_WIDTH, LABELHANDLE_HEIGHT);
- sys_vgui(".x%x.c create window %d %d -anchor nw -width %d -height %d -window %s -tags {%lxLABEL %lxLABELH %lxVRDO %s}\n",
- canvas, x->x_gui.x_obj.te_xpix+ x->x_gui.x_ldx - LABELHANDLE_WIDTH,
- x->x_gui.x_obj.te_ypix + x->x_gui.x_ldy - LABELHANDLE_HEIGHT,
- LABELHANDLE_WIDTH, LABELHANDLE_HEIGHT,
- lh->h_pathname, x, x, x, nlet_tag);
- sys_vgui("bind %s <Button> {pd [concat %s _click 1 %%x %%y \\;]}\n",
- lh->h_pathname, lh->h_bindsym->s_name);
- sys_vgui("bind %s <ButtonRelease> {pd [concat %s _click 0 0 0 \\;]}\n",
- lh->h_pathname, lh->h_bindsym->s_name);
- sys_vgui("bind %s <Motion> {pd [concat %s _motion %%x %%y \\;]}\n",
- lh->h_pathname, lh->h_bindsym->s_name);
- x->x_gui.label_vis = 1;
- }
- }
-
- sys_vgui(".x%lx.c addtag selected withtag %lxVRDO\n", canvas, x);
- }
- else
- {
- for(i=0; i<n; i++)
- {
- sys_vgui(".x%lx.c dtag %lxVRDO selected\n", canvas, x);
- sys_vgui(".x%lx.c itemconfigure %lxBASE%d -stroke %s\n", canvas, x, i,
- IEM_GUI_COLOR_NORMAL);
- }
- sys_vgui(".x%lx.c itemconfigure %lxLABEL -fill #%6.6x\n", canvas, x,
- x->x_gui.x_lcol);
- sys_vgui("destroy %s\n", sh->h_pathname);
- sys_vgui(".x%lx.c delete %lxSCALE\n", canvas, x);
- x->x_gui.scale_vis = 0;
- sys_vgui("destroy %s\n", lh->h_pathname);
- sys_vgui(".x%lx.c delete %lxLABELH\n", canvas, x);
- x->x_gui.scale_vis = 0;
- }
- //}
+ //if (glist_isvisible(canvas)) {
+
+ if(x->x_gui.x_fsf.x_selected)
+ {
+
+ /* check if we are drawing inside a gop abstraction visible
+ on parent canvas. If so, disable highlighting */
+ if (x->x_gui.x_glist == glist_getcanvas(glist))
+ {
+ char *nlet_tag = iem_get_tag(glist, (t_iemgui *)x);
+
+ for(i=0; i<n; i++)
+ {
+ sys_vgui(".x%lx.c itemconfigure %lxBASE%d "
+ "-stroke $pd_colors(selection)\n",
+ canvas, x, i);
+ }
+ sys_vgui(".x%lx.c itemconfigure %lxLABEL "
+ "-fill $pd_colors(selection)\n",
+ canvas, x);
+
+ if (x->x_gui.scale_vis)
+ {
+ sys_vgui("destroy %s\n", sh->h_pathname);
+ sys_vgui(".x%lx.c delete %lxSCALE\n", canvas, x);
+ }
+
+ sys_vgui("canvas %s -width %d -height %d "
+ "-bg $pd_colors(selection) "
+ "-bd 0 -cursor bottom_right_corner\n",
+ sh->h_pathname, SCALEHANDLE_WIDTH, SCALEHANDLE_HEIGHT);
+ sys_vgui(".x%x.c create window %d %d -anchor nw -width %d "
+ "-height %d -window %s -tags {%lxSCALE %lxVRDO %s}\n",
+ canvas,
+ x->x_gui.x_obj.te_xpix +
+ x->x_gui.x_w - SCALEHANDLE_WIDTH - 1,
+ x->x_gui.x_obj.te_ypix +
+ x->x_gui.x_h * x->x_number - SCALEHANDLE_HEIGHT - 1,
+ SCALEHANDLE_WIDTH, SCALEHANDLE_HEIGHT,
+ sh->h_pathname, x, x, nlet_tag);
+ sys_vgui("bind %s <Button> "
+ "{pd [concat %s _click 1 %%x %%y \\;]}\n",
+ sh->h_pathname, sh->h_bindsym->s_name);
+ sys_vgui("bind %s <ButtonRelease> "
+ "{pd [concat %s _click 0 0 0 \\;]}\n",
+ sh->h_pathname, sh->h_bindsym->s_name);
+ sys_vgui("bind %s <Motion> "
+ "{pd [concat %s _motion %%x %%y \\;]}\n",
+ sh->h_pathname, sh->h_bindsym->s_name);
+ x->x_gui.scale_vis = 1;
+
+ if (strcmp(x->x_gui.x_lab->s_name, "empty") != 0)
+ {
+ if (x->x_gui.label_vis)
+ {
+ sys_vgui("destroy %s\n", lh->h_pathname);
+ sys_vgui(".x%lx.c delete %lxLABELH\n", canvas, x);
+ }
+
+ sys_vgui("canvas %s -width %d -height %d "
+ "-bg $pd_colors(selection) "
+ "-bd 0 -cursor crosshair\n",
+ lh->h_pathname, LABELHANDLE_WIDTH, LABELHANDLE_HEIGHT);
+ sys_vgui(".x%x.c create window %d %d -anchor nw "
+ "-width %d -height %d -window %s "
+ "-tags {%lxLABEL %lxLABELH %lxVRDO %s}\n",
+ canvas,
+ x->x_gui.x_obj.te_xpix +
+ x->x_gui.x_ldx - LABELHANDLE_WIDTH,
+ x->x_gui.x_obj.te_ypix +
+ x->x_gui.x_ldy - LABELHANDLE_HEIGHT,
+ LABELHANDLE_WIDTH, LABELHANDLE_HEIGHT,
+ lh->h_pathname, x, x, x, nlet_tag);
+ sys_vgui("bind %s <Button> "
+ "{pd [concat %s _click 1 %%x %%y \\;]}\n",
+ lh->h_pathname, lh->h_bindsym->s_name);
+ sys_vgui("bind %s <ButtonRelease> "
+ "{pd [concat %s _click 0 0 0 \\;]}\n",
+ lh->h_pathname, lh->h_bindsym->s_name);
+ sys_vgui("bind %s <Motion> "
+ "{pd [concat %s _motion %%x %%y \\;]}\n",
+ lh->h_pathname, lh->h_bindsym->s_name);
+ x->x_gui.label_vis = 1;
+ }
+ }
+
+ sys_vgui(".x%lx.c addtag selected withtag %lxVRDO\n", canvas, x);
+ }
+ else
+ {
+ for(i=0; i<n; i++)
+ {
+ sys_vgui(".x%lx.c dtag %lxVRDO selected\n", canvas, x);
+ sys_vgui(".x%lx.c itemconfigure %lxBASE%d -stroke %s\n",
+ canvas, x, i, IEM_GUI_COLOR_NORMAL);
+ }
+ sys_vgui(".x%lx.c itemconfigure %lxLABEL -fill #%6.6x\n",
+ canvas, x, x->x_gui.x_lcol);
+ sys_vgui("destroy %s\n", sh->h_pathname);
+ sys_vgui(".x%lx.c delete %lxSCALE\n", canvas, x);
+ x->x_gui.scale_vis = 0;
+ sys_vgui("destroy %s\n", lh->h_pathname);
+ sys_vgui(".x%lx.c delete %lxLABELH\n", canvas, x);
+ x->x_gui.scale_vis = 0;
+ }
+ //}
}
-static void vradio__clickhook(t_scalehandle *sh, t_floatarg f, t_floatarg xxx, t_floatarg yyy)
+static void vradio__clickhook(t_scalehandle *sh, t_floatarg f, t_floatarg xxx,
+ t_floatarg yyy)
{
- t_vradio *x = (t_vradio *)(sh->h_master);
+ t_vradio *x = (t_vradio *)(sh->h_master);
- if (xxx) {
- x->x_gui.scale_offset_x = xxx;
- x->x_gui.label_offset_x = xxx;
- }
- if (yyy) {
- x->x_gui.scale_offset_y = yyy;
- x->x_gui.label_offset_y = yyy;
- }
+ if (xxx)
+ {
+ x->x_gui.scale_offset_x = xxx;
+ x->x_gui.label_offset_x = xxx;
+ }
+ if (yyy)
+ {
+ x->x_gui.scale_offset_y = yyy;
+ x->x_gui.label_offset_y = yyy;
+ }
int newstate = (int)f;
if (sh->h_dragon && newstate == 0 && sh->h_scale)
{
- /* done dragging */
-
- /* first set up the undo apply */
- canvas_apply_setundo(x->x_gui.x_glist, (t_gobj *)x);
-
- if (sh->h_dragx || sh->h_dragy) {
-
- sh->h_dragy = sh->h_dragx;
-
- x->x_gui.x_w = x->x_gui.x_w + sh->h_dragx - x->x_gui.scale_offset_x;
- if (x->x_gui.x_w < SCALE_VRDO_MINWIDTH)
- x->x_gui.x_w = SCALE_VRDO_MINWIDTH;
- x->x_gui.x_h = x->x_gui.x_h + sh->h_dragy - x->x_gui.scale_offset_x;
- if (x->x_gui.x_h < SCALE_VRDO_MINHEIGHT)
- x->x_gui.x_h = SCALE_VRDO_MINHEIGHT;
-
- canvas_dirty(x->x_gui.x_glist, 1);
- }
-
- int properties = gfxstub_haveproperties((void *)x);
-
- if (properties) {
- sys_vgui(".gfxstub%lx.dim.w_ent delete 0 end\n", properties);
- sys_vgui(".gfxstub%lx.dim.w_ent insert 0 %d\n", properties, x->x_gui.x_w);
- //sys_vgui(".gfxstub%lx.dim.h_ent delete 0 end\n", properties);
- //sys_vgui(".gfxstub%lx.dim.h_ent insert 0 %d\n", properties, x->x_gui.x_h);
- }
-
- if (glist_isvisible(x->x_gui.x_glist))
- {
- sys_vgui(".x%x.c delete %s\n", x->x_gui.x_glist, sh->h_outlinetag);
- vradio_draw_move(x, x->x_gui.x_glist);
- iemgui_select((t_gobj *)x, x->x_gui.x_glist, 1);
- canvas_fixlinesfor(x->x_gui.x_glist, (t_text *)x);
- sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", x->x_gui.x_glist);
- }
+ /* done dragging */
+
+ /* first set up the undo apply */
+ canvas_apply_setundo(x->x_gui.x_glist, (t_gobj *)x);
+
+ if (sh->h_dragx || sh->h_dragy)
+ {
+
+ sh->h_dragy = sh->h_dragx;
+
+ x->x_gui.x_w = x->x_gui.x_w + sh->h_dragx - x->x_gui.scale_offset_x;
+ if (x->x_gui.x_w < SCALE_VRDO_MINWIDTH)
+ x->x_gui.x_w = SCALE_VRDO_MINWIDTH;
+ x->x_gui.x_h = x->x_gui.x_h + sh->h_dragy - x->x_gui.scale_offset_x;
+ if (x->x_gui.x_h < SCALE_VRDO_MINHEIGHT)
+ x->x_gui.x_h = SCALE_VRDO_MINHEIGHT;
+
+ canvas_dirty(x->x_gui.x_glist, 1);
+ }
+
+ int properties = gfxstub_haveproperties((void *)x);
+
+ if (properties)
+ {
+ sys_vgui(".gfxstub%lx.dim.w_ent delete 0 end\n", properties);
+ sys_vgui(".gfxstub%lx.dim.w_ent insert 0 %d\n",
+ properties, x->x_gui.x_w);
+ //sys_vgui(".gfxstub%lx.dim.h_ent delete 0 end\n", properties);
+ //sys_vgui(".gfxstub%lx.dim.h_ent insert 0 %d\n",
+ // properties, x->x_gui.x_h);
+ }
+
+ if (glist_isvisible(x->x_gui.x_glist))
+ {
+ sys_vgui(".x%x.c delete %s\n", x->x_gui.x_glist, sh->h_outlinetag);
+ vradio_draw_move(x, x->x_gui.x_glist);
+ iemgui_select((t_gobj *)x, x->x_gui.x_glist, 1);
+ canvas_fixlinesfor(x->x_gui.x_glist, (t_text *)x);
+ sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", x->x_gui.x_glist);
+ }
}
else if (!sh->h_dragon && newstate && sh->h_scale)
{
- /* dragging */
- if (glist_isvisible(x->x_gui.x_glist))
- {
- sys_vgui("lower %s\n", sh->h_pathname);
- sys_vgui(".x%x.c create prect %d %d %d %d\
- -stroke $pd_colors(selection) -strokewidth 1 -tags %s\n",
- x->x_gui.x_glist, x->x_gui.x_obj.te_xpix, x->x_gui.x_obj.te_ypix,
- x->x_gui.x_obj.te_xpix + x->x_gui.x_w,
- x->x_gui.x_obj.te_ypix + (x->x_gui.x_h * x->x_number), sh->h_outlinetag);
- }
-
- sh->h_dragx = 0;
- sh->h_dragy = 0;
+ /* dragging */
+ if (glist_isvisible(x->x_gui.x_glist))
+ {
+ sys_vgui("lower %s\n", sh->h_pathname);
+ sys_vgui(".x%x.c create prect %d %d %d %d "
+ "-stroke $pd_colors(selection) -strokewidth 1 "
+ "-tags %s\n",
+ x->x_gui.x_glist,
+ x->x_gui.x_obj.te_xpix, x->x_gui.x_obj.te_ypix,
+ x->x_gui.x_obj.te_xpix + x->x_gui.x_w,
+ x->x_gui.x_obj.te_ypix + (x->x_gui.x_h * x->x_number),
+ sh->h_outlinetag);
+ }
+
+ sh->h_dragx = 0;
+ sh->h_dragy = 0;
}
- else if (sh->h_dragon && newstate == 0 && !sh->h_scale)
+ else if (sh->h_dragon && newstate == 0 && !sh->h_scale)
{
- /* done dragging */
+ /* done dragging */
- /* first set up the undo apply */
- canvas_apply_setundo(x->x_gui.x_glist, (t_gobj *)x);
+ /* first set up the undo apply */
+ canvas_apply_setundo(x->x_gui.x_glist, (t_gobj *)x);
- if (sh->h_dragx || sh->h_dragy) {
+ if (sh->h_dragx || sh->h_dragy)
+ {
- x->x_gui.x_ldx = x->x_gui.x_ldx + sh->h_dragx - x->x_gui.label_offset_x;
- x->x_gui.x_ldy = x->x_gui.x_ldy + sh->h_dragy - x->x_gui.label_offset_y;
+ x->x_gui.x_ldx =
+ x->x_gui.x_ldx + sh->h_dragx - x->x_gui.label_offset_x;
+ x->x_gui.x_ldy =
+ x->x_gui.x_ldy + sh->h_dragy - x->x_gui.label_offset_y;
- canvas_dirty(x->x_gui.x_glist, 1);
- }
+ canvas_dirty(x->x_gui.x_glist, 1);
+ }
- int properties = gfxstub_haveproperties((void *)x);
+ int properties = gfxstub_haveproperties((void *)x);
- if (properties) {
- sys_vgui(".gfxstub%lx.dim.w_ent delete 0 end\n", properties);
- sys_vgui(".gfxstub%lx.dim.w_ent insert 0 %d\n", properties, x->x_gui.x_w);
- //sys_vgui(".gfxstub%lx.dim.h_ent delete 0 end\n", properties);
- //sys_vgui(".gfxstub%lx.dim.h_ent insert 0 %d\n", properties, x->x_gui.x_h);
- }
+ if (properties)
+ {
+ sys_vgui(".gfxstub%lx.dim.w_ent delete 0 end\n", properties);
+ sys_vgui(".gfxstub%lx.dim.w_ent insert 0 %d\n",
+ properties, x->x_gui.x_w);
+ //sys_vgui(".gfxstub%lx.dim.h_ent delete 0 end\n", properties);
+ //sys_vgui(".gfxstub%lx.dim.h_ent insert 0 %d\n",
+ // properties, x->x_gui.x_h);
+ }
- if (glist_isvisible(x->x_gui.x_glist))
- {
- sys_vgui(".x%x.c delete %s\n", x->x_gui.x_glist, sh->h_outlinetag);
- vradio_draw_move(x, x->x_gui.x_glist);
- iemgui_select((t_gobj *)x, x->x_gui.x_glist, 1);
- canvas_fixlinesfor(x->x_gui.x_glist, (t_text *)x);
- sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", x->x_gui.x_glist);
- }
+ if (glist_isvisible(x->x_gui.x_glist))
+ {
+ sys_vgui(".x%x.c delete %s\n", x->x_gui.x_glist, sh->h_outlinetag);
+ vradio_draw_move(x, x->x_gui.x_glist);
+ iemgui_select((t_gobj *)x, x->x_gui.x_glist, 1);
+ canvas_fixlinesfor(x->x_gui.x_glist, (t_text *)x);
+ sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", x->x_gui.x_glist);
+ }
}
else if (!sh->h_dragon && newstate && !sh->h_scale)
{
- /* dragging */
- if (glist_isvisible(x->x_gui.x_glist)) {
- sys_vgui("lower %s\n", sh->h_pathname);
- t_scalehandle *othersh = (t_scalehandle *)x->x_gui.x_handle;
- sys_vgui("lower .x%lx.h%lx\n", (t_int)glist_getcanvas(x->x_gui.x_glist), (t_int)othersh);
- }
-
- sh->h_dragx = 0;
- sh->h_dragy = 0;
+ /* dragging */
+ if (glist_isvisible(x->x_gui.x_glist))
+ {
+ sys_vgui("lower %s\n", sh->h_pathname);
+ t_scalehandle *othersh = (t_scalehandle *)x->x_gui.x_handle;
+ sys_vgui("lower .x%lx.h%lx\n",
+ (t_int)glist_getcanvas(x->x_gui.x_glist), (t_int)othersh);
+ }
+
+ sh->h_dragx = 0;
+ sh->h_dragy = 0;
}
sh->h_dragon = newstate;
}
static void vradio__motionhook(t_scalehandle *sh,
- t_floatarg f1, t_floatarg f2)
+ t_floatarg f1, t_floatarg f2)
{
if (sh->h_dragon && sh->h_scale)
{
- t_vradio *x = (t_vradio *)(sh->h_master);
- int dx = (int)f1, dy = (int)f2;
- int newx, newy;
-
- dy = dx;
-
- newx = x->x_gui.x_obj.te_xpix + x->x_gui.x_h + (dx - x->x_gui.scale_offset_x);
- newy = x->x_gui.x_obj.te_ypix + x->x_gui.x_h * x->x_number + (dy - x->x_gui.scale_offset_x) * x->x_number;
-
- if (newx < x->x_gui.x_obj.te_xpix + SCALE_VRDO_MINWIDTH)
- newx = x->x_gui.x_obj.te_xpix + SCALE_VRDO_MINWIDTH;
- if (newy < x->x_gui.x_obj.te_ypix + SCALE_VRDO_MINHEIGHT*x->x_number)
- newy = x->x_gui.x_obj.te_ypix + SCALE_VRDO_MINHEIGHT*x->x_number;
-
- if (glist_isvisible(x->x_gui.x_glist)) {
- sys_vgui(".x%x.c coords %s %d %d %d %d\n",
- x->x_gui.x_glist, sh->h_outlinetag, x->x_gui.x_obj.te_xpix,
- x->x_gui.x_obj.te_ypix, newx, newy);
- }
- sh->h_dragx = dx;
- sh->h_dragy = dy;
-
- int properties = gfxstub_haveproperties((void *)x);
-
- if (properties) {
- int new_w = x->x_gui.x_h - x->x_gui.scale_offset_y + sh->h_dragy;
- //int new_h = x->x_gui.x_h - x->x_gui.scale_offset_y + sh->h_dragy;
- sys_vgui(".gfxstub%lx.dim.w_ent delete 0 end\n", properties);
- sys_vgui(".gfxstub%lx.dim.w_ent insert 0 %d\n", properties, new_w);
- //sys_vgui(".gfxstub%lx.dim.h_ent delete 0 end\n", properties);
- //sys_vgui(".gfxstub%lx.dim.h_ent insert 0 %d\n", properties, new_h);
- }
+ t_vradio *x = (t_vradio *)(sh->h_master);
+ int dx = (int)f1, dy = (int)f2;
+ int newx, newy;
+
+ dy = dx;
+
+ newx = x->x_gui.x_obj.te_xpix + x->x_gui.x_h +
+ (dx - x->x_gui.scale_offset_x);
+ newy = x->x_gui.x_obj.te_ypix + x->x_gui.x_h * x->x_number +
+ (dy - x->x_gui.scale_offset_x) * x->x_number;
+
+ if (newx < x->x_gui.x_obj.te_xpix + SCALE_VRDO_MINWIDTH)
+ newx = x->x_gui.x_obj.te_xpix + SCALE_VRDO_MINWIDTH;
+ if (newy < x->x_gui.x_obj.te_ypix + SCALE_VRDO_MINHEIGHT*x->x_number)
+ newy = x->x_gui.x_obj.te_ypix + SCALE_VRDO_MINHEIGHT*x->x_number;
+
+ if (glist_isvisible(x->x_gui.x_glist))
+ {
+ sys_vgui(".x%x.c coords %s %d %d %d %d\n",
+ x->x_gui.x_glist, sh->h_outlinetag, x->x_gui.x_obj.te_xpix,
+ x->x_gui.x_obj.te_ypix, newx, newy);
+ }
+ sh->h_dragx = dx;
+ sh->h_dragy = dy;
+
+ int properties = gfxstub_haveproperties((void *)x);
+
+ if (properties)
+ {
+ int new_w = x->x_gui.x_h - x->x_gui.scale_offset_y + sh->h_dragy;
+ //int new_h = x->x_gui.x_h - x->x_gui.scale_offset_y + sh->h_dragy;
+ sys_vgui(".gfxstub%lx.dim.w_ent delete 0 end\n", properties);
+ sys_vgui(".gfxstub%lx.dim.w_ent insert 0 %d\n", properties, new_w);
+ //sys_vgui(".gfxstub%lx.dim.h_ent delete 0 end\n", properties);
+ //sys_vgui(".gfxstub%lx.dim.h_ent insert 0 %d\n", properties, new_h);
+ }
}
- if (sh->h_dragon && !sh->h_scale)
+ if (sh->h_dragon && !sh->h_scale)
{
- t_bng *x = (t_bng *)(sh->h_master);
- int dx = (int)f1, dy = (int)f2;
- int newx, newy;
- newx = x->x_gui.x_obj.te_xpix + x->x_gui.x_w - x->x_gui.scale_offset_x + dx;
- newy = x->x_gui.x_obj.te_ypix + x->x_gui.x_h - x->x_gui.scale_offset_y + dy;
-
- sh->h_dragx = dx;
- sh->h_dragy = dy;
-
- int properties = gfxstub_haveproperties((void *)x);
-
- if (properties) {
- int new_x = x->x_gui.x_ldx - x->x_gui.label_offset_x + sh->h_dragx;
- int new_y = x->x_gui.x_ldy - x->x_gui.label_offset_y + sh->h_dragy;
- sys_vgui(".gfxstub%lx.label.xy.x_entry delete 0 end\n", properties);
- sys_vgui(".gfxstub%lx.label.xy.x_entry insert 0 %d\n", properties, new_x);
- sys_vgui(".gfxstub%lx.label.xy.y_entry delete 0 end\n", properties);
- sys_vgui(".gfxstub%lx.label.xy.y_entry insert 0 %d\n", properties, new_y);
- }
-
- if (glist_isvisible(x->x_gui.x_glist)) {
- int xpos=text_xpix(&x->x_gui.x_obj, x->x_gui.x_glist);
- int ypos=text_ypix(&x->x_gui.x_obj, x->x_gui.x_glist);
- t_canvas *canvas=glist_getcanvas(x->x_gui.x_glist);
- sys_vgui(".x%lx.c coords %lxLABEL %d %d\n",
- canvas, x, xpos+x->x_gui.x_ldx + sh->h_dragx - x->x_gui.label_offset_x,
- ypos+x->x_gui.x_ldy + sh->h_dragy - x->x_gui.label_offset_y);
- }
+ t_bng *x = (t_bng *)(sh->h_master);
+ int dx = (int)f1, dy = (int)f2;
+ int newx, newy;
+ newx = x->x_gui.x_obj.te_xpix + x->x_gui.x_w -
+ x->x_gui.scale_offset_x + dx;
+ newy = x->x_gui.x_obj.te_ypix + x->x_gui.x_h -
+ x->x_gui.scale_offset_y + dy;
+
+ sh->h_dragx = dx;
+ sh->h_dragy = dy;
+
+ int properties = gfxstub_haveproperties((void *)x);
+
+ if (properties)
+ {
+ int new_x = x->x_gui.x_ldx - x->x_gui.label_offset_x + sh->h_dragx;
+ int new_y = x->x_gui.x_ldy - x->x_gui.label_offset_y + sh->h_dragy;
+ sys_vgui(".gfxstub%lx.label.xy.x_entry delete 0 end\n", properties);
+ sys_vgui(".gfxstub%lx.label.xy.x_entry insert 0 %d\n",
+ properties, new_x);
+ sys_vgui(".gfxstub%lx.label.xy.y_entry delete 0 end\n", properties);
+ sys_vgui(".gfxstub%lx.label.xy.y_entry insert 0 %d\n",
+ properties, new_y);
+ }
+
+ if (glist_isvisible(x->x_gui.x_glist))
+ {
+ int xpos=text_xpix(&x->x_gui.x_obj, x->x_gui.x_glist);
+ int ypos=text_ypix(&x->x_gui.x_obj, x->x_gui.x_glist);
+ t_canvas *canvas=glist_getcanvas(x->x_gui.x_glist);
+ sys_vgui(".x%lx.c coords %lxLABEL %d %d\n",
+ canvas, x,
+ xpos+x->x_gui.x_ldx + sh->h_dragx - x->x_gui.label_offset_x,
+ ypos+x->x_gui.x_ldy + sh->h_dragy - x->x_gui.label_offset_y);
+ }
}
}
@@ -505,10 +592,11 @@ void vradio_draw(t_vradio *x, t_glist *glist, int mode)
sys_queuegui(x, glist, vradio_draw_update);
else if(mode == IEM_GUI_DRAW_MODE_MOVE)
vradio_draw_move(x, glist);
- else if(mode == IEM_GUI_DRAW_MODE_NEW) {
+ else if(mode == IEM_GUI_DRAW_MODE_NEW)
+ {
vradio_draw_new(x, glist);
- sys_vgui(".x%lx.c raise all_cords\n", glist_getcanvas(glist));
- }
+ sys_vgui(".x%lx.c raise all_cords\n", glist_getcanvas(glist));
+ }
else if(mode == IEM_GUI_DRAW_MODE_SELECT)
vradio_draw_select(x, glist);
else if(mode == IEM_GUI_DRAW_MODE_ERASE)
@@ -521,7 +609,8 @@ void vradio_draw(t_vradio *x, t_glist *glist, int mode)
/* ------------------------ vdl widgetbehaviour----------------------------- */
-static void vradio_getrect(t_gobj *z, t_glist *glist, int *xp1, int *yp1, int *xp2, int *yp2)
+static void vradio_getrect(t_gobj *z, t_glist *glist, int *xp1, int *yp1,
+ int *xp2, int *yp2)
{
t_vradio *x = (t_vradio *)z;
@@ -530,7 +619,7 @@ static void vradio_getrect(t_gobj *z, t_glist *glist, int *xp1, int *yp1, int *x
*xp2 = *xp1 + x->x_gui.x_w;
*yp2 = *yp1 + x->x_gui.x_h*x->x_number;
- iemgui_label_getrect(x->x_gui, glist, xp1, yp1, xp2, yp2);
+ iemgui_label_getrect(x->x_gui, glist, xp1, yp1, xp2, yp2);
}
static void vradio_save(t_gobj *z, t_binbuf *b)
@@ -578,13 +667,14 @@ static void vradio_properties(t_gobj *z, t_glist *owner)
srl[0]->s_name, srl[1]->s_name,
srl[2]->s_name, x->x_gui.x_ldx, x->x_gui.x_ldy,
x->x_gui.x_fsf.x_font_style, x->x_gui.x_fontsize,
- 0xffffff & x->x_gui.x_bcol, 0xffffff & x->x_gui.x_fcol, 0xffffff & x->x_gui.x_lcol);
+ 0xffffff & x->x_gui.x_bcol, 0xffffff & x->x_gui.x_fcol,
+ 0xffffff & x->x_gui.x_lcol);
gfxstub_new(&x->x_gui.x_obj.ob_pd, x, buf);
}
static void vradio_dialog(t_vradio *x, t_symbol *s, int argc, t_atom *argv)
{
- canvas_apply_setundo(x->x_gui.x_glist, (t_gobj *)x);
+ canvas_apply_setundo(x->x_gui.x_glist, (t_gobj *)x);
t_symbol *srl[3];
int a = (int)atom_getintarg(0, argc, argv);
@@ -607,7 +697,7 @@ static void vradio_dialog(t_vradio *x, t_symbol *s, int argc, t_atom *argv)
x->x_on_old = x->x_on;
}
//(*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_NEW);
- iemgui_shouldvis((void *)x, &x->x_gui, IEM_GUI_DRAW_MODE_NEW);
+ iemgui_shouldvis((void *)x, &x->x_gui, IEM_GUI_DRAW_MODE_NEW);
}
else
{
@@ -615,17 +705,19 @@ static void vradio_dialog(t_vradio *x, t_symbol *s, int argc, t_atom *argv)
(*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_IO + sr_flags);
//(*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_MOVE);
//canvas_fixlinesfor(glist_getcanvas(x->x_gui.x_glist), (t_text*)x);
- iemgui_shouldvis((void *)x, &x->x_gui, IEM_GUI_DRAW_MODE_MOVE);
+ iemgui_shouldvis((void *)x, &x->x_gui, IEM_GUI_DRAW_MODE_MOVE);
}
- /* forcing redraw of the scale handle */
- if (x->x_gui.x_fsf.x_selected) {
- vradio_draw_select(x, x->x_gui.x_glist);
- }
+ /* forcing redraw of the scale handle */
+ if (x->x_gui.x_fsf.x_selected)
+ {
+ vradio_draw_select(x, x->x_gui.x_glist);
+ }
- //ico@bukvic.net 100518 update scrollbars when object potentially exceeds window size
+ /* ico@bukvic.net 100518
+ update scrollbars when object potentially exceeds window size */
t_canvas *canvas=(t_canvas *)glist_getcanvas(x->x_gui.x_glist);
- sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", (long unsigned int)canvas);
+ sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", (long unsigned int)canvas);
}
static void vradio_set(t_vradio *x, t_floatarg f)
@@ -643,14 +735,14 @@ static void vradio_set(t_vradio *x, t_floatarg f)
x->x_on_old = x->x_on;
x->x_on = i;
if (x->x_on != x->x_on_old)
- (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE);
+ (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE);
x->x_on_old = old;
}
else
{
x->x_on = i;
if (x->x_on != x->x_on_old)
- (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE);
+ (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE);
}
}
@@ -718,7 +810,7 @@ static void vradio_fout(t_vradio *x, t_floatarg f)
x->x_on_old = x->x_on;
x->x_on = i;
if (x->x_on != x->x_on_old)
- (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE);
+ (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE);
outlet_float(x->x_gui.x_obj.ob_outlet, x->x_on);
if (x->x_gui.x_fsf.x_snd_able && x->x_gui.x_snd->s_thing)
pd_float(x->x_gui.x_snd->s_thing, x->x_on);
@@ -767,7 +859,7 @@ static void vradio_float(t_vradio *x, t_floatarg f)
x->x_on_old = x->x_on;
x->x_on = i;
if (x->x_on != x->x_on_old)
- (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE);
+ (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE);
if (x->x_gui.x_fsf.x_put_in2out)
{
outlet_float(x->x_gui.x_obj.ob_outlet, x->x_on);
@@ -868,7 +960,8 @@ static void *vradio_donew(t_symbol *s, int argc, t_atom *argv, int old)
int a=IEM_GUI_DEFAULTSIZE, on=0, f=0;
int ldx=0, ldy=-8, chg=1, num=8;
int fs=10;
- int ftbreak=IEM_BNG_DEFAULTBREAKFLASHTIME, fthold=IEM_BNG_DEFAULTHOLDFLASHTIME;
+ int ftbreak = IEM_BNG_DEFAULTBREAKFLASHTIME,
+ fthold = IEM_BNG_DEFAULTHOLDFLASHTIME;
char str[144];
if((argc == 15)&&IS_A_FLOAT(argv,0)&&IS_A_FLOAT(argv,1)&&IS_A_FLOAT(argv,2)
@@ -935,7 +1028,7 @@ static void *vradio_donew(t_symbol *s, int argc, t_atom *argv, int old)
iemgui_all_colfromload(&x->x_gui, bflcol);
outlet_new(&x->x_gui.x_obj, &s_list);
- /* scale handle init */
+ /* scale handle init */
t_scalehandle *sh;
char buf[64];
x->x_gui.x_handle = pd_new(scalehandle_class);
@@ -945,27 +1038,27 @@ static void *vradio_donew(t_symbol *s, int argc, t_atom *argv, int old)
pd_bind(x->x_gui.x_handle, sh->h_bindsym = gensym(buf));
sprintf(sh->h_outlinetag, "h%lx", (t_int)sh);
sh->h_dragon = 0;
- sh->h_scale = 1;
- x->x_gui.scale_offset_x = 0;
- x->x_gui.scale_offset_y = 0;
- x->x_gui.scale_vis = 0;
-
- /* label handle init */
- t_scalehandle *lh;
- char lhbuf[64];
- x->x_gui.x_lhandle = pd_new(scalehandle_class);
- lh = (t_scalehandle *)x->x_gui.x_lhandle;
- lh->h_master = (t_gobj*)x;
- sprintf(lhbuf, "_h%lx", (t_int)lh);
- pd_bind(x->x_gui.x_lhandle, lh->h_bindsym = gensym(lhbuf));
- sprintf(lh->h_outlinetag, "h%lx", (t_int)lh);
- lh->h_dragon = 0;
- lh->h_scale = 0;
- x->x_gui.label_offset_x = 0;
- x->x_gui.label_offset_y = 0;
- x->x_gui.label_vis = 0;
-
- x->x_gui.x_obj.te_iemgui = 1;
+ sh->h_scale = 1;
+ x->x_gui.scale_offset_x = 0;
+ x->x_gui.scale_offset_y = 0;
+ x->x_gui.scale_vis = 0;
+
+ /* label handle init */
+ t_scalehandle *lh;
+ char lhbuf[64];
+ x->x_gui.x_lhandle = pd_new(scalehandle_class);
+ lh = (t_scalehandle *)x->x_gui.x_lhandle;
+ lh->h_master = (t_gobj*)x;
+ sprintf(lhbuf, "_h%lx", (t_int)lh);
+ pd_bind(x->x_gui.x_lhandle, lh->h_bindsym = gensym(lhbuf));
+ sprintf(lh->h_outlinetag, "h%lx", (t_int)lh);
+ lh->h_dragon = 0;
+ lh->h_scale = 0;
+ x->x_gui.label_offset_x = 0;
+ x->x_gui.label_offset_y = 0;
+ x->x_gui.label_vis = 0;
+
+ x->x_gui.x_obj.te_iemgui = 1;
return (x);
}
@@ -986,19 +1079,21 @@ static void vradio_ff(t_vradio *x)
pd_unbind(&x->x_gui.x_obj.ob_pd, x->x_gui.x_rcv);
gfxstub_deleteforkey(x);
- /* scale handle deconstructor */
+ /* scale handle deconstructor */
if (x->x_gui.x_handle)
{
- pd_unbind(x->x_gui.x_handle, ((t_scalehandle *)x->x_gui.x_handle)->h_bindsym);
- pd_free(x->x_gui.x_handle);
+ pd_unbind(x->x_gui.x_handle,
+ ((t_scalehandle *)x->x_gui.x_handle)->h_bindsym);
+ pd_free(x->x_gui.x_handle);
}
- /* label handle deconstructor */
- if (x->x_gui.x_lhandle)
- {
- pd_unbind(x->x_gui.x_lhandle, ((t_scalehandle *)x->x_gui.x_lhandle)->h_bindsym);
- pd_free(x->x_gui.x_lhandle);
- }
+ /* label handle deconstructor */
+ if (x->x_gui.x_lhandle)
+ {
+ pd_unbind(x->x_gui.x_lhandle,
+ ((t_scalehandle *)x->x_gui.x_lhandle)->h_bindsym);
+ pd_free(x->x_gui.x_lhandle);
+ }
}
void g_vradio_setup(void)
@@ -1043,11 +1138,11 @@ void g_vradio_setup(void)
gensym("double_change"), 0);
scalehandle_class = class_new(gensym("_scalehandle"), 0, 0,
- sizeof(t_scalehandle), CLASS_PD, 0);
+ sizeof(t_scalehandle), CLASS_PD, 0);
class_addmethod(scalehandle_class, (t_method)vradio__clickhook,
- gensym("_click"), A_FLOAT, A_FLOAT, A_FLOAT, 0);
+ gensym("_click"), A_FLOAT, A_FLOAT, A_FLOAT, 0);
class_addmethod(scalehandle_class, (t_method)vradio__motionhook,
- gensym("_motion"), A_FLOAT, A_FLOAT, 0);
+ gensym("_motion"), A_FLOAT, A_FLOAT, 0);
vradio_widgetbehavior.w_getrectfn = vradio_getrect;
vradio_widgetbehavior.w_displacefn = iemgui_displace;
@@ -1056,7 +1151,7 @@ void g_vradio_setup(void)
vradio_widgetbehavior.w_deletefn = iemgui_delete;
vradio_widgetbehavior.w_visfn = iemgui_vis;
vradio_widgetbehavior.w_clickfn = vradio_newclick;
- vradio_widgetbehavior.w_displacefnwtag = iemgui_displace_withtag;
+ vradio_widgetbehavior.w_displacefnwtag = iemgui_displace_withtag;
class_setwidget(vradio_class, &vradio_widgetbehavior);
class_sethelpsymbol(vradio_class, gensym("vradio"));
class_setsavefn(vradio_class, vradio_save);
@@ -1069,23 +1164,38 @@ void g_vradio_setup(void)
class_addfloat(vradio_old_class, vradio_float);
class_addmethod(vradio_old_class, (t_method)vradio_click, gensym("click"),
A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0);
- class_addmethod(vradio_old_class, (t_method)vradio_dialog, gensym("dialog"),
- A_GIMME, 0);
- class_addmethod(vradio_old_class, (t_method)vradio_loadbang, gensym("loadbang"), 0);
- class_addmethod(vradio_old_class, (t_method)vradio_set, gensym("set"), A_FLOAT, 0);
- class_addmethod(vradio_old_class, (t_method)vradio_size, gensym("size"), A_GIMME, 0);
- class_addmethod(vradio_old_class, (t_method)vradio_delta, gensym("delta"), A_GIMME, 0);
- class_addmethod(vradio_old_class, (t_method)vradio_pos, gensym("pos"), A_GIMME, 0);
- class_addmethod(vradio_old_class, (t_method)vradio_color, gensym("color"), A_GIMME, 0);
- class_addmethod(vradio_old_class, (t_method)vradio_send, gensym("send"), A_DEFSYM, 0);
- class_addmethod(vradio_old_class, (t_method)vradio_receive, gensym("receive"), A_DEFSYM, 0);
- class_addmethod(vradio_old_class, (t_method)vradio_label, gensym("label"), A_DEFSYM, 0);
- class_addmethod(vradio_old_class, (t_method)vradio_label_pos, gensym("label_pos"), A_GIMME, 0);
- class_addmethod(vradio_old_class, (t_method)vradio_label_font, gensym("label_font"), A_GIMME, 0);
- class_addmethod(vradio_old_class, (t_method)vradio_init, gensym("init"), A_FLOAT, 0);
- class_addmethod(vradio_old_class, (t_method)vradio_number, gensym("number"), A_FLOAT, 0);
- class_addmethod(vradio_old_class, (t_method)vradio_single_change, gensym("single_change"), 0);
- class_addmethod(vradio_old_class, (t_method)vradio_double_change, gensym("double_change"), 0);
+ class_addmethod(vradio_old_class, (t_method)vradio_dialog,
+ gensym("dialog"), A_GIMME, 0);
+ class_addmethod(vradio_old_class, (t_method)vradio_loadbang,
+ gensym("loadbang"), 0);
+ class_addmethod(vradio_old_class, (t_method)vradio_set,
+ gensym("set"), A_FLOAT, 0);
+ class_addmethod(vradio_old_class, (t_method)vradio_size,
+ gensym("size"), A_GIMME, 0);
+ class_addmethod(vradio_old_class, (t_method)vradio_delta,
+ gensym("delta"), A_GIMME, 0);
+ class_addmethod(vradio_old_class, (t_method)vradio_pos,
+ gensym("pos"), A_GIMME, 0);
+ class_addmethod(vradio_old_class, (t_method)vradio_color,
+ gensym("color"), A_GIMME, 0);
+ class_addmethod(vradio_old_class, (t_method)vradio_send,
+ gensym("send"), A_DEFSYM, 0);
+ class_addmethod(vradio_old_class, (t_method)vradio_receive,
+ gensym("receive"), A_DEFSYM, 0);
+ class_addmethod(vradio_old_class, (t_method)vradio_label,
+ gensym("label"), A_DEFSYM, 0);
+ class_addmethod(vradio_old_class, (t_method)vradio_label_pos,
+ gensym("label_pos"), A_GIMME, 0);
+ class_addmethod(vradio_old_class, (t_method)vradio_label_font,
+ gensym("label_font"), A_GIMME, 0);
+ class_addmethod(vradio_old_class, (t_method)vradio_init,
+ gensym("init"), A_FLOAT, 0);
+ class_addmethod(vradio_old_class, (t_method)vradio_number,
+ gensym("number"), A_FLOAT, 0);
+ class_addmethod(vradio_old_class, (t_method)vradio_single_change,
+ gensym("single_change"), 0);
+ class_addmethod(vradio_old_class, (t_method)vradio_double_change,
+ gensym("double_change"), 0);
class_setwidget(vradio_old_class, &vradio_widgetbehavior);
class_sethelpsymbol(vradio_old_class, gensym("vradio"));
}
diff --git a/pd/src/m_pd.h b/pd/src/m_pd.h
index 5635b8dea0d67f4e9368d5e653add0ad1a9e6e52..369a12a5b68892e7161f8c384c2c00663ded8174 100644
--- a/pd/src/m_pd.h
+++ b/pd/src/m_pd.h
@@ -11,7 +11,7 @@ extern "C" {
#define PD_MAJOR_VERSION 0
#define PD_MINOR_VERSION 42
#define PD_BUGFIX_VERSION 7
-#define PD_TEST_VERSION "20140402"
+#define PD_TEST_VERSION "20140614"
#define PDL2ORK
/* old name for "MSW" flag -- we have to take it for the sake of many old
diff --git a/pd/tkdnd/autom4te.cache/output.0 b/pd/tkdnd/autom4te.cache/output.0
index 57dbb3735e37d267999ef4e1e0639ba8731ad17a..60bbca9da26520e9672c59ddafdbb901ff6f0a31 100644
--- a/pd/tkdnd/autom4te.cache/output.0
+++ b/pd/tkdnd/autom4te.cache/output.0
@@ -1,11 +1,9 @@
@%:@! /bin/sh
@%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.68 for tkdnd 2.6.
+@%:@ Generated by GNU Autoconf 2.69 for tkdnd 2.6.
@%:@
@%:@
-@%:@ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-@%:@ 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-@%:@ Foundation, Inc.
+@%:@ Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@%:@
@%:@
@%:@ This configure script is free software; the Free Software Foundation
@@ -134,6 +132,31 @@ export LANGUAGE
# CDPATH.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+# Use a proper internal environment variable to ensure we don't fall
+ # into an infinite loop, continuously re-executing ourselves.
+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+ _as_can_reexec=no; export _as_can_reexec;
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in @%:@ ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+ fi
+ # We don't want this to propagate to other subprocesses.
+ { _as_can_reexec=; unset _as_can_reexec;}
if test "x$CONFIG_SHELL" = x; then
as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
@@ -167,7 +190,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
else
exitcode=1; echo positional parameters were not saved.
fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -212,21 +236,25 @@ IFS=$as_save_IFS
if test "x$CONFIG_SHELL" != x; then :
- # We cannot yet assume a decent shell, so we have to provide a
- # neutralization value for shells without unset; and this also
- # works around shells that cannot unset nonexistent variables.
- # Preserve -v and -x to the replacement shell.
- BASH_ENV=/dev/null
- ENV=/dev/null
- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
- export CONFIG_SHELL
- case $- in @%:@ ((((
- *v*x* | *x*v* ) as_opts=-vx ;;
- *v* ) as_opts=-v ;;
- *x* ) as_opts=-x ;;
- * ) as_opts= ;;
- esac
- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+ export CONFIG_SHELL
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in @%:@ ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
fi
if test x$as_have_required = xno; then :
@@ -328,6 +356,14 @@ $as_echo X"$as_dir" |
} @%:@ as_fn_mkdir_p
+
+@%:@ as_fn_executable_p FILE
+@%:@ -----------------------
+@%:@ Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} @%:@ as_fn_executable_p
@%:@ as_fn_append VAR VALUE
@%:@ ----------------------
@%:@ Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -449,6 +485,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
chmod +x "$as_me.lineno" ||
{ $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+ # already done that, so ensure we don't try to do so again and fall
+ # in an infinite loop. This has already happened in practice.
+ _as_can_reexec=no; export _as_can_reexec
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
# original and so on. Autoconf is especially sensitive to this).
@@ -483,16 +523,16 @@ if (echo >conf$$.file) 2>/dev/null; then
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -504,28 +544,8 @@ else
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in @%:@(
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in @%:@((
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -1123,8 +1143,6 @@ target=$target_alias
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used" >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
@@ -1354,9 +1372,9 @@ test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
tkdnd configure 2.6
-generated by GNU Autoconf 2.68
+generated by GNU Autoconf 2.69
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -1698,7 +1716,7 @@ This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by tkdnd $as_me 2.6, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2175,7 +2193,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2219,7 +2237,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CXX="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2677,7 +2695,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2717,7 +2735,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2770,7 +2788,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2811,7 +2829,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
@@ -2869,7 +2887,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2913,7 +2931,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3109,8 +3127,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
struct buf { int x; };
FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -3350,7 +3367,7 @@ do
for ac_prog in grep ggrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+ as_fn_executable_p "$ac_path_GREP" || continue
# Check for GNU ac_path_GREP and select it if it is found.
# Check for GNU $ac_path_GREP
case `"$ac_path_GREP" --version 2>&1` in
@@ -3416,7 +3433,7 @@ do
for ac_prog in egrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+ as_fn_executable_p "$ac_path_EGREP" || continue
# Check for GNU ac_path_EGREP and select it if it is found.
# Check for GNU $ac_path_EGREP
case `"$ac_path_EGREP" --version 2>&1` in
@@ -3776,7 +3793,8 @@ int
main ()
{
static int test_array @<:@1 - 2 * !(sizeof (void *) <= sizeof ($tcl_cv_intptr_t))@:>@;
-test_array @<:@0@:>@ = 0
+test_array @<:@0@:>@ = 0;
+return test_array @<:@0@:>@;
;
return 0;
@@ -3827,7 +3845,8 @@ int
main ()
{
static int test_array @<:@1 - 2 * !(sizeof (void *) <= sizeof ($tcl_cv_uintptr_t))@:>@;
-test_array @<:@0@:>@ = 0
+test_array @<:@0@:>@ = 0;
+return test_array @<:@0@:>@;
;
return 0;
@@ -4306,16 +4325,16 @@ if (echo >conf$$.file) 2>/dev/null; then
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -4375,28 +4394,16 @@ else
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in @%:@(
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in @%:@((
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+
+@%:@ as_fn_executable_p FILE
+@%:@ -----------------------
+@%:@ Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} @%:@ as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -4418,7 +4425,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# values after options handling.
ac_log="
This file was extended by tkdnd $as_me 2.6, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -4471,10 +4478,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
tkdnd config.status 2.6
-configured by $0, generated by GNU Autoconf 2.68,
+configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -4551,7 +4558,7 @@ fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
if \$ac_cs_recheck; then
- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
shift
\$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
CONFIG_SHELL='$SHELL'
diff --git a/pd/tkdnd/autom4te.cache/output.1 b/pd/tkdnd/autom4te.cache/output.1
index eb8e218bf0e68e966a8fb9aad75b68ec94f58e23..09f4ebca816702e8eae9ed5967ef097e51caef9b 100644
--- a/pd/tkdnd/autom4te.cache/output.1
+++ b/pd/tkdnd/autom4te.cache/output.1
@@ -1,11 +1,9 @@
@%:@! /bin/sh
@%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.68 for tkdnd 2.6.
+@%:@ Generated by GNU Autoconf 2.69 for tkdnd 2.6.
@%:@
@%:@
-@%:@ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-@%:@ 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-@%:@ Foundation, Inc.
+@%:@ Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@%:@
@%:@
@%:@ This configure script is free software; the Free Software Foundation
@@ -134,6 +132,31 @@ export LANGUAGE
# CDPATH.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+# Use a proper internal environment variable to ensure we don't fall
+ # into an infinite loop, continuously re-executing ourselves.
+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+ _as_can_reexec=no; export _as_can_reexec;
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in @%:@ ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+ fi
+ # We don't want this to propagate to other subprocesses.
+ { _as_can_reexec=; unset _as_can_reexec;}
if test "x$CONFIG_SHELL" = x; then
as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
@@ -167,7 +190,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
else
exitcode=1; echo positional parameters were not saved.
fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -212,21 +236,25 @@ IFS=$as_save_IFS
if test "x$CONFIG_SHELL" != x; then :
- # We cannot yet assume a decent shell, so we have to provide a
- # neutralization value for shells without unset; and this also
- # works around shells that cannot unset nonexistent variables.
- # Preserve -v and -x to the replacement shell.
- BASH_ENV=/dev/null
- ENV=/dev/null
- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
- export CONFIG_SHELL
- case $- in @%:@ ((((
- *v*x* | *x*v* ) as_opts=-vx ;;
- *v* ) as_opts=-v ;;
- *x* ) as_opts=-x ;;
- * ) as_opts= ;;
- esac
- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+ export CONFIG_SHELL
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in @%:@ ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
fi
if test x$as_have_required = xno; then :
@@ -328,6 +356,14 @@ $as_echo X"$as_dir" |
} @%:@ as_fn_mkdir_p
+
+@%:@ as_fn_executable_p FILE
+@%:@ -----------------------
+@%:@ Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} @%:@ as_fn_executable_p
@%:@ as_fn_append VAR VALUE
@%:@ ----------------------
@%:@ Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -449,6 +485,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
chmod +x "$as_me.lineno" ||
{ $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+ # already done that, so ensure we don't try to do so again and fall
+ # in an infinite loop. This has already happened in practice.
+ _as_can_reexec=no; export _as_can_reexec
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
# original and so on. Autoconf is especially sensitive to this).
@@ -483,16 +523,16 @@ if (echo >conf$$.file) 2>/dev/null; then
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -504,28 +544,8 @@ else
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in @%:@(
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in @%:@((
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -1208,8 +1228,6 @@ target=$target_alias
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used" >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
@@ -1467,9 +1485,9 @@ test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
tkdnd configure 2.6
-generated by GNU Autoconf 2.68
+generated by GNU Autoconf 2.69
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -1655,7 +1673,7 @@ $as_echo "$ac_try_echo"; } >&5
test ! -s conftest.err
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
+ test -x conftest$ac_exeext
}; then :
ac_retval=0
else
@@ -1924,7 +1942,7 @@ This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by tkdnd $as_me 2.6, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2317,7 +2335,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CYGPATH="cygpath -w"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2595,7 +2613,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2635,7 +2653,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2688,7 +2706,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2729,7 +2747,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
@@ -2787,7 +2805,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2831,7 +2849,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3277,8 +3295,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
struct buf { int x; };
FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -3793,7 +3810,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3833,7 +3850,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3886,7 +3903,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3927,7 +3944,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
@@ -3985,7 +4002,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4029,7 +4046,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4225,8 +4242,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
struct buf { int x; };
FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -4506,7 +4522,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4546,7 +4562,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_RANLIB="ranlib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4606,7 +4622,7 @@ do
for ac_prog in grep ggrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+ as_fn_executable_p "$ac_path_GREP" || continue
# Check for GNU ac_path_GREP and select it if it is found.
# Check for GNU $ac_path_GREP
case `"$ac_path_GREP" --version 2>&1` in
@@ -4672,7 +4688,7 @@ do
for ac_prog in egrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+ as_fn_executable_p "$ac_path_EGREP" || continue
# Check for GNU ac_path_EGREP and select it if it is found.
# Check for GNU $ac_path_EGREP
case `"$ac_path_EGREP" --version 2>&1` in
@@ -5719,7 +5735,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5763,7 +5779,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CXX="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7128,7 +7144,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7168,7 +7184,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_RANLIB="ranlib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7393,7 +7409,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_AR="${ac_tool_prefix}ar"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7433,7 +7449,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_AR="ar"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7724,7 +7740,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_RC="${ac_tool_prefix}windres"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7764,7 +7780,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_RC="windres"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -9872,7 +9888,8 @@ int
main ()
{
static int test_array @<:@1 - 2 * !(sizeof (void *) <= sizeof ($tcl_cv_intptr_t))@:>@;
-test_array @<:@0@:>@ = 0
+test_array @<:@0@:>@ = 0;
+return test_array @<:@0@:>@;
;
return 0;
@@ -9923,7 +9940,8 @@ int
main ()
{
static int test_array @<:@1 - 2 * !(sizeof (void *) <= sizeof ($tcl_cv_uintptr_t))@:>@;
-test_array @<:@0@:>@ = 0
+test_array @<:@0@:>@ = 0;
+return test_array @<:@0@:>@;
;
return 0;
@@ -10404,16 +10422,16 @@ if (echo >conf$$.file) 2>/dev/null; then
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -10473,28 +10491,16 @@ else
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in @%:@(
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in @%:@((
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+
+@%:@ as_fn_executable_p FILE
+@%:@ -----------------------
+@%:@ Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} @%:@ as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -10516,7 +10522,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# values after options handling.
ac_log="
This file was extended by tkdnd $as_me 2.6, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -10569,10 +10575,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
tkdnd config.status 2.6
-configured by $0, generated by GNU Autoconf 2.68,
+configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -10649,7 +10655,7 @@ fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
if \$ac_cs_recheck; then
- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
shift
\$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
CONFIG_SHELL='$SHELL'
diff --git a/pd/tkdnd/autom4te.cache/requests b/pd/tkdnd/autom4te.cache/requests
index 2faea80650c197dff95743c844ee818a6eb6fb31..6a473fb147c8fee41b4a44bdf51a1d0efc23bdc0 100644
--- a/pd/tkdnd/autom4te.cache/requests
+++ b/pd/tkdnd/autom4te.cache/requests
@@ -1,4 +1,4 @@
-# This file was generated by Autom4te Sun Nov 6 20:57:04 UTC 2011.
+# This file was generated by Autom4te Thu Mar 27 22:14:37 UTC 2014.
# It contains the lists of macros which have been traced.
# It can be safely removed.
@@ -11,18 +11,23 @@
],
[
'/usr/share/autoconf/autoconf/autoconf.m4f',
+ '-',
+ '/usr/share/aclocal-1.14/internal/ac-config-macro-dirs.m4',
'configure.in'
],
{
- '_AM_AUTOCONF_VERSION' => 1,
- 'm4_pattern_allow' => 1,
- 'm4_pattern_forbid' => 1,
+ '_m4_warn' => 1,
'include' => 1,
+ 'm4_pattern_forbid' => 1,
+ 'AC_CONFIG_MACRO_DIR' => 1,
+ 'm4_pattern_allow' => 1,
+ 'AU_DEFUN' => 1,
+ 'AC_CONFIG_MACRO_DIR_TRACE' => 1,
'AC_DEFUN_ONCE' => 1,
'm4_include' => 1,
'AC_DEFUN' => 1,
- '_m4_warn' => 1,
- 'AU_DEFUN' => 1
+ '_AM_AUTOCONF_VERSION' => 1,
+ '_AM_CONFIG_MACRO_DIRS' => 1
}
], 'Autom4te::Request' ),
bless( [
@@ -37,61 +42,63 @@
'configure.in'
],
{
- '_LT_AC_TAGCONFIG' => 1,
- 'AM_PROG_F77_C_O' => 1,
- 'AC_INIT' => 1,
- 'm4_pattern_forbid' => 1,
+ 'AC_LIBSOURCE' => 1,
'_AM_COND_IF' => 1,
- 'AC_CANONICAL_TARGET' => 1,
'AC_SUBST' => 1,
- 'AC_CONFIG_LIBOBJ_DIR' => 1,
- 'AC_FC_SRCEXT' => 1,
- 'AC_CANONICAL_HOST' => 1,
- 'AC_PROG_LIBTOOL' => 1,
- 'AM_INIT_AUTOMAKE' => 1,
- 'AM_PATH_GUILE' => 1,
- 'AC_CONFIG_SUBDIRS' => 1,
- 'AM_AUTOMAKE_VERSION' => 1,
- 'LT_CONFIG_LTDL_DIR' => 1,
+ 'm4_pattern_allow' => 1,
+ 'AM_SILENT_RULES' => 1,
+ 'include' => 1,
'AC_REQUIRE_AUX_FILE' => 1,
- 'AC_CONFIG_LINKS' => 1,
- 'm4_sinclude' => 1,
+ 'LT_CONFIG_LTDL_DIR' => 1,
+ 'AM_PROG_CC_C_O' => 1,
+ 'LT_INIT' => 1,
'LT_SUPPORTED_TAG' => 1,
- 'AM_MAINTAINER_MODE' => 1,
- 'AM_NLS' => 1,
- 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
- 'AM_MAKEFILE_INCLUDE' => 1,
+ 'AC_FC_PP_DEFINE' => 1,
+ 'AC_PROG_LIBTOOL' => 1,
+ 'AC_SUBST_TRACE' => 1,
+ '_AM_COND_ELSE' => 1,
'_m4_warn' => 1,
+ 'AM_PROG_FC_C_O' => 1,
+ '_AM_SUBST_NOTMAKE' => 1,
+ 'AM_AUTOMAKE_VERSION' => 1,
+ 'AC_CONFIG_LIBOBJ_DIR' => 1,
+ 'AM_CONDITIONAL' => 1,
+ 'm4_include' => 1,
+ 'AC_CONFIG_LINKS' => 1,
'AM_PROG_CXX_C_O' => 1,
- '_AM_COND_ENDIF' => 1,
- '_AM_MAKEFILE_INCLUDE' => 1,
- 'AM_ENABLE_MULTILIB' => 1,
- 'AM_SILENT_RULES' => 1,
- 'AM_PROG_MOC' => 1,
- 'AC_CONFIG_FILES' => 1,
- 'include' => 1,
- 'LT_INIT' => 1,
- 'AM_PROG_AR' => 1,
+ 'AM_MAINTAINER_MODE' => 1,
'AM_GNU_GETTEXT' => 1,
- 'AC_LIBSOURCE' => 1,
- 'AM_PROG_FC_C_O' => 1,
- 'AC_CANONICAL_BUILD' => 1,
+ 'AC_FC_SRCEXT' => 1,
'AC_FC_FREEFORM' => 1,
- 'AH_OUTPUT' => 1,
- '_AM_SUBST_NOTMAKE' => 1,
- 'AC_CONFIG_AUX_DIR' => 1,
+ 'AM_MAKEFILE_INCLUDE' => 1,
+ 'AM_INIT_AUTOMAKE' => 1,
+ 'AC_FC_PP_SRCEXT' => 1,
+ 'AM_ENABLE_MULTILIB' => 1,
+ 'AM_NLS' => 1,
+ 'AC_CANONICAL_HOST' => 1,
+ '_LT_AC_TAGCONFIG' => 1,
+ '_AM_MAKEFILE_INCLUDE' => 1,
+ 'AC_INIT' => 1,
+ '_AM_COND_ENDIF' => 1,
'sinclude' => 1,
- 'AM_PROG_CC_C_O' => 1,
- 'm4_pattern_allow' => 1,
- 'AM_XGETTEXT_OPTION' => 1,
+ 'AM_PROG_F77_C_O' => 1,
+ 'AH_OUTPUT' => 1,
'AC_CANONICAL_SYSTEM' => 1,
- 'AM_CONDITIONAL' => 1,
+ 'AC_CONFIG_SUBDIRS' => 1,
+ 'AC_CANONICAL_BUILD' => 1,
+ 'AM_PATH_GUILE' => 1,
+ 'AM_PROG_MOC' => 1,
'AC_CONFIG_HEADERS' => 1,
- 'AC_DEFINE_TRACE_LITERAL' => 1,
'AM_POT_TOOLS' => 1,
- 'm4_include' => 1,
- '_AM_COND_ELSE' => 1,
- 'AC_SUBST_TRACE' => 1
+ 'AC_DEFINE_TRACE_LITERAL' => 1,
+ 'm4_sinclude' => 1,
+ 'AC_CONFIG_AUX_DIR' => 1,
+ 'AM_PROG_AR' => 1,
+ 'AC_CANONICAL_TARGET' => 1,
+ 'AC_CONFIG_FILES' => 1,
+ 'AM_XGETTEXT_OPTION' => 1,
+ 'm4_pattern_forbid' => 1,
+ 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1
}
], 'Autom4te::Request' )
);
diff --git a/pd/tkdnd/autom4te.cache/traces.0 b/pd/tkdnd/autom4te.cache/traces.0
index 6dbc9022d5cd13d236fced45c0a0077e1e76c68a..65ffe1eab891743924333202890217ff73b56d5f 100644
--- a/pd/tkdnd/autom4te.cache/traces.0
+++ b/pd/tkdnd/autom4te.cache/traces.0
@@ -77,10 +77,10 @@ m4trace:configure.in:99: -1- m4_pattern_allow([^STDC_HEADERS$])
m4trace:configure.in:99: -1- m4_pattern_allow([^HAVE_STRSAFE_H$])
m4trace:configure.in:99: -1- m4_pattern_allow([^NO_STRSAFE_H$])
m4trace:configure.in:107: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:2615: AC_TRY_COMPILE is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from...
-../../lib/autoconf/general.m4:2053: AC_CACHE_CHECK is expanded from...
+You should run autoupdate.], [../../lib/autoconf/general.m4:2614: AC_TRY_COMPILE is expanded from...
+../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from...
+../../lib/autoconf/general.m4:2031: AC_CACHE_VAL is expanded from...
+../../lib/autoconf/general.m4:2052: AC_CACHE_CHECK is expanded from...
configure.in:107: the top level])
m4trace:configure.in:113: -1- m4_pattern_allow([^BUILD_tkdnd$])
m4trace:configure.in:133: -1- m4_pattern_allow([^CLEANFILES$])
diff --git a/pd/tkdnd/autom4te.cache/traces.1 b/pd/tkdnd/autom4te.cache/traces.1
index 3b3ea1a57dfc9abd25a900b5a051895e3bb0c896..10d91d71a379943441cd70c7fc2136ae8b708422 100644
--- a/pd/tkdnd/autom4te.cache/traces.1
+++ b/pd/tkdnd/autom4te.cache/traces.1
@@ -184,7 +184,7 @@ m4trace:configure.in:30: -1- AC_SUBST_TRACE([PKG_CFLAGS])
m4trace:configure.in:30: -1- m4_pattern_allow([^PKG_CFLAGS$])
m4trace:configure.in:32: -1- AC_CONFIG_AUX_DIR([tclconfig])
m4trace:configure.in:38: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
+You should run autoupdate.], [../../lib/autoconf/general.m4:207: AC_HELP_STRING is expanded from...
tclconfig/tcl.m4:43: TEA_PATH_TCLCONFIG is expanded from...
configure.in:38: the top level])
m4trace:configure.in:39: -1- AC_SUBST([TCL_VERSION])
@@ -218,7 +218,7 @@ m4trace:configure.in:39: -1- AC_SUBST([TCL_STUB_LIB_SPEC])
m4trace:configure.in:39: -1- AC_SUBST_TRACE([TCL_STUB_LIB_SPEC])
m4trace:configure.in:39: -1- m4_pattern_allow([^TCL_STUB_LIB_SPEC$])
m4trace:configure.in:39: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:2615: AC_TRY_COMPILE is expanded from...
+You should run autoupdate.], [../../lib/autoconf/general.m4:2614: AC_TRY_COMPILE is expanded from...
tclconfig/tcl.m4:352: TEA_LOAD_TCLCONFIG is expanded from...
configure.in:39: the top level])
m4trace:configure.in:39: -1- AC_SUBST([CC])
@@ -276,7 +276,7 @@ m4trace:configure.in:39: -1- AC_SUBST([TCL_SHLIB_LD_LIBS])
m4trace:configure.in:39: -1- AC_SUBST_TRACE([TCL_SHLIB_LD_LIBS])
m4trace:configure.in:39: -1- m4_pattern_allow([^TCL_SHLIB_LD_LIBS$])
m4trace:configure.in:45: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
+You should run autoupdate.], [../../lib/autoconf/general.m4:207: AC_HELP_STRING is expanded from...
tclconfig/tcl.m4:198: TEA_PATH_TKCONFIG is expanded from...
configure.in:45: the top level])
m4trace:configure.in:46: -1- AC_DEFINE_TRACE_LITERAL([MAC_OSX_TK])
@@ -362,10 +362,10 @@ m4trace:configure.in:62: -1- AC_SUBST([RANLIB])
m4trace:configure.in:62: -1- AC_SUBST_TRACE([RANLIB])
m4trace:configure.in:62: -1- m4_pattern_allow([^RANLIB$])
m4trace:configure.in:62: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:2615: AC_TRY_COMPILE is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from...
-../../lib/autoconf/general.m4:2053: AC_CACHE_CHECK is expanded from...
+You should run autoupdate.], [../../lib/autoconf/general.m4:2614: AC_TRY_COMPILE is expanded from...
+../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from...
+../../lib/autoconf/general.m4:2031: AC_CACHE_VAL is expanded from...
+../../lib/autoconf/general.m4:2052: AC_CACHE_CHECK is expanded from...
tclconfig/tcl.m4:3259: TEA_SETUP_COMPILER is expanded from...
configure.in:62: the top level])
m4trace:configure.in:62: -1- AH_OUTPUT([WORDS_BIGENDIAN], [/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
@@ -424,10 +424,10 @@ m4trace:configure.in:62: -1- AC_SUBST([MATH_LIBS])
m4trace:configure.in:62: -1- AC_SUBST_TRACE([MATH_LIBS])
m4trace:configure.in:62: -1- m4_pattern_allow([^MATH_LIBS$])
m4trace:configure.in:62: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:2688: AC_TRY_LINK is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from...
-../../lib/autoconf/general.m4:2053: AC_CACHE_CHECK is expanded from...
+You should run autoupdate.], [../../lib/autoconf/general.m4:2687: AC_TRY_LINK is expanded from...
+../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from...
+../../lib/autoconf/general.m4:2031: AC_CACHE_VAL is expanded from...
+../../lib/autoconf/general.m4:2052: AC_CACHE_CHECK is expanded from...
tclconfig/tcl.m4:2290: TEA_MISSING_POSIX_HEADERS is expanded from...
tclconfig/tcl.m4:3259: TEA_SETUP_COMPILER is expanded from...
configure.in:62: the top level])
@@ -543,10 +543,10 @@ m4trace:configure.in:104: -1- AC_SUBST([PKG_LIBS])
m4trace:configure.in:104: -1- AC_SUBST_TRACE([PKG_LIBS])
m4trace:configure.in:104: -1- m4_pattern_allow([^PKG_LIBS$])
m4trace:configure.in:107: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:2615: AC_TRY_COMPILE is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from...
-../../lib/autoconf/general.m4:2053: AC_CACHE_CHECK is expanded from...
+You should run autoupdate.], [../../lib/autoconf/general.m4:2614: AC_TRY_COMPILE is expanded from...
+../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from...
+../../lib/autoconf/general.m4:2031: AC_CACHE_VAL is expanded from...
+../../lib/autoconf/general.m4:2052: AC_CACHE_CHECK is expanded from...
configure.in:107: the top level])
m4trace:configure.in:113: -1- AC_DEFINE_TRACE_LITERAL([BUILD_tkdnd])
m4trace:configure.in:113: -1- m4_pattern_allow([^BUILD_tkdnd$])
@@ -595,17 +595,17 @@ m4trace:configure.in:149: -1- AC_SUBST([XMKMF])
m4trace:configure.in:149: -1- AC_SUBST_TRACE([XMKMF])
m4trace:configure.in:149: -1- m4_pattern_allow([^XMKMF$])
m4trace:configure.in:149: -1- _m4_warn([obsolete], [The macro `AC_TRY_CPP' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:2530: AC_TRY_CPP is expanded from...
+You should run autoupdate.], [../../lib/autoconf/general.m4:2529: AC_TRY_CPP is expanded from...
tclconfig/tcl.m4:2380: TEA_PATH_UNIX_X is expanded from...
tclconfig/tcl.m4:2374: TEA_PATH_X is expanded from...
configure.in:149: the top level])
m4trace:configure.in:149: -1- _m4_warn([obsolete], [The macro `AC_TRY_CPP' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:2530: AC_TRY_CPP is expanded from...
+You should run autoupdate.], [../../lib/autoconf/general.m4:2529: AC_TRY_CPP is expanded from...
tclconfig/tcl.m4:2380: TEA_PATH_UNIX_X is expanded from...
tclconfig/tcl.m4:2374: TEA_PATH_X is expanded from...
configure.in:149: the top level])
m4trace:configure.in:156: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
+You should run autoupdate.], [../../lib/autoconf/general.m4:207: AC_HELP_STRING is expanded from...
tclconfig/tcl.m4:729: TEA_ENABLE_THREADS is expanded from...
configure.in:156: the top level])
m4trace:configure.in:156: -1- AC_DEFINE_TRACE_LITERAL([USE_THREAD_ALLOC])
@@ -632,7 +632,7 @@ m4trace:configure.in:156: -1- AC_SUBST([TCL_THREADS])
m4trace:configure.in:156: -1- AC_SUBST_TRACE([TCL_THREADS])
m4trace:configure.in:156: -1- m4_pattern_allow([^TCL_THREADS$])
m4trace:configure.in:163: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
+You should run autoupdate.], [../../lib/autoconf/general.m4:207: AC_HELP_STRING is expanded from...
tclconfig/tcl.m4:671: TEA_ENABLE_SHARED is expanded from...
configure.in:163: the top level])
m4trace:configure.in:163: -1- AC_DEFINE_TRACE_LITERAL([STATIC_BUILD])
@@ -643,18 +643,18 @@ m4trace:configure.in:163: -1- AC_SUBST([SHARED_BUILD])
m4trace:configure.in:163: -1- AC_SUBST_TRACE([SHARED_BUILD])
m4trace:configure.in:163: -1- m4_pattern_allow([^SHARED_BUILD$])
m4trace:configure.in:171: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
+You should run autoupdate.], [../../lib/autoconf/general.m4:207: AC_HELP_STRING is expanded from...
tclconfig/tcl.m4:1042: TEA_CONFIG_CFLAGS is expanded from...
configure.in:171: the top level])
m4trace:configure.in:171: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
+You should run autoupdate.], [../../lib/autoconf/general.m4:207: AC_HELP_STRING is expanded from...
tclconfig/tcl.m4:1042: TEA_CONFIG_CFLAGS is expanded from...
configure.in:171: the top level])
m4trace:configure.in:171: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:2688: AC_TRY_LINK is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from...
-../../lib/autoconf/general.m4:2053: AC_CACHE_CHECK is expanded from...
+You should run autoupdate.], [../../lib/autoconf/general.m4:2687: AC_TRY_LINK is expanded from...
+../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from...
+../../lib/autoconf/general.m4:2031: AC_CACHE_VAL is expanded from...
+../../lib/autoconf/general.m4:2052: AC_CACHE_CHECK is expanded from...
tclconfig/tcl.m4:1042: TEA_CONFIG_CFLAGS is expanded from...
configure.in:171: the top level])
m4trace:configure.in:171: -1- AC_DEFINE_TRACE_LITERAL([MODULE_SCOPE])
@@ -662,12 +662,12 @@ m4trace:configure.in:171: -1- m4_pattern_allow([^MODULE_SCOPE$])
m4trace:configure.in:171: -1- AH_OUTPUT([MODULE_SCOPE], [/* Compiler support for module scope symbols */
@%:@undef MODULE_SCOPE])
m4trace:configure.in:171: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
+You should run autoupdate.], [../../lib/autoconf/general.m4:207: AC_HELP_STRING is expanded from...
tclconfig/tcl.m4:1042: TEA_CONFIG_CFLAGS is expanded from...
configure.in:171: the top level])
m4trace:configure.in:171: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
+You should run autoupdate.], [../../lib/autoconf/general.m4:207: AC_HELP_STRING is expanded from...
+../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from...
tclconfig/tcl.m4:1042: TEA_CONFIG_CFLAGS is expanded from...
configure.in:171: the top level])
m4trace:configure.in:171: -1- AC_SUBST([RANLIB])
@@ -694,7 +694,7 @@ m4trace:configure.in:171: -1- AC_SUBST([RC])
m4trace:configure.in:171: -1- AC_SUBST_TRACE([RC])
m4trace:configure.in:171: -1- m4_pattern_allow([^RC$])
m4trace:configure.in:171: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:2615: AC_TRY_COMPILE is expanded from...
+You should run autoupdate.], [../../lib/autoconf/general.m4:2614: AC_TRY_COMPILE is expanded from...
tclconfig/tcl.m4:1042: TEA_CONFIG_CFLAGS is expanded from...
configure.in:171: the top level])
m4trace:configure.in:171: -1- AC_DEFINE_TRACE_LITERAL([_XOPEN_SOURCE_EXTENDED])
@@ -702,41 +702,41 @@ m4trace:configure.in:171: -1- m4_pattern_allow([^_XOPEN_SOURCE_EXTENDED$])
m4trace:configure.in:171: -1- AH_OUTPUT([_XOPEN_SOURCE_EXTENDED], [/* Do we want to use the XOPEN network library? */
@%:@undef _XOPEN_SOURCE_EXTENDED])
m4trace:configure.in:171: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:2688: AC_TRY_LINK is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from...
-../../lib/autoconf/general.m4:2053: AC_CACHE_CHECK is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
+You should run autoupdate.], [../../lib/autoconf/general.m4:2687: AC_TRY_LINK is expanded from...
+../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from...
+../../lib/autoconf/general.m4:2031: AC_CACHE_VAL is expanded from...
+../../lib/autoconf/general.m4:2052: AC_CACHE_CHECK is expanded from...
+../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from...
tclconfig/tcl.m4:1042: TEA_CONFIG_CFLAGS is expanded from...
configure.in:171: the top level])
m4trace:configure.in:171: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:2688: AC_TRY_LINK is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from...
-../../lib/autoconf/general.m4:2053: AC_CACHE_CHECK is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
+You should run autoupdate.], [../../lib/autoconf/general.m4:2687: AC_TRY_LINK is expanded from...
+../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from...
+../../lib/autoconf/general.m4:2031: AC_CACHE_VAL is expanded from...
+../../lib/autoconf/general.m4:2052: AC_CACHE_CHECK is expanded from...
+../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from...
tclconfig/tcl.m4:1042: TEA_CONFIG_CFLAGS is expanded from...
configure.in:171: the top level])
m4trace:configure.in:171: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:2688: AC_TRY_LINK is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from...
-../../lib/autoconf/general.m4:2053: AC_CACHE_CHECK is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
+You should run autoupdate.], [../../lib/autoconf/general.m4:2687: AC_TRY_LINK is expanded from...
+../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from...
+../../lib/autoconf/general.m4:2031: AC_CACHE_VAL is expanded from...
+../../lib/autoconf/general.m4:2052: AC_CACHE_CHECK is expanded from...
+../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from...
tclconfig/tcl.m4:1042: TEA_CONFIG_CFLAGS is expanded from...
configure.in:171: the top level])
m4trace:configure.in:171: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:2688: AC_TRY_LINK is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from...
-../../lib/autoconf/general.m4:2053: AC_CACHE_CHECK is expanded from...
+You should run autoupdate.], [../../lib/autoconf/general.m4:2687: AC_TRY_LINK is expanded from...
+../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from...
+../../lib/autoconf/general.m4:2031: AC_CACHE_VAL is expanded from...
+../../lib/autoconf/general.m4:2052: AC_CACHE_CHECK is expanded from...
tclconfig/tcl.m4:1042: TEA_CONFIG_CFLAGS is expanded from...
configure.in:171: the top level])
m4trace:configure.in:171: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:2688: AC_TRY_LINK is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from...
-../../lib/autoconf/general.m4:2053: AC_CACHE_CHECK is expanded from...
+You should run autoupdate.], [../../lib/autoconf/general.m4:2687: AC_TRY_LINK is expanded from...
+../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from...
+../../lib/autoconf/general.m4:2031: AC_CACHE_VAL is expanded from...
+../../lib/autoconf/general.m4:2052: AC_CACHE_CHECK is expanded from...
tclconfig/tcl.m4:1042: TEA_CONFIG_CFLAGS is expanded from...
configure.in:171: the top level])
m4trace:configure.in:171: -1- AC_DEFINE_TRACE_LITERAL([MODULE_SCOPE])
@@ -744,21 +744,21 @@ m4trace:configure.in:171: -1- m4_pattern_allow([^MODULE_SCOPE$])
m4trace:configure.in:171: -1- AH_OUTPUT([MODULE_SCOPE], [/* Compiler support for module scope symbols */
@%:@undef MODULE_SCOPE])
m4trace:configure.in:171: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:2688: AC_TRY_LINK is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from...
-../../lib/autoconf/general.m4:2053: AC_CACHE_CHECK is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
+You should run autoupdate.], [../../lib/autoconf/general.m4:2687: AC_TRY_LINK is expanded from...
+../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from...
+../../lib/autoconf/general.m4:2031: AC_CACHE_VAL is expanded from...
+../../lib/autoconf/general.m4:2052: AC_CACHE_CHECK is expanded from...
+../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from...
+../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from...
tclconfig/tcl.m4:1042: TEA_CONFIG_CFLAGS is expanded from...
configure.in:171: the top level])
m4trace:configure.in:171: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:2688: AC_TRY_LINK is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from...
-../../lib/autoconf/general.m4:2053: AC_CACHE_CHECK is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
+You should run autoupdate.], [../../lib/autoconf/general.m4:2687: AC_TRY_LINK is expanded from...
+../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from...
+../../lib/autoconf/general.m4:2031: AC_CACHE_VAL is expanded from...
+../../lib/autoconf/general.m4:2052: AC_CACHE_CHECK is expanded from...
+../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from...
+../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from...
tclconfig/tcl.m4:1042: TEA_CONFIG_CFLAGS is expanded from...
configure.in:171: the top level])
m4trace:configure.in:171: -1- AC_DEFINE_TRACE_LITERAL([_OE_SOCKETS])
@@ -790,7 +790,7 @@ m4trace:configure.in:171: -1- m4_pattern_allow([^NO_VIZ$])
m4trace:configure.in:171: -1- AH_OUTPUT([NO_VIZ], [/* No visibility hidden passed to zlib? */
@%:@undef NO_VIZ])
m4trace:configure.in:171: -2- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:2765: AC_TRY_RUN is expanded from...
+You should run autoupdate.], [../../lib/autoconf/general.m4:2764: AC_TRY_RUN is expanded from...
tclconfig/tcl.m4:1042: TEA_CONFIG_CFLAGS is expanded from...
configure.in:171: the top level])
m4trace:configure.in:171: -1- AC_DEFINE_TRACE_LITERAL([HAVE_NO_SEH])
@@ -798,7 +798,7 @@ m4trace:configure.in:171: -1- m4_pattern_allow([^HAVE_NO_SEH$])
m4trace:configure.in:171: -1- AH_OUTPUT([HAVE_NO_SEH], [/* Defined when mingw does not support SEH */
@%:@undef HAVE_NO_SEH])
m4trace:configure.in:171: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:2615: AC_TRY_COMPILE is expanded from...
+You should run autoupdate.], [../../lib/autoconf/general.m4:2614: AC_TRY_COMPILE is expanded from...
tclconfig/tcl.m4:1042: TEA_CONFIG_CFLAGS is expanded from...
configure.in:171: the top level])
m4trace:configure.in:171: -1- AC_DEFINE_TRACE_LITERAL([EXCEPTION_DISPOSITION])
@@ -806,7 +806,7 @@ m4trace:configure.in:171: -1- m4_pattern_allow([^EXCEPTION_DISPOSITION$])
m4trace:configure.in:171: -1- AH_OUTPUT([EXCEPTION_DISPOSITION], [/* Defined when cygwin/mingw does not support EXCEPTION DISPOSITION */
@%:@undef EXCEPTION_DISPOSITION])
m4trace:configure.in:171: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:2615: AC_TRY_COMPILE is expanded from...
+You should run autoupdate.], [../../lib/autoconf/general.m4:2614: AC_TRY_COMPILE is expanded from...
tclconfig/tcl.m4:1042: TEA_CONFIG_CFLAGS is expanded from...
configure.in:171: the top level])
m4trace:configure.in:171: -1- AC_DEFINE_TRACE_LITERAL([HAVE_WINNT_IGNORE_VOID])
@@ -814,7 +814,7 @@ m4trace:configure.in:171: -1- m4_pattern_allow([^HAVE_WINNT_IGNORE_VOID$])
m4trace:configure.in:171: -1- AH_OUTPUT([HAVE_WINNT_IGNORE_VOID], [/* Defined when cygwin/mingw ignores VOID define in winnt.h */
@%:@undef HAVE_WINNT_IGNORE_VOID])
m4trace:configure.in:171: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:2615: AC_TRY_COMPILE is expanded from...
+You should run autoupdate.], [../../lib/autoconf/general.m4:2614: AC_TRY_COMPILE is expanded from...
tclconfig/tcl.m4:1042: TEA_CONFIG_CFLAGS is expanded from...
configure.in:171: the top level])
m4trace:configure.in:171: -1- AC_DEFINE_TRACE_LITERAL([HAVE_CAST_TO_UNION])
@@ -846,13 +846,13 @@ m4trace:configure.in:171: -1- AC_SUBST([LD_LIBRARY_PATH_VAR])
m4trace:configure.in:171: -1- AC_SUBST_TRACE([LD_LIBRARY_PATH_VAR])
m4trace:configure.in:171: -1- m4_pattern_allow([^LD_LIBRARY_PATH_VAR$])
m4trace:configure.in:171: -3- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:2615: AC_TRY_COMPILE is expanded from...
+You should run autoupdate.], [../../lib/autoconf/general.m4:2614: AC_TRY_COMPILE is expanded from...
tclconfig/tcl.m4:2712: TEA_TCL_EARLY_FLAG is expanded from...
tclconfig/tcl.m4:2725: TEA_TCL_EARLY_FLAGS is expanded from...
tclconfig/tcl.m4:1042: TEA_CONFIG_CFLAGS is expanded from...
configure.in:171: the top level])
m4trace:configure.in:171: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:2615: AC_TRY_COMPILE is expanded from...
+You should run autoupdate.], [../../lib/autoconf/general.m4:2614: AC_TRY_COMPILE is expanded from...
tclconfig/tcl.m4:2712: TEA_TCL_EARLY_FLAG is expanded from...
tclconfig/tcl.m4:2725: TEA_TCL_EARLY_FLAGS is expanded from...
tclconfig/tcl.m4:1042: TEA_CONFIG_CFLAGS is expanded from...
@@ -862,13 +862,13 @@ m4trace:configure.in:171: -1- m4_pattern_allow([^_ISOC99_SOURCE$])
m4trace:configure.in:171: -1- AH_OUTPUT([_ISOC99_SOURCE], [/* Add the _ISOC99_SOURCE flag when building */
@%:@undef _ISOC99_SOURCE])
m4trace:configure.in:171: -3- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:2615: AC_TRY_COMPILE is expanded from...
+You should run autoupdate.], [../../lib/autoconf/general.m4:2614: AC_TRY_COMPILE is expanded from...
tclconfig/tcl.m4:2712: TEA_TCL_EARLY_FLAG is expanded from...
tclconfig/tcl.m4:2725: TEA_TCL_EARLY_FLAGS is expanded from...
tclconfig/tcl.m4:1042: TEA_CONFIG_CFLAGS is expanded from...
configure.in:171: the top level])
m4trace:configure.in:171: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:2615: AC_TRY_COMPILE is expanded from...
+You should run autoupdate.], [../../lib/autoconf/general.m4:2614: AC_TRY_COMPILE is expanded from...
tclconfig/tcl.m4:2712: TEA_TCL_EARLY_FLAG is expanded from...
tclconfig/tcl.m4:2725: TEA_TCL_EARLY_FLAGS is expanded from...
tclconfig/tcl.m4:1042: TEA_CONFIG_CFLAGS is expanded from...
@@ -878,13 +878,13 @@ m4trace:configure.in:171: -1- m4_pattern_allow([^_LARGEFILE64_SOURCE$])
m4trace:configure.in:171: -1- AH_OUTPUT([_LARGEFILE64_SOURCE], [/* Add the _LARGEFILE64_SOURCE flag when building */
@%:@undef _LARGEFILE64_SOURCE])
m4trace:configure.in:171: -3- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:2615: AC_TRY_COMPILE is expanded from...
+You should run autoupdate.], [../../lib/autoconf/general.m4:2614: AC_TRY_COMPILE is expanded from...
tclconfig/tcl.m4:2712: TEA_TCL_EARLY_FLAG is expanded from...
tclconfig/tcl.m4:2725: TEA_TCL_EARLY_FLAGS is expanded from...
tclconfig/tcl.m4:1042: TEA_CONFIG_CFLAGS is expanded from...
configure.in:171: the top level])
m4trace:configure.in:171: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:2615: AC_TRY_COMPILE is expanded from...
+You should run autoupdate.], [../../lib/autoconf/general.m4:2614: AC_TRY_COMPILE is expanded from...
tclconfig/tcl.m4:2712: TEA_TCL_EARLY_FLAG is expanded from...
tclconfig/tcl.m4:2725: TEA_TCL_EARLY_FLAGS is expanded from...
tclconfig/tcl.m4:1042: TEA_CONFIG_CFLAGS is expanded from...
@@ -894,16 +894,16 @@ m4trace:configure.in:171: -1- m4_pattern_allow([^_LARGEFILE_SOURCE64$])
m4trace:configure.in:171: -1- AH_OUTPUT([_LARGEFILE_SOURCE64], [/* Add the _LARGEFILE_SOURCE64 flag when building */
@%:@undef _LARGEFILE_SOURCE64])
m4trace:configure.in:171: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:2615: AC_TRY_COMPILE is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from...
+You should run autoupdate.], [../../lib/autoconf/general.m4:2614: AC_TRY_COMPILE is expanded from...
+../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from...
+../../lib/autoconf/general.m4:2031: AC_CACHE_VAL is expanded from...
tclconfig/tcl.m4:2760: TEA_TCL_64BIT_FLAGS is expanded from...
tclconfig/tcl.m4:1042: TEA_CONFIG_CFLAGS is expanded from...
configure.in:171: the top level])
m4trace:configure.in:171: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:2615: AC_TRY_COMPILE is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from...
+You should run autoupdate.], [../../lib/autoconf/general.m4:2614: AC_TRY_COMPILE is expanded from...
+../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from...
+../../lib/autoconf/general.m4:2031: AC_CACHE_VAL is expanded from...
tclconfig/tcl.m4:2760: TEA_TCL_64BIT_FLAGS is expanded from...
tclconfig/tcl.m4:1042: TEA_CONFIG_CFLAGS is expanded from...
configure.in:171: the top level])
@@ -916,10 +916,10 @@ m4trace:configure.in:171: -1- m4_pattern_allow([^TCL_WIDE_INT_TYPE$])
m4trace:configure.in:171: -1- AH_OUTPUT([TCL_WIDE_INT_TYPE], [/* What type should be used to define wide integers? */
@%:@undef TCL_WIDE_INT_TYPE])
m4trace:configure.in:171: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:2615: AC_TRY_COMPILE is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from...
-../../lib/autoconf/general.m4:2053: AC_CACHE_CHECK is expanded from...
+You should run autoupdate.], [../../lib/autoconf/general.m4:2614: AC_TRY_COMPILE is expanded from...
+../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from...
+../../lib/autoconf/general.m4:2031: AC_CACHE_VAL is expanded from...
+../../lib/autoconf/general.m4:2052: AC_CACHE_CHECK is expanded from...
tclconfig/tcl.m4:2760: TEA_TCL_64BIT_FLAGS is expanded from...
tclconfig/tcl.m4:1042: TEA_CONFIG_CFLAGS is expanded from...
configure.in:171: the top level])
@@ -928,10 +928,10 @@ m4trace:configure.in:171: -1- m4_pattern_allow([^HAVE_STRUCT_DIRENT64$])
m4trace:configure.in:171: -1- AH_OUTPUT([HAVE_STRUCT_DIRENT64], [/* Is \'struct dirent64\' in <sys/types.h>? */
@%:@undef HAVE_STRUCT_DIRENT64])
m4trace:configure.in:171: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:2615: AC_TRY_COMPILE is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from...
-../../lib/autoconf/general.m4:2053: AC_CACHE_CHECK is expanded from...
+You should run autoupdate.], [../../lib/autoconf/general.m4:2614: AC_TRY_COMPILE is expanded from...
+../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from...
+../../lib/autoconf/general.m4:2031: AC_CACHE_VAL is expanded from...
+../../lib/autoconf/general.m4:2052: AC_CACHE_CHECK is expanded from...
tclconfig/tcl.m4:2760: TEA_TCL_64BIT_FLAGS is expanded from...
tclconfig/tcl.m4:1042: TEA_CONFIG_CFLAGS is expanded from...
configure.in:171: the top level])
@@ -944,9 +944,9 @@ m4trace:configure.in:171: -1- AH_OUTPUT([HAVE_OPEN64], [/* Define to 1 if you ha
m4trace:configure.in:171: -1- AH_OUTPUT([HAVE_LSEEK64], [/* Define to 1 if you have the `lseek64\' function. */
@%:@undef HAVE_LSEEK64])
m4trace:configure.in:171: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:2615: AC_TRY_COMPILE is expanded from...
-../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
-../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from...
+You should run autoupdate.], [../../lib/autoconf/general.m4:2614: AC_TRY_COMPILE is expanded from...
+../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from...
+../../lib/autoconf/general.m4:2031: AC_CACHE_VAL is expanded from...
tclconfig/tcl.m4:2760: TEA_TCL_64BIT_FLAGS is expanded from...
tclconfig/tcl.m4:1042: TEA_CONFIG_CFLAGS is expanded from...
configure.in:171: the top level])
@@ -955,7 +955,7 @@ m4trace:configure.in:171: -1- m4_pattern_allow([^HAVE_TYPE_OFF64_T$])
m4trace:configure.in:171: -1- AH_OUTPUT([HAVE_TYPE_OFF64_T], [/* Is off64_t in <sys/types.h>? */
@%:@undef HAVE_TYPE_OFF64_T])
m4trace:configure.in:177: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
+You should run autoupdate.], [../../lib/autoconf/general.m4:207: AC_HELP_STRING is expanded from...
tclconfig/tcl.m4:858: TEA_ENABLE_SYMBOLS is expanded from...
configure.in:177: the top level])
m4trace:configure.in:177: -1- AC_SUBST([CFLAGS_DEFAULT])
diff --git a/pd/tkdnd/configure b/pd/tkdnd/configure
index 5883581051b8a861f0b602886934cabb08042a25..b4c30ff8a8e730f1bc41c7f35228ecf1529e7515 100755
--- a/pd/tkdnd/configure
+++ b/pd/tkdnd/configure
@@ -1,11 +1,9 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for tkdnd 2.6.
+# Generated by GNU Autoconf 2.69 for tkdnd 2.6.
#
#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
#
#
# This configure script is free software; the Free Software Foundation
@@ -134,6 +132,31 @@ export LANGUAGE
# CDPATH.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+# Use a proper internal environment variable to ensure we don't fall
+ # into an infinite loop, continuously re-executing ourselves.
+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+ _as_can_reexec=no; export _as_can_reexec;
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+ fi
+ # We don't want this to propagate to other subprocesses.
+ { _as_can_reexec=; unset _as_can_reexec;}
if test "x$CONFIG_SHELL" = x; then
as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
@@ -167,7 +190,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
else
exitcode=1; echo positional parameters were not saved.
fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -212,21 +236,25 @@ IFS=$as_save_IFS
if test "x$CONFIG_SHELL" != x; then :
- # We cannot yet assume a decent shell, so we have to provide a
- # neutralization value for shells without unset; and this also
- # works around shells that cannot unset nonexistent variables.
- # Preserve -v and -x to the replacement shell.
- BASH_ENV=/dev/null
- ENV=/dev/null
- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
- export CONFIG_SHELL
- case $- in # ((((
- *v*x* | *x*v* ) as_opts=-vx ;;
- *v* ) as_opts=-v ;;
- *x* ) as_opts=-x ;;
- * ) as_opts= ;;
- esac
- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+ export CONFIG_SHELL
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
fi
if test x$as_have_required = xno; then :
@@ -328,6 +356,14 @@ $as_echo X"$as_dir" |
} # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
# as_fn_append VAR VALUE
# ----------------------
# Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -449,6 +485,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
chmod +x "$as_me.lineno" ||
{ $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+ # already done that, so ensure we don't try to do so again and fall
+ # in an infinite loop. This has already happened in practice.
+ _as_can_reexec=no; export _as_can_reexec
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
# original and so on. Autoconf is especially sensitive to this).
@@ -483,16 +523,16 @@ if (echo >conf$$.file) 2>/dev/null; then
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -504,28 +544,8 @@ else
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in #(
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -1208,8 +1228,6 @@ target=$target_alias
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used" >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
@@ -1467,9 +1485,9 @@ test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
tkdnd configure 2.6
-generated by GNU Autoconf 2.68
+generated by GNU Autoconf 2.69
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -1655,7 +1673,7 @@ $as_echo "$ac_try_echo"; } >&5
test ! -s conftest.err
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
+ test -x conftest$ac_exeext
}; then :
ac_retval=0
else
@@ -1924,7 +1942,7 @@ This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by tkdnd $as_me 2.6, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2317,7 +2335,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CYGPATH="cygpath -w"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2595,7 +2613,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2635,7 +2653,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2688,7 +2706,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2729,7 +2747,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
@@ -2787,7 +2805,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2831,7 +2849,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3277,8 +3295,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
struct buf { int x; };
FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -3793,7 +3810,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3833,7 +3850,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3886,7 +3903,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3927,7 +3944,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
@@ -3985,7 +4002,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4029,7 +4046,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4225,8 +4242,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
struct buf { int x; };
FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -4506,7 +4522,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4546,7 +4562,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_RANLIB="ranlib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4606,7 +4622,7 @@ do
for ac_prog in grep ggrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+ as_fn_executable_p "$ac_path_GREP" || continue
# Check for GNU ac_path_GREP and select it if it is found.
# Check for GNU $ac_path_GREP
case `"$ac_path_GREP" --version 2>&1` in
@@ -4672,7 +4688,7 @@ do
for ac_prog in egrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+ as_fn_executable_p "$ac_path_EGREP" || continue
# Check for GNU ac_path_EGREP and select it if it is found.
# Check for GNU $ac_path_EGREP
case `"$ac_path_EGREP" --version 2>&1` in
@@ -5719,7 +5735,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5763,7 +5779,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CXX="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7128,7 +7144,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7168,7 +7184,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_RANLIB="ranlib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7393,7 +7409,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_AR="${ac_tool_prefix}ar"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7433,7 +7449,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_AR="ar"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7724,7 +7740,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_RC="${ac_tool_prefix}windres"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7764,7 +7780,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_RC="windres"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -9872,7 +9888,8 @@ int
main ()
{
static int test_array [1 - 2 * !(sizeof (void *) <= sizeof ($tcl_cv_intptr_t))];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
;
return 0;
@@ -9923,7 +9940,8 @@ int
main ()
{
static int test_array [1 - 2 * !(sizeof (void *) <= sizeof ($tcl_cv_uintptr_t))];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
;
return 0;
@@ -10404,16 +10422,16 @@ if (echo >conf$$.file) 2>/dev/null; then
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -10473,28 +10491,16 @@ else
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in #(
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -10516,7 +10522,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# values after options handling.
ac_log="
This file was extended by tkdnd $as_me 2.6, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -10569,10 +10575,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
tkdnd config.status 2.6
-configured by $0, generated by GNU Autoconf 2.68,
+configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -10649,7 +10655,7 @@ fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
if \$ac_cs_recheck; then
- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
shift
\$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
CONFIG_SHELL='$SHELL'