From d47d56ecffa1df1894b7dc883fce503a7301cd52 Mon Sep 17 00:00:00 2001 From: Kaj-Michael Lang Date: Tue, 23 Oct 2007 14:09:42 +0300 Subject: [PATCH] Don't try to use espeak if not found. Add hildon-fm-2 check. --- configure.ac | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 8d53ed2..00cd91f 100644 --- a/configure.ac +++ b/configure.ac @@ -164,14 +164,24 @@ if test "x$HAVE_HILDON" = "xyes"; then fi fi - PKG_CHECK_MODULES(HILDONFM, hildon-fm, HAVE_HILDONFM=yes, HAVE_HILDONFM=no) - if test "x$HAVE_OSSO" = "xyes"; then - AC_DEFINE(WITH_HILDONFM, 1, [build with Hildon Filemanager]) + PKG_CHECK_MODULES(HILDONFM1, hildon-fm, HAVE_HILDONFM1=yes, HAVE_HILDONFM1=no) + if test "x$HAVE_HILDONFM1" = "xyes"; then + AC_DEFINE(WITH_HILDONFM, 1, [build with Hildon Filemanager 1]) + AC_SUBST(HILDONFM_LIBS) + AC_SUBST(HILDONFM_CFLAGS) + else + AC_MSG_RESULT(no) + fi + + PKG_CHECK_MODULES(HILDONFM2, hildon-fm-2, HAVE_HILDONFM2=yes, HAVE_HILDONFM2=no) + if test "x$HAVE_HILDONFM1" = "xyes"; then + AC_DEFINE(WITH_HILDONFM, 1, [build with Hildon Filemanager 2]) AC_SUBST(HILDONFM_LIBS) AC_SUBST(HILDONFM_CFLAGS) else AC_MSG_RESULT(no) fi + fi AM_CONDITIONAL(WITH_HILDON, test "x$HAVE_HILDON" = "xyes") @@ -236,7 +246,8 @@ AC_CHECK_HEADERS(expat.h, ) AC_SUBST(EXPAT_LIBS) -AC_CHECK_HEADER(espeak/speak_lib.h) +AC_CHECK_HEADER(espeak/speak_lib.h, HAVE_ESPEAK=yes, HAVE_ESPEAK=no) +if test "x$HAVE_GST" = "xyes"; then ESPEAK_LIBS="-lespeak" ESPEAK_CFLAGS="-I/usr/include/espeak" AC_CHECK_LIB([espeak], [espeak_Initialize], @@ -244,6 +255,7 @@ AC_CHECK_LIB([espeak], [espeak_Initialize], AC_SUBST(ESPEAK_CFLAGS) AC_SUBST(ESPEAK_LIBS) ) +fi # Localisation if test "x$HAVE_HILDON" = "xyes"; then -- 2.39.5