Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 523122 | Differences between
and this patch

Collapse All | Expand All

(-)a/configure.ac (-8 / +16 lines)
Lines 206-211 AC_ARG_ENABLE(qt, Link Here
206
              AS_HELP_STRING([--enable-qt],
206
              AS_HELP_STRING([--enable-qt],
207
                             [enable Qt support, (MP3 album art) [[default=auto]]]),,
207
                             [enable Qt support, (MP3 album art) [[default=auto]]]),,
208
              [enable_qt=auto])
208
              [enable_qt=auto])
209
AC_ARG_WITH(qt-version,
210
            AS_HELP_STRING([--with-qt-version=major],
211
                           [Force specific Qt version [[default=auto]]]),,
212
            [with_qt_version=auto])
209
213
210
selected_for_media_art="no  (disabled)"
214
selected_for_media_art="no  (disabled)"
211
215
Lines 218-231 if test "x$enable_qt" == "xyes" && test "x$enable_gdkpixbuf" == "xyes"; then Link Here
218
fi
222
fi
219
223
220
if test "x$enable_qt" != "xno" && test "x$enable_gdkpixbuf" != "xyes"; then
224
if test "x$enable_qt" != "xno" && test "x$enable_gdkpixbuf" != "xyes"; then
221
   PKG_CHECK_MODULES(QT5,
225
   if test "x$with_qt_version" == "xauto" || test "x$with_qt_version" == "x5"; then
222
                     [Qt5Gui >= $QT5_REQUIRED],
226
       PKG_CHECK_MODULES(QT5,
223
                     [have_qt5=yes],
227
                         [Qt5Gui >= $QT5_REQUIRED],
224
                     [have_qt5=no])
228
                         [have_qt5=yes],
225
   PKG_CHECK_MODULES(QT4,
229
                         [have_qt5=no])
226
                     [QtGui >= $QT4_REQUIRED],
230
   fi
227
                     [have_qt4=yes],
231
   if test "x$with_qt_version" == "xauto" || test "x$with_qt_version" == "x4"; then
228
                     [have_qt4=no])
232
       PKG_CHECK_MODULES(QT4,
233
                         [QtGui >= $QT4_REQUIRED],
234
                         [have_qt4=yes],
235
                         [have_qt4=no])
236
   fi
229
237
230
   if test "x$have_qt5" = "xyes"; then
238
   if test "x$have_qt5" = "xyes"; then
231
      BACKEND_CFLAGS="$QT5_CFLAGS -fPIC"
239
      BACKEND_CFLAGS="$QT5_CFLAGS -fPIC"

Return to bug 523122