On Fri, Feb 28, 2014 at 12:13 PM, Fabio Pedretti <fabio....@libero.it> wrote: > --- > configure.ac | 21 ++++++++++++++------- > 1 file changed, 14 insertions(+), 7 deletions(-) > > diff --git a/configure.ac b/configure.ac > index 0e0fd18..a6ce794 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -38,6 +38,13 @@ DRI3PROTO_REQUIRED=1.0 > PRESENTPROTO_REQUIRED=1.0 > LIBUDEV_REQUIRED=151 > GLPROTO_REQUIRED=1.4.14 > +LIBOMXIL_BELLAGIO_REQUIRED=0.0 > +VDPAU_REQUIRED=0.4.1 > +WAYLAND_REQUIRED=1.2.0 > +XCBDRI2_REQUIRED=1.8 > +XCBGLX_REQUIRED=1.8.1 > +XSHMFENCE_REQUIRED=1.1 > +XVMC_REQUIRED=1.0.6 > > dnl Check for progs > AC_PROG_CPP > @@ -855,10 +862,10 @@ xyesno) > fi > > # find the DRI deps for libGL > - dri_modules="x11 xext xdamage xfixes x11-xcb xcb-glx >= 1.8.1 xcb-dri2 > >= 1.8" > + dri_modules="x11 xext xdamage xfixes x11-xcb xcb-glx >= $XCBGLX_REQUIRED > xcb-dri2 >= $XCBDRI2_REQUIRED" > > if test x"$enable_dri3" = xyes; then > - dri_modules="$dri_modules xcb-dri3 xcb-present xcb-sync xshmfence >= > 1.1" > + dri_modules="$dri_modules xcb-dri3 xcb-present xcb-sync xshmfence >= > $XSHMFENCE_REQUIRED" > fi > > # add xf86vidmode if available > @@ -1284,20 +1291,20 @@ if test -n "$with_gallium_drivers"; then > fi > > if test "x$enable_xvmc" = xyes; then > - PKG_CHECK_MODULES([XVMC], [xvmc >= 1.0.6 x11-xcb xcb-dri2 >= 1.8]) > + PKG_CHECK_MODULES([XVMC], [xvmc >= $XVMC_REQUIRED x11-xcb xcb-dri2 >= > $XCBDRI2_REQUIRED]) > GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS xvmc" > fi > AM_CONDITIONAL(HAVE_ST_XVMC, test "x$enable_xvmc" = xyes) > > if test "x$enable_vdpau" = xyes; then > - PKG_CHECK_MODULES([VDPAU], [vdpau >= 0.4.1 x11-xcb xcb-dri2 >= 1.8], > + PKG_CHECK_MODULES([VDPAU], [vdpau >= $VDPAU_REQUIRED x11-xcb xcb-dri2 >= > $XCBDRI2_REQUIRED], > [VDPAU_LIBS="`$PKG_CONFIG --libs x11-xcb xcb-dri2`"]) > GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS vdpau" > fi > AM_CONDITIONAL(HAVE_ST_VDPAU, test "x$enable_vdpau" = xyes) > > if test "x$enable_omx" = xyes; then > - PKG_CHECK_MODULES([OMX], [libomxil-bellagio >= 0.0 x11-xcb xcb-dri2 >= > 1.8]) > + PKG_CHECK_MODULES([OMX], [libomxil-bellagio >= > $LIBOMXIL_BELLAGIO_REQUIRED x11-xcb xcb-dri2 >= $XCBDRI2_REQUIRED]) > GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS omx" > fi > AM_CONDITIONAL(HAVE_ST_OMX, test "x$enable_omx" = xyes) > @@ -1410,7 +1417,7 @@ egl_platforms=`IFS=', '; echo $with_egl_platforms` > for plat in $egl_platforms; do > case "$plat" in > wayland) > - PKG_CHECK_MODULES([WAYLAND], [wayland-client >= 1.2.0 > wayland-server >= 1.2.0]) > + PKG_CHECK_MODULES([WAYLAND], [wayland-client >= > $WAYLAND_REQUIRED wayland-server >= $WAYLAND_REQUIRED]) > GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/wayland" > > WAYLAND_PREFIX=`$PKG_CONFIG --variable=prefix wayland-client` > @@ -1419,7 +1426,7 @@ for plat in $egl_platforms; do > ;; > > x11) > - PKG_CHECK_MODULES([XCB_DRI2], [x11-xcb xcb-dri2 >= 1.8 > xcb-xfixes]) > + PKG_CHECK_MODULES([XCB_DRI2], [x11-xcb xcb-dri2 >= > XCBDRI2_REQUIRED xcb-xfixes])
Missing $ Otherwise: Reviewed-by: Matt Turner <matts...@gmail.com> _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
