mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 14:56:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

configure: first check for QtGui >= 4.6, only then for >= 4.0

Browse source 
If we first check for >= 4.0 the second check for >= 4.6 will just
short-cut since we are using the same prefix for the variables for
both checks, and they've already been set previously. So the examples
requiring >= 4.6 were built even in the >= 4.0 case.
This commit is contained in:
Tim-Philipp Müller 2010-03-05 15:58:44 +00:00
parent f9e2317867
commit e943ef3757
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
configure.ac
View file

@ -282,9 +282,14 @@ PKG_CHECK_MODULES(GTK_X11, gtk+-x11-2.0 >= 2.14.0,
AM_CONDITIONAL(HAVE_GTK_X11, test "x$HAVE_GTK_X11" = "xyes") AM_CONDITIONAL(HAVE_GTK_X11, test "x$HAVE_GTK_X11" = "xyes")
dnl QT is optional and only used in examples dnl QT is optional and only used in examples
PKG_CHECK_MODULES(QT, QtGui >= 4.0, HAVE_QT=yes, HAVE_QT=no) PKG_CHECK_MODULES(QT, QtGui >= 4.6, [
HAVE_QT_GV=yes
HAVE_QT=yes
], [
HAVE_QT_GV=no
PKG_CHECK_MODULES(QT, QtGui >= 4.0, HAVE_QT=yes, HAVE_QT=no)
])
AM_CONDITIONAL(HAVE_QT, test "x$HAVE_QT" = "xyes") AM_CONDITIONAL(HAVE_QT, test "x$HAVE_QT" = "xyes")
PKG_CHECK_MODULES(QT, QtGui >= 4.6, HAVE_QT_GV=yes, HAVE_QT_GV=no)
AM_CONDITIONAL(HAVE_QT_GV, test "x$HAVE_QT_GV" = "xyes") AM_CONDITIONAL(HAVE_QT_GV, test "x$HAVE_QT_GV" = "xyes")
dnl *** set variables based on configure arguments *** dnl *** set variables based on configure arguments ***