[PATCH] configure.ac: Be more helpful for users with mis-configured glib-2.0
Andrew Eikum
aeikum at codeweavers.com
Fri Feb 5 13:32:33 CST 2016
glib-2.0 ships different headers for x86 and x86_64, but pkgconfig
doesn't support returning different headers for a particular
architecture. Most distros will default to the 64-bit glib-2.0
headers, which will built winegstreamer incorrectly. We already have a
check for this mis-configuration, but we can print a more helpful
notice for users.
Signed-off-by: Andrew Eikum <aeikum at codeweavers.com>
---
configure.ac | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 59fc4fa..7e0e00f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1478,9 +1478,11 @@ then
[[static int a[sizeof(gint64) > 4 ? 1 : -1]; if (a[0]) return 0;]])],
[AC_MSG_RESULT([yes])
AC_CHECK_LIB(gstreamer-1.0,gst_pad_new,[:],,[$GSTREAMER_LIBS])],
- [AC_MSG_RESULT([no])])])])
+ [AC_MSG_RESULT([no])
+ 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_cv_lib_gstreamer_1_0_gst_pad_new" != xyes -a "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes],
+WINE_NOTICE_WITH(gstreamer,[test "x$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 support disabled])
test "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" = xyes || enable_winegstreamer=${enable_winegstreamer:-no}
--
2.7.0
More information about the wine-patches
mailing list