diff --git a/externals/moocow/flite/configure b/externals/moocow/flite/configure
index 921d967607ca04220e0376c21d79f69ee102a2a3..c1fc1d746f86773b61b0efc3fe58ed0f12c780c6 100755
--- a/externals/moocow/flite/configure
+++ b/externals/moocow/flite/configure
@@ -2682,7 +2682,7 @@ if ${ac_cv_lib_flite_flite_init+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lflite -lm $LIBS"
+LIBS="-lflite -lasound -lm $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -2732,7 +2732,7 @@ if ${ac_cv_lib_flite_flite_init+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lflite -lm $LIBS"
+LIBS="-lflite -lasound -lm $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -2784,7 +2784,7 @@ $as_echo "$as_me: WARNING: - is the directory containing the 'flite' library in
fi
##-- flite: libs: base
-FLITE_LIBS="-lflite -lm"
+FLITE_LIBS="-lflite -lasound -lm"
##-- Check for flite : libs : flite_cmulex
@@ -2794,7 +2794,7 @@ if ${ac_cv_lib_flite_cmulex_cmu_lex_init+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lflite_cmulex -lflite -lm $LIBS"
+LIBS="-lflite_cmulex -lflite -lasound -lm $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -2845,7 +2845,7 @@ if ${ac_cv_lib_flite_usenglish_usenglish_init+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lflite_usenglish -lflite_cmulex -lflite -lm $LIBS"
+LIBS="-lflite_usenglish -lflite_cmulex -lflite -lasound -lm $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -2890,13 +2890,13 @@ FLITE_LANGLIBS="-lflite_usenglish"
##-- Check for flite : libs : flite_cmu_us_kal16
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for register_cmu_us_kal in -lflite_cmu_us_kal16" >&5
-$as_echo_n "checking for register_cmu_us_kal in -lflite_cmu_us_kal16... " >&6; }
-if ${ac_cv_lib_flite_cmu_us_kal16_register_cmu_us_kal+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for register_cmu_us_kal16 in -lflite_cmu_us_kal16" >&5
+$as_echo_n "checking for register_cmu_us_kal16 in -lflite_cmu_us_kal16... " >&6; }
+if ${ac_cv_lib_flite_cmu_us_kal16_register_cmu_us_kal16+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lflite_cmu_us_kal16 -lflite_usenglish -lflite_cmulex -lflite -lm $LIBS"
+LIBS="-lflite_cmu_us_kal16 -lflite_usenglish -lflite_cmulex -lflite -lasound -lm $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -2906,27 +2906,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char register_cmu_us_kal ();
+char register_cmu_us_kal16 ();
int
main ()
{
-return register_cmu_us_kal ();
+return register_cmu_us_kal16 ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_flite_cmu_us_kal16_register_cmu_us_kal=yes
+ ac_cv_lib_flite_cmu_us_kal16_register_cmu_us_kal16=yes
else
- ac_cv_lib_flite_cmu_us_kal16_register_cmu_us_kal=no
+ ac_cv_lib_flite_cmu_us_kal16_register_cmu_us_kal16=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_flite_cmu_us_kal16_register_cmu_us_kal" >&5
-$as_echo "$ac_cv_lib_flite_cmu_us_kal16_register_cmu_us_kal" >&6; }
-if test "x$ac_cv_lib_flite_cmu_us_kal16_register_cmu_us_kal" = xyes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_flite_cmu_us_kal16_register_cmu_us_kal16" >&5
+$as_echo "$ac_cv_lib_flite_cmu_us_kal16_register_cmu_us_kal16" >&6; }
+if test "x$ac_cv_lib_flite_cmu_us_kal16_register_cmu_us_kal16" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBFLITE_CMU_US_KAL16 1
_ACEOF
@@ -2942,7 +2942,7 @@ FLITE_VOICELIBS="-lflite_cmu_us_kal16"
##-- register voice function
-$as_echo "#define PDFLITE_REGISTER_VOICE register_cmu_us_kal" >>confdefs.h
+$as_echo "#define PDFLITE_REGISTER_VOICE register_cmu_us_kal16" >>confdefs.h
## /local: flite
diff --git a/l2ork_addons/cwiid/configure b/l2ork_addons/cwiid/configure
index 6ff970532480969d13ee4e6bb01512dcae68395e..7fb60deb6555135ea5f38bbf42d7c546ed1e31ea 100755
--- a/l2ork_addons/cwiid/configure
+++ b/l2ork_addons/cwiid/configure
@@ -3165,7 +3165,7 @@ done
fi
if test $PYTHON; then
- PYTHON_VERSION=`$PYTHON -c 'import sys; print sys.version[:3]'`
+ PYTHON_VERSION=`$PYTHON -c 'import sys; print(sys.version[:3])'`
$as_echo "#define HAVE_PYTHON 1" >>confdefs.h
diff --git a/l2ork_addons/cwiid/wminput/Makefile b/l2ork_addons/cwiid/wminput/Makefile
index a5d795d7ec3f8a148a512ca136bf077cf95be15b..a2232f22710552689c29ef83369cf271cdaaa14e 100644
--- a/l2ork_addons/cwiid/wminput/Makefile
+++ b/l2ork_addons/cwiid/wminput/Makefile
@@ -22,8 +22,8 @@ YFLAGS += -d
ifdef PYTHON
SOURCES += py_plugin.c
- CFLAGS += -I/usr/include/python2.7
- LDLIBS += -lpython2.7
+ CFLAGS += $(shell pkg-config --cflags python-2.7)
+ LDLIBS += $(shell pkg-config --libs python-2.7)
endif
SOURCES += $(LAST_SOURCES)
diff --git a/pd/src/m_pd.h b/pd/src/m_pd.h
index f61835aaadbac53551712707baf0787e914b99e3..0bce5f42f5df18d6dd6aa61a707d26e9f56dfdab 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 "20130830"
+#define PD_TEST_VERSION "20130904"
#define PDL2ORK
/* old name for "MSW" flag -- we have to take it for the sake of many old
diff --git a/pd/tkpath/configure b/pd/tkpath/configure
index f6120aceb0acf6e0a12b5c03d74e204edf82d58a..77d4c6199d962bc7e4bec7dcec0bcf6dd4cab8f1 100755
--- a/pd/tkpath/configure
+++ b/pd/tkpath/configure
@@ -5586,6 +5586,7 @@ done
#TEA_BUGGY_STRTOD
fi
+
#--------------------------------------------------------------------
# The code makes use of PTR2INT, ensure the correct definition is
# picked from Tcl/Tk internal headers...
@@ -5701,7 +5702,6 @@ _ACEOF
fi
-
#-----------------------------------------------------------------------
# Specify the C source files to compile in TEA_ADD_SOURCES,
# public headers that need to be installed in TEA_ADD_HEADERS,
@@ -8334,7 +8334,7 @@ fi
if (!($i~/^(isysroot|mmacosx-version-min)/)) print "-"$i}'`"
if test $do64bit = yes; then :
- case `arch` in
+ case `uname -m` in
ppc)
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -arch ppc64 flag" >&5
$as_echo_n "checking if compiler accepts -arch ppc64 flag... " >&6; }
@@ -8410,8 +8410,8 @@ $as_echo "$tcl_cv_cc_arch_x86_64" >&6; }
fi;;
*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Don't know how enable 64-bit on architecture \`arch\`" >&5
-$as_echo "$as_me: WARNING: Don't know how enable 64-bit on architecture \`arch\`" >&2;};;
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Don't know how enable 64-bit on architecture \`uname -m\`" >&5
+$as_echo "$as_me: WARNING: Don't know how enable 64-bit on architecture \`uname -m\`" >&2;};;
esac
else