Fix some build issues

cfg/checks/check_features.mk

@@ -13,12 +13,14 @@ ifneq ($(AUDIO), disabled)
 endif
 
 # Check if we want build video support
-VIDEO = $*shell if [ -z "$(DISABLE_AV)" ] || [ "$(DISABLE_AV)" = "0" ] ; then echo enabled ; else echo disabled ; fi)
+VIDEO = $(shell if [ -z "$(DISABLE_AV)" ] || [ "$(DISABLE_AV)" = "0" ] ; then echo enabled ; else echo disabled ; fi)
+ifneq ($(X11), disabled)
 ifneq ($(AUDIO), disabled)
 ifneq ($(VIDEO), disabled)
     -include $(CHECKS_DIR)/video.mk
 endif
 endif
+endif
 
 # Check if we want build sound notifications support
 SND_NOTIFY = $(shell if [ -z "$(DISABLE_SOUND_NOTIFY)" ] || [ "$(DISABLE_SOUND_NOTIFY)" = "0" ] ; then echo enabled ; else echo disabled ; fi)

cfg/checks/sound_notifications.mk

@@ -1,10 +1,10 @@
 # Variables for sound notifications support
 SND_NOTIFY_LIBS = openal freealut
 SND_NOTIFY_CFLAGS = -DSOUND_NOTIFY
-ifneq (, $(findstring device.o, $(OBJ)))
+ifneq (, $(findstring audio_device.o, $(OBJ)))
     SND_NOTIFY_OBJ =
 else
-    SND_NOTIFY_OBJ = device.o
+    SND_NOTIFY_OBJ = audio_device.o
 endif
 
 # Check if we can build sound notifications support

src/audio_call.h

@@ -76,12 +76,9 @@ struct CallControl {
     uint32_t audio_sample_rate;
     uint8_t audio_channels;
 
-#ifdef VIDEO
     uint32_t video_bit_rate;
     int32_t video_frame_duration;
 
-#endif /* VIDEO */
-
 } CallControl;
 
 struct CallControl CallControl;

src/prompt.c

@@ -52,6 +52,7 @@ FriendRequests FrndRequests;
 #ifdef VIDEO
 #define AC_NUM_GLOB_COMMANDS 21
 #elif AUDIO
+#define AC_NUM_GLOB_COMMANDS 19
 #else
 #define AC_NUM_GLOB_COMMANDS 17
 #endif