[libmediaart] configure: Don't link to both Qt and gdk-pixbuf if both are autodetected
- From: Yanko Kaneti <yaneti src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libmediaart] configure: Don't link to both Qt and gdk-pixbuf if both are autodetected
- Date: Mon, 10 Feb 2014 08:36:27 +0000 (UTC)
commit 53381ada025b8fd0eabf1630cb00162496492e74
Author: Yanko Kaneti <yaneti declera com>
Date: Fri Feb 7 22:27:14 2014 +0200
configure: Don't link to both Qt and gdk-pixbuf if both are autodetected
configure.ac | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4d589a1..ddba936 100644
--- a/configure.ac
+++ b/configure.ac
@@ -228,8 +228,8 @@ if test "x$enable_qt" != "xno" && test "x$enable_gdkpixbuf" != "xyes"; then
[have_qt4=no])
if test "x$have_qt5" = "xyes"; then
- LIBMEDIAART_CFLAGS="$LIBMEDIAART_CFLAGS $QT5_CFLAGS -fPIC"
- LIBMEDIAART_LIBS="$LIBMEDIAART_LIBS $QT5_LIBS"
+ BACKEND_CFLAGS="$QT5_CFLAGS -fPIC"
+ BACKEND_LIBS="$QT5_LIBS"
AC_DEFINE(HAVE_QT5, [], [Define if we have Qt5])
AC_DEFINE(HAVE_QT, [], [Define if we have Qt])
@@ -238,8 +238,8 @@ if test "x$enable_qt" != "xno" && test "x$enable_gdkpixbuf" != "xyes"; then
selected_for_media_art="yes (qt5)"
else
if test "x$have_qt4" = "xyes"; then
- LIBMEDIAART_CFLAGS="$LIBMEDIAART_CFLAGS $QT4_CFLAGS -fPIC"
- LIBMEDIAART_LIBS="$LIBMEDIAART_LIBS $QT4_LIBS"
+ BACKEND_CFLAGS="$QT4_CFLAGS -fPIC"
+ BACKEND_LIBS="$QT4_LIBS"
AC_DEFINE(HAVE_QT4, [], [Define if we have Qt4])
AC_DEFINE(HAVE_QT, [], [Define if we have Qt])
@@ -270,8 +270,8 @@ if test "x$enable_gdkpixbuf" != "xno" && test "x$enable_qt" != "xyes"; then
[have_gdkpixbuf=yes],
[have_gdkpixbuf=no])
- LIBMEDIAART_CFLAGS="$LIBMEDIAART_CFLAGS $GDKPIXBUF_CFLAGS"
- LIBMEDIAART_LIBS="$LIBMEDIAART_LIBS $GDKPIXBUF_LIBS"
+ BACKEND_CFLAGS="$GDKPIXBUF_CFLAGS"
+ BACKEND_LIBS="$GDKPIXBUF_LIBS"
if test "x$have_gdkpixbuf" = "xyes"; then
AC_DEFINE(HAVE_GDKPIXBUF, [], [Define if we have GdkPixbuf])
@@ -290,6 +290,8 @@ fi
AM_CONDITIONAL(HAVE_GDKPIXBUF, test "x$have_gdkpixbuf" = "xyes")
+LIBMEDIAART_CFLAGS="$LIBMEDIAART_CFLAGS $BACKEND_CFLAGS"
+LIBMEDIAART_LIBS="$LIBMEDIAART_LIBS $BACKEND_LIBS"
AC_SUBST(LIBMEDIAART_BACKEND)
#################################################################
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]