]>
Commit | Line | Data |
---|---|---|
c89570ce | 1 | diff -Nurb o.speak-1.13-source/Makefile.am n.speak-1.13-source/Makefile.am |
2 | --- o.speak-1.13-source/Makefile.am 1970-01-01 01:00:00.000000000 +0100 | |
3 | +++ n.speak-1.13-source/Makefile.am 2006-09-03 17:14:22.000000000 +0200 | |
4 | @@ -0,0 +1,5 @@ | |
5 | +SUBDIRS = src | |
6 | +pkgdatadir = $(datadir)/espeak-data | |
7 | +install-data-local: | |
8 | + install -d $(DESTDIR)$(pkgdatadir) | |
9 | + cp -Rf espeak-data/* $(DESTDIR)$(pkgdatadir) | |
10 | diff -Nurb o.speak-1.13-source/configure.ac n.speak-1.13-source/configure.ac | |
11 | --- o.speak-1.13-source/configure.ac 1970-01-01 01:00:00.000000000 +0100 | |
12 | +++ n.speak-1.13-source/configure.ac 2006-09-03 17:51:34.000000000 +0200 | |
13 | @@ -0,0 +1,43 @@ | |
14 | +# -*- Autoconf -*- | |
15 | +# Process this file with autoconf to produce a configure script. | |
16 | + | |
17 | +AC_PREREQ(2.59) | |
18 | +AC_INIT(speak, 1.13, ) | |
19 | +AM_INIT_AUTOMAKE | |
20 | +AC_CONFIG_SRCDIR([src/speak.cpp]) | |
21 | +AC_CONFIG_HEADER([config.h]) | |
22 | + | |
23 | +# Checks for programs. | |
24 | +AC_PROG_CXX | |
25 | +AC_PROG_CC | |
26 | + | |
27 | +# Checks for libraries. | |
28 | +# FIXME: Replace `main' with a function in `-lportaudio': | |
29 | +AC_CHECK_LIB([portaudio], [main]) | |
30 | + | |
31 | +# Checks for header files. | |
32 | +AC_HEADER_STDC | |
33 | +AC_CHECK_HEADERS([locale.h stdlib.h string.h unistd.h wchar.h wctype.h portaudio.h]) | |
34 | + | |
35 | +# Checks for typedefs, structures, and compiler characteristics. | |
36 | +AC_C_CONST | |
37 | +AC_C_RESTRICT | |
38 | +AC_HEADER_STDBOOL | |
39 | + | |
40 | +# Checks for library functions. | |
41 | +AC_FUNC_CLOSEDIR_VOID | |
42 | +AC_FUNC_MALLOC | |
43 | +AC_FUNC_MEMCMP | |
44 | +AC_FUNC_REALLOC | |
45 | +AC_TYPE_SIGNAL | |
46 | +AC_FUNC_STAT | |
47 | +AC_CHECK_FUNCS([memset pow setlocale sqrt strchr Pa_IsStreamActive]) | |
48 | + | |
49 | +if test "$datadir" = "\${prefix}/share" ; then | |
50 | + datadirectory=$ac_default_prefix/share | |
51 | +else | |
52 | + datadirectory="$datadir" | |
53 | +fi | |
54 | +AC_DEFINE_UNQUOTED(DATADIRECTORY, "$datadirectory", [data directory]) | |
55 | +AC_CONFIG_FILES([Makefile src/Makefile]) | |
56 | +AC_OUTPUT | |
57 | diff -Nurb o.speak-1.13-source/src/Makefile n.speak-1.13-source/src/Makefile | |
58 | --- o.speak-1.13-source/src/Makefile 2006-04-06 17:40:54.000000000 +0200 | |
59 | +++ n.speak-1.13-source/src/Makefile 1970-01-01 01:00:00.000000000 +0100 | |
60 | @@ -1,16 +0,0 @@ | |
61 | -SRCS=$(wildcard *.cpp) | |
62 | -OBJS=$(patsubst %.cpp,%.o,$(SRCS)) | |
63 | -LIBS=-lstdc++ -lportaudio | |
64 | -all: speak | |
65 | - | |
66 | -.cpp.o: | |
67 | - $(CXX) $(CXXFLAGS) -O2 -Wall -pedantic -I. -c -fno-exceptions $< | |
68 | - | |
69 | -speak: $(OBJS) | |
70 | - $(CXX) -o $@ $(OBJS) $(LIBS) | |
71 | - | |
72 | -clean: | |
73 | - rm -f *.o *~ | |
74 | - | |
75 | -distclean: clean | |
76 | - rm -f speak | |
77 | diff -Nurb o.speak-1.13-source/src/Makefile.am n.speak-1.13-source/src/Makefile.am | |
78 | --- o.speak-1.13-source/src/Makefile.am 1970-01-01 01:00:00.000000000 +0100 | |
79 | +++ n.speak-1.13-source/src/Makefile.am 2006-09-02 21:16:02.000000000 +0200 | |
80 | @@ -0,0 +1,17 @@ | |
81 | +AM_CFLAGS = -Wall -pedantic -fno-exceptions | |
82 | +bin_PROGRAMS = speak | |
83 | +speak_SOURCES = \ | |
84 | + compiledict.cpp \ | |
85 | + dictionary.cpp \ | |
86 | + intonation.cpp \ | |
87 | + readclause.cpp \ | |
88 | + setlengths.cpp \ | |
89 | + speak.cpp \ | |
90 | + synthdata.cpp \ | |
91 | + synthesize.cpp \ | |
92 | + tr_english.cpp \ | |
93 | + tr_languages.cpp \ | |
94 | + translate.cpp \ | |
95 | + voices.cpp \ | |
96 | + wavegen.cpp | |
97 | + | |
98 | diff -Nurb o.speak-1.13-source/src/speak.cpp n.speak-1.13-source/src/speak.cpp | |
99 | --- o.speak-1.13-source/src/speak.cpp 2006-08-30 04:34:17.000000000 +0200 | |
100 | +++ n.speak-1.13-source/src/speak.cpp 2006-09-03 17:31:31.000000000 +0200 | |
101 | @@ -27,7 +27,7 @@ | |
102 | #include <time.h> | |
103 | #include <signal.h> | |
104 | #include <locale.h> | |
105 | -#include "sys/stat.h" | |
106 | +#include <sys/stat.h> | |
107 | ||
108 | #include "speech.h" | |
109 | #include "voice.h" | |
110 | @@ -36,6 +36,7 @@ | |
111 | #include "translate.h" | |
112 | #include "speak_lib.h" | |
113 | ||
114 | +#include "config.h" | |
115 | ||
116 | ||
117 | char path_home[120]; | |
118 | @@ -158,7 +159,7 @@ | |
119 | sprintf(path_home,"%s/espeak-data",getenv("HOME")); | |
120 | if(access(path_home,R_OK) != 0) | |
121 | { | |
122 | - strcpy(path_home,"/usr/share/espeak-data"); | |
123 | + strcpy(path_home, DATADIRECTORY "/espeak-data"); | |
124 | } | |
125 | #endif | |
126 | } | |
127 | diff -Nurb o.speak-1.13-source/src/voices.cpp n.speak-1.13-source/src/voices.cpp | |
128 | --- o.speak-1.13-source/src/voices.cpp 2006-08-30 04:34:17.000000000 +0200 | |
129 | +++ n.speak-1.13-source/src/voices.cpp 2006-09-02 19:13:45.000000000 +0200 | |
130 | @@ -18,15 +18,15 @@ | |
131 | * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * | |
132 | ***************************************************************************/ | |
133 | ||
134 | -#include "stdio.h" | |
135 | -#include "ctype.h" | |
136 | -#include "wctype.h" | |
137 | -#include "string.h" | |
138 | -#include "stdlib.h" | |
139 | -#include "speech.h" | |
140 | +#include <stdio.h> | |
141 | +#include <ctype.h> | |
142 | +#include <wctype.h> | |
143 | +#include <string.h> | |
144 | +#include <stdlib.h> | |
145 | +#include <speech.h> | |
146 | ||
147 | #ifndef PLATFORM_RISCOS | |
148 | -#include "dirent.h" | |
149 | +#include <dirent.h> | |
150 | #endif | |
151 | ||
152 | #include "voice.h" | |
153 | diff -Nurb o.speak-1.13-source/src/wavegen.cpp n.speak-1.13-source/src/wavegen.cpp | |
154 | --- o.speak-1.13-source/src/wavegen.cpp 2006-08-30 04:34:17.000000000 +0200 | |
155 | +++ n.speak-1.13-source/src/wavegen.cpp 2006-09-03 18:05:06.000000000 +0200 | |
156 | @@ -33,13 +33,16 @@ | |
157 | #include "synthesize.h" | |
158 | ||
159 | #ifdef USE_PORTAUDIO | |
160 | -#include "portaudio.h" | |
161 | +#warning USE_PORTAUDIO IS DEFINED | |
162 | +#include <portaudio.h> | |
163 | #undef USE_PORTAUDIO | |
164 | // determine portaudio version by looking for a #define which is not in V18 | |
165 | #ifdef paNeverDropInput | |
166 | #define USE_PORTAUDIO 19 | |
167 | +#warning USE_PORTAUDIO IS DEFINED AS 19 | |
168 | #else | |
169 | #define USE_PORTAUDIO 18 | |
170 | +#warning USE_PORTAUDIO IS DEFINED AS 18 | |
171 | #endif | |
172 | #endif | |
173 |