Commit 34335459 authored by Ivica Bukvic's avatar Ivica Bukvic
Browse files

lingering file clean-up plus version bump

parent def27ed8
......@@ -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
......
......@@ -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
......
......@@ -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)
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment