Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAleksey Lim <alsroot@member.fsf.org>2009-02-06 18:29:56 (GMT)
committer Aleksey Lim <alsroot@member.fsf.org>2009-02-06 18:29:56 (GMT)
commit6049e8b831229e237769627faa0699f445f41fe7 (patch)
tree370bcfd954feff76d49d557c869f8c5f97dab0c6
parentf7cd113b68981880a0cc7a5dc4f872f04f00ac4c (diff)
Check dependencies in configure.ac
-rwxr-xr-xautogen.sh1
-rw-r--r--configure.ac5
-rw-r--r--src/Makefile.am4
-rw-r--r--src/espeak.c2
4 files changed, 9 insertions, 3 deletions
diff --git a/autogen.sh b/autogen.sh
index 9d84a03..aa82ce7 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,6 +2,7 @@
# you can either set the environment variables AUTOCONF and AUTOMAKE
# to the right versions, or leave them unset and get the RedHat 7.3 defaults
+NOCONFIGURE=1
DIE=0
package=gst-plugin
srcfile=src/main.c
diff --git a/configure.ac b/configure.ac
index ba2be0f..ef67921 100644
--- a/configure.ac
+++ b/configure.ac
@@ -127,5 +127,10 @@ dnl set proper LDFLAGS for plugins
GST_PLUGIN_LDFLAGS='-module -avoid-version -export-symbols-regex [_]*\(gst_\|Gst\|GST_\).*'
AC_SUBST(GST_PLUGIN_LDFLAGS)
+dnl check espeak dependencies
+AC_CHECK_LIB(espeak, espeak_Initialize,, AC_MSG_ERROR())
+PKG_CHECK_MODULES(GIO, gio-2.0)
+PKG_CHECK_MODULES(GST_AUDIO, gstreamer-audio-0.10)
+
AC_OUTPUT(Makefile m4/Makefile src/Makefile)
diff --git a/src/Makefile.am b/src/Makefile.am
index abf184d..45e3704 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,8 +2,8 @@ plugin_LTLIBRARIES = libgstespeak.la
libgstespeak_la_SOURCES = gstespeak.c espeak.c
-libgstespeak_la_CFLAGS = $(GST_CFLAGS)
-libgstespeak_la_LIBADD = $(GST_LIBS) -lespeak -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lgstaudio-0.10 -lgstbase-0.10 -lgstinterfaces-0.10 -lgstreamer-0.10
+libgstespeak_la_CFLAGS = $(GST_CFLAGS) $(GIO_CFLAGS) $(GST_AUDIO_CFLAGS)
+libgstespeak_la_LIBADD = $(GST_LIBS) $(GIO_LIBS) $(GST_AUDIO_LIBS)
libgstespeak_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstespeak_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/src/espeak.c b/src/espeak.c
index 92d775e..7380066 100644
--- a/src/espeak.c
+++ b/src/espeak.c
@@ -119,7 +119,7 @@ espeak_voices()
for (i = voices; *i; ++i) ++count;
out = j = g_new0(gchar*, count);
for (i = voices; *i; ++i)
- *j++ = g_strconcat((*i)->name, " ", (*i)->languages+1, NULL);
+ *j++ = g_strconcat((*i)->name, ":", (*i)->languages+1, NULL);
return out;
}