aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWill Thompson <will.thompson@collabora.co.uk>2011-08-25 23:17:11 +0800
committerWill Thompson <will.thompson@collabora.co.uk>2011-08-25 23:17:11 +0800
commitf3c4f721b13f08c81ff2c9efe5b0f91c07df6903 (patch)
tree600079b1e37a4331c3c33e5707124bc5eae1451e
parenta7c8e72c9c4daa5a4830bad4ab6baa500106b3b4 (diff)
downloadgsoc2013-empathy-f3c4f721b13f08c81ff2c9efe5b0f91c07df6903.tar
gsoc2013-empathy-f3c4f721b13f08c81ff2c9efe5b0f91c07df6903.tar.gz
gsoc2013-empathy-f3c4f721b13f08c81ff2c9efe5b0f91c07df6903.tar.bz2
gsoc2013-empathy-f3c4f721b13f08c81ff2c9efe5b0f91c07df6903.tar.lz
gsoc2013-empathy-f3c4f721b13f08c81ff2c9efe5b0f91c07df6903.tar.xz
gsoc2013-empathy-f3c4f721b13f08c81ff2c9efe5b0f91c07df6903.tar.zst
gsoc2013-empathy-f3c4f721b13f08c81ff2c9efe5b0f91c07df6903.zip
Revert "configure: simplify error path in --enable-call"
This reverts commit a7c8e72c9c4daa5a4830bad4ab6baa500106b3b4. It accidentally made not specifying an option equivalent to --enable-call.
-rw-r--r--configure.ac5
1 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index b7e9b386c..cb60cf5f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -218,7 +218,7 @@ if test "x$enable_call" != "xno" ; then
clutter-1.0
clutter-gtk-1.0
clutter-gst-1.0
- ], have_call="yes" )
+ ], have_call="yes", have_call="no" )
if test "x$have_call" = "xyes"; then
AC_DEFINE(HAVE_CALL, 1, [Define if you have Call channel support])
@@ -227,6 +227,9 @@ else
have_call=no
fi
+if test "x$enable_call" = "xyes" -a "x$have_call" != "xyes"; then
+ AC_MSG_ERROR([Could not find Call handler dependencies.])
+fi
AM_CONDITIONAL(HAVE_CALL, test "x$have_call" = "xyes")