fix the check for EGL
authorXiang, Haihao <haihao.xiang@intel.com>
Fri, 13 Jan 2012 07:00:45 +0000 (15:00 +0800)
committerXiang, Haihao <haihao.xiang@intel.com>
Fri, 13 Jan 2012 08:22:02 +0000 (16:22 +0800)
It is possible that EGL/egl.h doesn't exist however EGL library is
available. We don't want to build EGL related stuff in this case

Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
configure.ac

index 8917b6a..ac91628 100644 (file)
@@ -197,7 +197,10 @@ USE_EGL="no"
 EGL_DEPS_CFLAGS=""
 EGL_DEPS_LIBS=""
 if test "$enable_egl" = "yes"; then
-    AC_CHECK_HEADERS([EGL/egl.h])
+    AC_CHECK_HEADERS([EGL/egl.h], [USE_EGL="yes"])
+fi
+
+if test "x$USE_EGL" = "xyes"; then
     AC_CHECK_LIB(EGL, eglGetDisplay, [
         USE_EGL="yes"
         EGL_DEPS_LIBS="-lEGL"
@@ -205,10 +208,11 @@ if test "$enable_egl" = "yes"; then
 
     PKG_CHECK_MODULES([GLESv1_CM], [glesv1_cm], [libglesv1_cm=yes], [libglesv1_cm=no])
 fi
+
 AC_SUBST(EGL_DEPS_CFLAGS)
 AC_SUBST(EGL_DEPS_LIBS)
 AM_CONDITIONAL(USE_EGL, test "$USE_EGL" = "yes")
-AM_CONDITIONAL(BUILD_EGL_TEST, [test "x$USE_EGL" = "xyes" && test "x$libglesv1_cm" = "xyes"])
+AM_CONDITIONAL(BUILD_EGL_TEST, [test "x$libglesv1_cm" = "xyes"])
 
 # We only need the headers, we don't link against the DRM libraries
 LIBVA_CFLAGS="$DRM_CFLAGS"