--- a/CMakeLists.txt	Thu Nov 13 02:32:29 2014 +0200
+++ b/CMakeLists.txt	Thu Nov 13 18:56:44 2014 +0200
@@ -28,6 +28,11 @@
 find_package(PkgConfig REQUIRED) 
 pkg_check_modules(GLIB REQUIRED glib-2.0) 
 pkg_check_modules(MCABBER REQUIRED mcabber)
+include(CheckSymbolExists)
+set(CMAKE_REQUIRED_INCLUDES ${MCABBER_INCLUDE_DIRS})
+set(CMAKE_REQUIRED_LIBRARIES ${MCABBER_LIBRARIES})
+set(CMAKE_REQUIRED_FLAGS ${MCABBER_LDFLAGS} ${MCABBER_CFLAGS})
+check_symbol_exists(MCABBER_API_HAVE_CMD_ID mcabber/api.h HAVE_MCABBER_CMD_ID)
 link_directories(${GLIB_LIBRARY_DIRS}
 				 ${MCABBER_LIBRARY_DIRS})
 
@@ -64,6 +69,12 @@
 set(CPACK_SOURCE_IGNORE_FILES "/\\\\..*;\\\\.swp;~$;/build/;\\\\.tar\\\\.;\\\\.deb;\\\\.so")
 include(CPack)
 
+## AVV build-time dependent requirements
+if(HAVE_MCABBER_CMD_ID)
+	set(AVV_COMMANDS_VERSION "commands:5 | commands:4 | commands:3")
+else()
+	set(AVV_COMMANDS_VERSION "commands:2 | commands:1")
+endif()
 configure_file(cmd.avv.in cmd.avv)
 
 ## Installation