merge of '49118a4c6035353c0f8cf1aa30297dd36e43241f'
[vuplus_openembedded] / packages / speech-dispatcher / files / configure_fix.patch
1 Index: speech-dispatcher-0.6.6/configure.in
2 ===================================================================
3 --- speech-dispatcher-0.6.6.orig/configure.in   2008-07-20 13:10:44.208894676 +0200
4 +++ speech-dispatcher-0.6.6/configure.in        2008-07-20 13:11:16.946093820 +0200
5 @@ -5,6 +5,7 @@
6  
7  dnl progs
8  AC_PROG_CC
9 +AC_PROG_CXX
10  
11  dnl info
12  AM_INIT_AUTOMAKE("speech-dispatcher", "`cat version.sh|grep '^VERSION'|awk -F= '{print $2}'`")
13 @@ -134,12 +135,15 @@
14  AC_SUBST(ibmtts_include)
15  
16  dnl check for espeak support
17 +AC_LANG_PUSH([C++])
18  AC_CHECK_LIB(espeak,
19  espeak_Initialize,
20                 espeak_ok="true"; echo "Compiling with espeak support.",
21                 espeak_ok="false"; echo "Espeak not found.",
22                 -lpthread -lm)
23  
24 +AC_LANG_POP([C++])
25 +
26  AC_ARG_WITH(espeak, AS_HELP_STRING(--with-espeak, Compile with espeak support),
27                  if test $withval = "no"; then 
28                     echo "Forced compilation without espeak support."; 
29 Index: speech-dispatcher-0.6.6/src/modules/Makefile.am
30 ===================================================================
31 --- speech-dispatcher-0.6.6.orig/src/modules/Makefile.am        2008-07-20 13:10:51.768895801 +0200
32 +++ speech-dispatcher-0.6.6/src/modules/Makefile.am     2008-07-20 13:10:57.665559805 +0200
33 @@ -8,6 +8,7 @@
34  EXTRA_DIST = module_main.c module_utils_addvoice.c festival_client.c festival_client.h
35  
36  AM_CFLAGS = -Wall -DLOCALEDIR=\"$(localedir)\" $(inc_local) @glib_include@ -L$(top_srcdir)/src/audio -I$(top_srcdir)/src/audio -I../../intl/ $(ibmtts_include) @SNDFILE_CFLAGS@ -Wl,--rpath -Wl,$(spdlibdir)
37 +AM_CXXFLAGS = -Wall -DLOCALEDIR=\"$(localedir)\" $(inc_local) @glib_include@ -L$(top_srcdir)/src/audio -I$(top_srcdir)/src/audio -I../../intl/ $(ibmtts_include) @SNDFILE_CFLAGS@ -Wl,--rpath -Wl,$(spdlibdir)
38  
39  if flite_support
40  if ibmtts_support
41 @@ -45,6 +46,6 @@
42  sd_cicero_SOURCES = cicero.c module_utils.c module_utils.h
43  sd_cicero_LDADD = -lpthread -ldotconf @glib_libs@ @gthread_libs@
44  
45 -sd_espeak_SOURCES = espeak.c module_utils.c module_utils.h
46 +sd_espeak_SOURCES = espeak.c module_utils.c module_utils.h dummy.cpp
47  sd_espeak_LDFLAGS = -rpath '$(spdlibdir)'
48  sd_espeak_LDADD = -lsdaudio -lespeak -lpthread -ldotconf @glib_libs@ @SNDFILE_LIBS@ @gthread_libs@
49 Index: speech-dispatcher-0.6.6/src/modules/dummy.cpp
50 ===================================================================
51 --- /dev/null   1970-01-01 00:00:00.000000000 +0000
52 +++ speech-dispatcher-0.6.6/src/modules/dummy.cpp       2008-07-20 13:10:57.668895216 +0200
53 @@ -0,0 +1 @@
54 +