Module: wine Branch: master Commit: 9c87cdc533dd0d487088277cad1083c97d8c0fd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c87cdc533dd0d487088277ca...
Author: Zebediah Figura z.figura12@gmail.com Date: Fri Jun 4 17:46:32 2021 -0500
configure: Always warn on missing GStreamer if --with-gstreamer was specified.
Signed-off-by: Zebediah Figura z.figura12@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
configure | 5 ++++- configure.ac | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/configure b/configure index e88a03a732a..96ab87e2fbc 100755 --- a/configure +++ b/configure @@ -14708,7 +14708,9 @@ fi CPPFLAGS=$ac_save_CPPFLAGS
fi -if test "x$ac_glib2_broken" != xyes -a "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" != xyes -a "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes ; then : +if test "x$with_gstreamer" = xyes -o "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes +then + if test "x$ac_glib2_broken" != xyes -a "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" != xyes; then : case "x$with_gstreamer" in x) as_fn_append wine_notices "|gstreamer-1.0 base plugins ${notice_platform}development files not found, GStreamer won't be supported." ;; xno) ;; @@ -14716,6 +14718,7 @@ if test "x$ac_glib2_broken" != xyes -a "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" ! This is an error since --with-gstreamer was requested." "$LINENO" 5 ;; esac
+fi fi test "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" = xyes || enable_winegstreamer=${enable_winegstreamer:-no}
diff --git a/configure.ac b/configure.ac index afb4dc7432a..6c7b22b3827 100644 --- a/configure.ac +++ b/configure.ac @@ -1622,8 +1622,11 @@ then ac_glib2_broken=yes WINE_NOTICE([glib-2.0 pkgconfig configuration is for the wrong architecture, winegstreamer won't be built.])])])]) fi -WINE_NOTICE_WITH(gstreamer,[test "x$ac_glib2_broken" != xyes -a "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" != xyes -a "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes ], - [gstreamer-1.0 base plugins ${notice_platform}development files not found, GStreamer won't be supported.]) +if test "x$with_gstreamer" = xyes -o "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes +then + WINE_NOTICE_WITH(gstreamer,[test "x$ac_glib2_broken" != xyes -a "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" != xyes], + [gstreamer-1.0 base plugins ${notice_platform}development files not found, GStreamer won't be supported.]) +fi test "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" = xyes || enable_winegstreamer=${enable_winegstreamer:-no}
dnl **** Check for ALSA 1.x ****