mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-26 17:18:15 +00:00
configure: we still require Gtk+ >= 2.14.0 when compiling against 2.0
The check for the minor version was dropped in one of the previous commits.
This commit is contained in:
parent
1eb9190ad9
commit
5d5356b0b8
1 changed files with 10 additions and 4 deletions
14
configure.ac
14
configure.ac
|
@ -206,18 +206,24 @@ AC_SUBST(GSTPB_PREFIX)
|
||||||
|
|
||||||
dnl GTK is optional and used in examples
|
dnl GTK is optional and used in examples
|
||||||
HAVE_GTK=NO
|
HAVE_GTK=NO
|
||||||
|
GTK2_REQ=2.14.0
|
||||||
|
GTK3_REQ=2.91.3
|
||||||
if test "x$BUILD_EXAMPLES" = "xyes"; then
|
if test "x$BUILD_EXAMPLES" = "xyes"; then
|
||||||
AC_MSG_CHECKING([which gtk+ version to compile examples against (optional)])
|
AC_MSG_CHECKING([which gtk+ version to compile examples against (optional)])
|
||||||
AC_ARG_WITH([gtk],
|
AC_ARG_WITH([gtk],
|
||||||
AC_HELP_STRING([--with-gtk=3.0|2.0],
|
AC_HELP_STRING([--with-gtk=3.0|2.0],
|
||||||
[which gtk+ version to compile against (default: 2.0)]),
|
[which gtk+ version to compile against (default: 2.0)]),
|
||||||
[case "$with_gtk" in
|
[case "$with_gtk" in
|
||||||
2.0|3.0) ;;
|
2.0) GTK_REQ=$GTK2_REQ ;;
|
||||||
|
3.0) GTK_REQ=$GTK3_REQ ;;
|
||||||
*) AC_MSG_ERROR([invalid gtk+ version specified]);;
|
*) AC_MSG_ERROR([invalid gtk+ version specified]);;
|
||||||
esac],
|
esac],
|
||||||
[with_gtk=2.0])
|
[with_gtk=2.0
|
||||||
AC_MSG_RESULT([$with_gtk])
|
GTK_REQ=$GTK2_REQ])
|
||||||
PKG_CHECK_MODULES(GTK, gtk+-x11-$with_gtk, HAVE_GTK=yes, HAVE_GTK=no)
|
AC_MSG_RESULT([$with_gtk (>= $GTK_REQ)])
|
||||||
|
PKG_CHECK_MODULES(GTK, gtk+-x11-$with_gtk >= $GTK_REQ, HAVE_GTK=yes, HAVE_GTK=no)
|
||||||
|
AC_SUBST(GTK_LIBS)
|
||||||
|
AC_SUBST(GTK_CFLAGS)
|
||||||
fi
|
fi
|
||||||
AM_CONDITIONAL(HAVE_GTK, test "x$HAVE_GTK" = "xyes")
|
AM_CONDITIONAL(HAVE_GTK, test "x$HAVE_GTK" = "xyes")
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue