Zebediah Figura : configure: Also warn on missing GStreamer if --without-quicktime was specified.
Alexandre Julliard
julliard at winehq.org
Mon Jun 7 16:30:35 CDT 2021
Module: wine
Branch: master
Commit: a1d029c9e16a87a9a3fd1c06bcca5603f73d0c0c
URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1d029c9e16a87a9a3fd1c06bcca5603f73d0c0c
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Fri Jun 4 17:46:33 2021 -0500
configure: Also warn on missing GStreamer if --without-quicktime was specified.
Based on a patch by Gijs Vermeulen.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Gijs Vermeulen <gijsvrm at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
configure | 2 +-
configure.ac | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 96ab87e2fbc..9acc579ca11 100755
--- a/configure
+++ b/configure
@@ -14708,7 +14708,7 @@ fi
CPPFLAGS=$ac_save_CPPFLAGS
fi
-if test "x$with_gstreamer" = xyes -o "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes
+if test "x$with_gstreamer" = xyes -o "x$with_quicktime" = xno -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
diff --git a/configure.ac b/configure.ac
index 6c7b22b3827..bf7efa0690c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1622,7 +1622,7 @@ then
ac_glib2_broken=yes
WINE_NOTICE([glib-2.0 pkgconfig configuration is for the wrong architecture, winegstreamer won't be built.])])])])
fi
-if test "x$with_gstreamer" = xyes -o "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes
+if test "x$with_gstreamer" = xyes -o "x$with_quicktime" = xno -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.])
More information about the wine-cvs
mailing list