Revision: 9638 http://pure-data.svn.sourceforge.net/pure-data/?rev=9638&view=rev Author: mukau Date: 2008-03-28 14:23:51 -0700 (Fri, 28 Mar 2008)
Log Message: ----------- + cleaned up build a bit, removed class_sethelpsymbol()
Modified Paths: -------------- trunk/externals/moocow/flite/configure.in trunk/externals/moocow/flite/flite.c
Added Paths: ----------- trunk/externals/moocow/flite/.cvsignore trunk/externals/moocow/flite/config/.cvsignore
Property Changed: ---------------- trunk/externals/moocow/flite/ trunk/externals/moocow/flite/config/
Property changes on: trunk/externals/moocow/flite ___________________________________________________________________ Name: svn:ignore + *~ .*~ *.o *.pd_linux aclocal.m4 Makefile Makefile.in configure config.log config.status .deps install-sh mkinstalldirs missing config.guess config.sub depcomp ltmain.sh stamp-h* config.h config.h.in autom4te.cache
Added: trunk/externals/moocow/flite/.cvsignore =================================================================== --- trunk/externals/moocow/flite/.cvsignore (rev 0) +++ trunk/externals/moocow/flite/.cvsignore 2008-03-28 21:23:51 UTC (rev 9638) @@ -0,0 +1,23 @@ +*~ +.*~ +*.o +*.pd_linux +aclocal.m4 +Makefile +Makefile.in +configure +config.log +config.status +.deps +install-sh +mkinstalldirs +missing +config.guess +config.sub +depcomp +ltmain.sh +stamp-h* +config.h +config.h.in +autom4te.cache +
Property changes on: trunk/externals/moocow/flite/config ___________________________________________________________________ Name: svn:ignore + *~ .*~ *.o *.pd_linux aclocal.m4 Makefile Makefile.in configure config.log config.status .deps install-sh mkinstalldirs missing config.guess config.sub depcomp ltmain.sh stamp-h* config.h config.h.in autom4te.cache
Added: trunk/externals/moocow/flite/config/.cvsignore =================================================================== --- trunk/externals/moocow/flite/config/.cvsignore (rev 0) +++ trunk/externals/moocow/flite/config/.cvsignore 2008-03-28 21:23:51 UTC (rev 9638) @@ -0,0 +1,23 @@ +*~ +.*~ +*.o +*.pd_linux +aclocal.m4 +Makefile +Makefile.in +configure +config.log +config.status +.deps +install-sh +mkinstalldirs +missing +config.guess +config.sub +depcomp +ltmain.sh +stamp-h* +config.h +config.h.in +autom4te.cache +
Modified: trunk/externals/moocow/flite/configure.in =================================================================== --- trunk/externals/moocow/flite/configure.in 2008-03-28 13:28:03 UTC (rev 9637) +++ trunk/externals/moocow/flite/configure.in 2008-03-28 21:23:51 UTC (rev 9638) @@ -1,8 +1,14 @@ dnl Process this file with autoconf to produce a configure script. dnl -- adapted from 'configure.in' in ggee distribution by Guenter Geiger AC_PREREQ(2.5) -AC_INIT(pd-flite, [0.01], [moocow@ling.uni-potsdam.de])
+dnl Some handy macros +define([THE_PACKAGE_NAME], [pdflite]) +define([THE_PACKAGE_VERSION], [0.02]) +define([THE_PACKAGE_AUTHOR], [moocow@ling.uni-potsdam.de]) + +AC_INIT(THE_PACKAGE_NAME, THE_PACKAGE_VERSION, THE_PACKAGE_AUTHOR) + dnl dnl source & aux dnl @@ -11,7 +17,7 @@ dnl dnl use automake dnl -AM_INIT_AUTOMAKE(pd-flite, [0.01]) +AM_INIT_AUTOMAKE(THE_PACKAGE_NAME, THE_PACKAGE_VERSION)
dnl dnl use autoheader @@ -23,9 +29,8 @@ dnl AC_PREFIX_DEFAULT(/usr/local/lib/pd)
-dnl -dnl Save user flags -dnl +##-- save user *FLAGS +UCPPFLAGS="$CPPFLAGS" UCFLAGS="$CFLAGS" ULDFLAGS="$LDFLAGS" ULIBS="$LIBS" @@ -53,7 +58,14 @@ AC_SUBST(PACKAGE_NAME) AC_SUBST(BUGREPORT)
+##-- banner stuff +compiled_by="${LOGNAME:-${USER:-(unknown)}}" +compiled_on="`date`" +test -z "$compiled_on" && compiled_on="?"
+AC_DEFINE_UNQUOTED(PDFLITE_COMPILED_BY, "$compiled_by", [User who compiled this external]) +AC_DEFINE_UNQUOTED(PDFLITE_COMPILED_ON, "$compiled_on", [When this external was compiled]) + dnl dnl pd-directory/ies dnl @@ -89,53 +101,48 @@ dnl flite source directory dnl AC_ARG_WITH(flite-dir, - AC_HELP_STRING([--with-flite-dir=DIR], [Flite base directory (default=/usr/local/lib/flite-1.1-release)]), - [FLITE_DIR="$withval"] + AC_HELP_STRING([--with-flite-dir=DIR], [Flite source directory (default=none)]), + [FLITE_DIR="$withval"], ) if test -n "$FLITE_DIR"; then - FLITE_INCDIR="${FLITE_DIR}/include" - FLITE_LIBDIR="${FLITE_DIR}/lib" - #IFLAGS="$IFLAGS -I${FLITE_DIR}/include" - #LFLAGS="$LFLAGS -L${FLITE_DIR}/lib" + IFLAGS="$IFLAGS -I${FLITE_DIR}/include" + LFLAGS="$LFLAGS -L${FLITE_DIR}/lib" fi
-##-- check: headers -UCPPFLAGS="$CPPFLAGS" -if test -z "$FLITE_INCDIR"; then - for d_base in /usr /usr/local /sw ; do - for d_sub in 'include' 'include/flite' 'flite' 'flite/include' ; do - d="${d_base}/${d_sub}" - CPPFLAGS="$UCPPFLAGS -I$d" - AC_CHECK_HEADER($d/flite.h,[FLITE_INCDIR="$d"; break],[],[ ]) - done - if test -n "$FLITE_INCDIR"; then break; fi - done - ##-- flite.h: final check - if test -z "$FLITE_INCDIR"; then - AC_MSG_ERROR([Required header 'flite.h' not found: aborting],1) - fi - IFLAGS="$IFLAGS -I${FLITE_INCDIR}" +##-- check: headers: flite.h +CPPFLAGS="$UCPPFLAGS $IFLAGS" +AC_CHECK_HEADER([flite/flite.h],[pdflite_have_header=yes],[pdflite_have_header=no],[ ]) +if test "$pdflite_have_header" != "yes"; then + AC_MSG_WARN([Required header 'flite.h' not found]) + AC_MSG_WARN([- is the directory containing 'flite.h' in your CPPFLAGS variable?]) + AC_MSG_ERROR([Required header not found: aborting],1) fi -##--/FLITE_INCDIR
##-- check libs: libflite.a -ULDFLAGS="$LDFLAGS" -if test -z "$FLITE_LIBDIR"; then - for d_base in /usr /usr/local /sw ; do - for d_sub in 'lib' 'lib/flite' 'flite' 'flite/lib' ; do - d="${d_base}/${d_sub}" - LDFLAGS="$ULDFLAGS -L$d" - AC_CHECK_LIB(flite,[flite_init],[FLITE_LIBDIR="$d"; break],[],[-lm]) - done - if test -n "$FLITE_LIBDIR"; then break; fi +LDFLAGS="$ULDFLAGS $LFLAGS" +AC_CHECK_LIB(flite,[flite_init],[pdflite_have_lib=yes],[pdflite_have_lib=no],[-lm]) +if test "$pdflite_have_lib" != "yes"; then + for d in \ + /usr/lib /usr/local/lib /sw/lib \ + /usr/lib/flite /usr/local/lib/flite /sw/lib/flite \ + /usr/flite/lib /usr/local/flite/lib /sw/flite/lib \ + /usr/lib/flite/lib /usr/local/lib/flite/lib /sw/lib/flite/lib + do + LDFLAGS="$ULDFLAGS $LFLAGS -L$d" + AC_CHECK_LIB(flite,[flite_init],[pdflite_have_lib=yes],[pdflite_have_lib=no],[-lm]) + if test "$pdflite_have_lib" = "yes"; then + LFLAGS="$LFLAGS -L$d" + break + fi done + ## ##-- libflite.a: final check - if test -z "$FLITE_LIBDIR"; then - AC_MSG_ERROR([Required library 'flite' not found: aborting],1) + if test "$pdflite_have_lib" != "yes"; then + AC_MSG_WARN([Required library 'flite' not found]) + AC_MSG_WARN([- is the directory containing the 'flite' library in your LDFLAGS variable?]) + AC_MSG_ERROR([Required library not found: aborting],1) fi - LFLAGS="$LFLAGS -L${FLITE_LIBDIR}" fi -##--/FLITE_LIBDIR
##-- flite: libs: base FLITE_LIBS="-lflite -lm"
Modified: trunk/externals/moocow/flite/flite.c =================================================================== --- trunk/externals/moocow/flite/flite.c 2008-03-28 13:28:03 UTC (rev 9637) +++ trunk/externals/moocow/flite/flite.c 2008-03-28 21:23:51 UTC (rev 9638) @@ -22,8 +22,8 @@ #endif
#include <math.h> -#include <flite.h> -#include <cst_wave.h> +#include <flite/flite.h> +#include "flite/cst_wave.h"
/*-------------------------------------------------------------------- * DEBUG @@ -45,8 +45,10 @@ * Structures and Types *=====================================================================*/
-static char *flite_description = - "flite: Text-to-Speech external v%s by Bryan Jurish"; +static const char *flite_description = + "flite: Text-to-Speech external v" PACKAGE_VERSION " by Bryan Jurish\n" + "flite: compiled on " PDFLITE_COMPILED_ON " by " PDFLITE_COMPILED_BY "\n" + ; //static char *flite_acknowledge = "flite: based on code by "; //static char *flite_version = "flite: PD external v%s by Bryan Jurish";
@@ -237,7 +239,7 @@ *--------------------------------------------------------------------*/ void flite_setup(void) { post(""); - post(flite_description, PACKAGE_VERSION); + post(flite_description); post("");
// --- setup synth @@ -260,5 +262,5 @@ class_addmethod(flite_class, (t_method)flite_synth, gensym("synth"), 0);
// --- help patch - class_sethelpsymbol(flite_class, gensym("flite-help.pd")); + //class_sethelpsymbol(flite_class, gensym("flite-help.pd")); /* breaks pd-extended help lookup */ }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.