diff options
author | Christian König <[email protected]> | 2011-05-21 16:43:12 +0200 |
---|---|---|
committer | Christian König <[email protected]> | 2011-05-21 16:43:12 +0200 |
commit | aa63ebc48a2ee1ee9afbf2112d4d25e8a9a8d1e8 (patch) | |
tree | c97d505614f1fd84d498484a45156e0064daf649 /configure.ac | |
parent | 120b55a96e30f1f74ba3448665cef3d724fed647 (diff) | |
parent | 3c5e74186244f2d77cc711d2b487283459ed06ad (diff) |
Merge remote-tracking branch 'origin/master' into pipe-video
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index e7eca3ce453..03f26847c19 100644 --- a/configure.ac +++ b/configure.ac @@ -39,6 +39,12 @@ if test "x$MKDEP" = "x"; then AC_MSG_ERROR([makedepend is required to build Mesa]) fi +AC_PATH_PROG([FLEX], [flex]) +test "x$FLEX" = "x" && AC_MSG_ERROR([flex is needed to build Mesa]) + +AC_PATH_PROG([BISON], [bison]) +test "x$BISON" = "x" && AC_MSG_ERROR([bison is needed to build Mesa]) + dnl Our fallback install-sh is a symlink to minstall. Use the existing dnl configuration in that case. AC_PROG_INSTALL @@ -1186,7 +1192,7 @@ if test "x$enable_egl" = xno; then fi if test "x$enable_egl" = xyes; then SRC_DIRS="$SRC_DIRS egl" - EGL_LIB_DEPS="$DLOPEN_LIBS -lpthread" + EGL_LIB_DEPS="$DLOPEN_LIBS $SELINUX_LIBS -lpthread" EGL_DRIVERS_DIRS="" if test "$enable_static" != yes; then # build egl_glx when libGL is built @@ -1602,7 +1608,7 @@ x*yes*) esac if test "x$enable_openvg" = xyes; then EGL_CLIENT_APIS="$EGL_CLIENT_APIS "'$(VG_LIB)' - VG_LIB_DEPS="$VG_LIB_DEPS -lpthread" + VG_LIB_DEPS="$VG_LIB_DEPS $SELINUX_LIBS -lpthread" fi AC_SUBST([VG_LIB_DEPS]) |