Skip to content

Commit 4abb1c3

Browse files
committed
configure: Fix -t screen:help not printing compiled modules on linux
The output is based on HAVE_SCREEN_X11 & HAVE_SCREEN_PW macros, but those were not defined anywhere
1 parent 88a3b30 commit 4abb1c3

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

configure.ac

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2288,6 +2288,7 @@ if test "$system" = Linux && test $screen_cap_req != no && test $screen_cap_req
22882288
fi
22892289
add_module vidcap_screen_x11 "src/video_capture/screen_x11.o src/x11_common.o" "$SCREEN_CAP_LIB"
22902290
screen_modules="${screen_modules:+$screen_modules,}X11"
2291+
AC_DEFINE([HAVE_SCREEN_X11], [1], [Build with X11 screencast support])
22912292
fi
22922293
fi
22932294

@@ -2308,7 +2309,7 @@ if test $found_screen_screen_pw_deps = yes && test $pipewire_video = yes; then
23082309

23092310
INC="$INC $SCREEN_CAP_PIPEWIRE_INC"
23102311
CXXFLAGS="$CXXFLAGS $SCREEN_CAP_PIPEWIRE_INC"
2311-
AC_DEFINE([HAVE_DBUS_SCREENCAST], [1], [Build with pipewire screencast dbus support])
2312+
AC_DEFINE([HAVE_SCREEN_PW], [1], [Build with pipewire screencast dbus support])
23122313

23132314
PIPEWIRE_CAP_LIBS="$PIPEWIRE_CAP_LIBS $SCREEN_CAP_PIPEWIRE_LIBS"
23142315
PIPEWIRE_CAP_OBJS="$PIPEWIRE_CAP_OBJS src/utils/dbus_portal.o"

src/video_capture/pipewire.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ static int parse_params(const struct vidcap_params *params, vcap_pw_state *s) {
527527
return VIDCAP_INIT_OK;
528528
}
529529

530-
#ifdef HAVE_DBUS_SCREENCAST
530+
#ifdef HAVE_SCREEN_PW
531531
static int vidcap_screen_pw_init(const struct vidcap_params *params, void **state)
532532
{
533533
if (vidcap_params_get_flags(params) & VIDCAP_FLAG_AUDIO_ANY) {
@@ -629,7 +629,7 @@ static video_frame *vidcap_pw_grab(void *state, struct audio_frame **audio)
629629
return s->in_flight_frame.get();
630630
}
631631

632-
#ifdef HAVE_DBUS_SCREENCAST
632+
#ifdef HAVE_SCREEN_PW
633633

634634
static const struct video_capture_info vidcap_screen_pw_info = {
635635
vidcap_screen_pw_probe,

0 commit comments

Comments
 (0)