Mercurial > pidgin
changeset 28035:4d4e6adea7bc
merge of '0e908152e3a09fb19dea225fe87e2d691f208d4e'
and '6082171acfbee6eca0da0fc109d9c79563a234df'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Fri, 21 Aug 2009 07:03:48 +0000 |
| parents | b779173fd19e (current diff) 288ec4628f63 (diff) |
| children | adf7dc41770d |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Fri Aug 21 07:03:09 2009 +0000 +++ b/configure.ac Fri Aug 21 07:03:48 2009 +0000 @@ -795,13 +795,13 @@ dnl ####################################################################### AC_ARG_ENABLE(vv, [AC_HELP_STRING([--disable-vv], [compile without voice and video support])], - [enable_vv="$enableval" force_vv=$enableval], [enable_vv="yes" force_vv=no]) + enable_vv="$enableval", enable_vv="yes") if test "x$enable_vv" != "xno"; then if test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farsight" != "xno"; then AC_DEFINE(USE_VV, 1, [Use voice and video]) else enable_vv="no" - if test "x$force_vv" = "xyes"; then + if test "x$force_deps" = "xyes"; then AC_MSG_ERROR([ Dependencies for voice/video were not met. Install the necessary gstreamer and farsight packages first.