diff options
| author | Víctor Manuel Jáquez Leal <victorx.jaquez@intel.com> | 2016-01-29 12:34:30 +0100 |
|---|---|---|
| committer | Víctor Manuel Jáquez Leal <victorx.jaquez@intel.com> | 2016-02-02 16:03:33 +0100 |
| commit | e1a6f57468de7b51e5797c2a09a3468b68560044 (patch) | |
| tree | 1dae099609a2c6045645b9ed57b09b7d937922ff | |
| parent | 19945763deb00d7cc23070bb3ad539055d39d9f1 (diff) | |
| download | gst-vaapi-e1a6f57468de7b51e5797c2a09a3468b68560044.tar.gz | |
build: check for OpenGL either GLX or EGL are requested
Refactor some code in configure.ac to centralize $enable_opengl definition.
Signed-off-by: Víctor Manuel Jáquez Leal <victorx.jaquez@intel.com>
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 5e85ee4f..ec5a89c7 100644 --- a/configure.ac +++ b/configure.ac @@ -195,9 +195,12 @@ AC_CACHE_CHECK([for VP9 parser], LIBS="$saved_LIBS" ]) +AS_IF([test "x$enable_glx" = "xyes" -o "x$enable_egl" = "xyes"], + [enable_opengl="yes"], [enable_opengl="no"]) + dnl ... opengl helper libraries HAVE_GSTGL=0 -if test "x$enable_glx" = "xyes" -o "x$enable_egl" = "xyes"; then +if test "x$enable_opengl" = "xyes"; then PKG_CHECK_MODULES([GST_GL], [gstreamer-gl-$GST_PKG_VERSION >= $GST_PLUGINS_BAD_VERSION_REQUIRED], [HAVE_GSTGL=1], [HAVE_GSTGL=0]) @@ -338,13 +341,6 @@ if test $HAVE_XRENDER -eq 1; then fi dnl OpenGL -enable_opengl="no" -if test "x$enable_glx" = "xyes"; then - enable_opengl="yes" -fi -if test "x$enable_egl" = "xyes"; then - enable_opengl="yes" -fi GLES_VERSION_MASK=0 HAVE_GL=0 |