[Telepathy-commits] [telepathy-qt4/master] Check for pinocchio-ctl as well as pinocchio

Simon McVittie simon.mcvittie at collabora.co.uk
Thu Nov 27 03:34:20 PST 2008


---
 configure.ac |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1185c45..9d53a2e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -139,7 +139,9 @@ AC_SUBST(TP_QT4_LIBS)
 
 AC_PATH_PROGS([PINOCCHIO], [telepathy-pinocchio], [none],
   [$PATH:/usr/local/libexec:/usr/libexec:/usr/lib/telepathy])
-AM_CONDITIONAL([HAVE_PINOCCHIO], [! test none = "$PINOCCHIO"])
+AC_PATH_PROGS([PINOCCHIO_CTL], [pinocchio-ctl], [none])
+AM_CONDITIONAL([HAVE_PINOCCHIO],
+  [test none != "$PINOCCHIO" && test none != "$PINOCCHIO_CTL"])
 
 dnl Check for code generation tools
 PYTHON=
-- 
1.5.6.5




More information about the Telepathy-commits mailing list