[libmediaart] build: Fix selection between backends Qt and GdkPixbuf
- From: Martyn James Russell <mr src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libmediaart] build: Fix selection between backends Qt and GdkPixbuf
- Date: Thu, 6 Feb 2014 17:47:26 +0000 (UTC)
commit 92fec15ce2b3c87ee1f197c2bed9772d8aa5f873
Author: Martyn Russell <martyn lanedo com>
Date: Thu Feb 6 17:38:55 2014 +0000
build: Fix selection between backends Qt and GdkPixbuf
configure.ac | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 81777b4..744de13 100644
--- a/configure.ac
+++ b/configure.ac
@@ -213,6 +213,10 @@ selected_for_media_art="no (disabled)"
# Choose between backends (GdkPixbuf/Qt/etc)
##################################################################
+if test "x$enable_qt" == "xyes" && test "x$enable_gdkpixbuf" == "xyes"; then
+ AC_MSG_ERROR([Can not enable both Qt and GdkPixbuf backends, please pick one])
+fi
+
if test "x$enable_qt" != "xno" && test "x$enable_gdkpixbuf" != "xyes"; then
PKG_CHECK_MODULES(QT5,
[Qt5Gui >= $QT5_REQUIRED],
@@ -260,7 +264,7 @@ AM_CONDITIONAL(HAVE_QT4, test "x$have_qt4" = "xyes")
AM_CONDITIONAL(HAVE_QT5, test "x$have_qt5" = "xyes")
AM_CONDITIONAL(HAVE_QT, test "x$have_qt5" = "xyes" || test "x$have_qt4" = "xyes")
-if test "x$enable_gdkpixbuf" != "xno" && test "x$enable_quill" != "xyes"; then
+if test "x$enable_gdkpixbuf" != "xno" && test "x$enable_qt" != "xyes"; then
PKG_CHECK_MODULES(GDKPIXBUF,
[gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED],
[have_gdkpixbuf=yes],
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]