OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

autoconf: fix --disable-glx

Browse Source 
libdrm is used in multiple places.  Always check for it and set
have_libdrm.  Each user can then check the variable.

This is useful when only EGL and DRI drivers are needed.
This commit is contained in:
Chia-I Wu
2011-06-27 09:19:02 +09:00
parent 5029ea4d9c
commit 94ec5fd1b3
1 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
configure.ac
View File

@@ -725,12 +725,6 @@ if test "x$enable_glx" = xno; then
enable_xlib_glx=no enable_xlib_glx=no
fi fi
if test "x$enable_dri" = xyes; then
if test "x$enable_glx" = xno -o "x$enable_xlib_glx" = xyes; then
AC_MSG_ERROR([cannot build DRI drivers without DRI-based GLX yet])
fi
fi
dnl dnl
dnl Driver specific build directories dnl Driver specific build directories
dnl dnl
@@ -815,6 +809,23 @@ AC_SUBST([GALLIUM_DRIVERS_DIRS])
AC_SUBST([GALLIUM_STATE_TRACKERS_DIRS]) AC_SUBST([GALLIUM_STATE_TRACKERS_DIRS])
AC_SUBST([MESA_LLVM]) AC_SUBST([MESA_LLVM])
# Check for libdrm
PKG_CHECK_MODULES([LIBDRM], [libdrm >= $LIBDRM_REQUIRED],
[have_libdrm=yes], [have_libdrm=no])
if test "x$enable_dri" = xyes; then
# DRI must be shared, I think
if test "$enable_static" = yes; then
AC_MSG_ERROR([Can't use static libraries for DRI drivers])
fi
if test "x$have_libdrm" != xyes; then
AC_MSG_ERROR([DRI drivers require libdrm >= $LIBDRM_REQUIRED])
fi
DRI_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED"
fi
dnl dnl
dnl Find out if X is available. The variable have_x is set if libX11 is dnl Find out if X is available. The variable have_x is set if libX11 is
dnl found to mimic AC_PATH_XTRA. dnl found to mimic AC_PATH_XTRA.
@@ -919,8 +930,9 @@ xyesno)
PKG_CHECK_MODULES([GLPROTO], [glproto >= $GLPROTO_REQUIRED]) PKG_CHECK_MODULES([GLPROTO], [glproto >= $GLPROTO_REQUIRED])
GL_PC_REQ_PRIV="glproto >= $GLPROTO_REQUIRED" GL_PC_REQ_PRIV="glproto >= $GLPROTO_REQUIRED"
if test x"$driglx_direct" = xyes; then if test x"$driglx_direct" = xyes; then
# Check for libdrm if test "x$have_libdrm" != xyes; then
PKG_CHECK_MODULES([LIBDRM], [libdrm >= $LIBDRM_REQUIRED]) AC_MSG_ERROR([Direct rendering requires libdrm >= $LIBDRM_REQUIRED])
fi
PKG_CHECK_MODULES([DRI2PROTO], [dri2proto >= $DRI2PROTO_REQUIRED]) PKG_CHECK_MODULES([DRI2PROTO], [dri2proto >= $DRI2PROTO_REQUIRED])
GL_PC_REQ_PRIV="$GL_PC_REQ_PRIV libdrm >= $LIBDRM_REQUIRED dri2proto >= $DRI2PROTO_REQUIRED" GL_PC_REQ_PRIV="$GL_PC_REQ_PRIV libdrm >= $LIBDRM_REQUIRED dri2proto >= $DRI2PROTO_REQUIRED"
fi fi
@@ -970,14 +982,6 @@ xyesno)
;; ;;
esac esac
if test "x$enable_dri" = xyes; then
# DRI must be shared, I think
if test "$enable_static" = yes; then
AC_MSG_ERROR([Can't use static libraries for DRI drivers])
fi
fi
DRI_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED"
GLESv1_CM_LIB_DEPS="$LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS" GLESv1_CM_LIB_DEPS="$LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS"
GLESv1_CM_PC_LIB_PRIV="-lm -lpthread $DLOPEN_LIBS" GLESv1_CM_PC_LIB_PRIV="-lm -lpthread $DLOPEN_LIBS"
GLESv2_LIB_DEPS="$LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS" GLESv2_LIB_DEPS="$LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS"
@@ -1364,6 +1368,9 @@ if test "x$enable_gallium_egl" = xyes; then
if test "x$enable_egl" = xno; then if test "x$enable_egl" = xno; then
AC_MSG_ERROR([cannot enable egl_gallium without EGL]) AC_MSG_ERROR([cannot enable egl_gallium without EGL])
fi fi
if test "x$have_libdrm" != xyes; then
AC_MSG_ERROR([egl_gallium requires libdrm >= $LIBDRM_REQUIRED])
fi
GALLIUM_STATE_TRACKERS_DIRS="egl $GALLIUM_STATE_TRACKERS_DIRS" GALLIUM_STATE_TRACKERS_DIRS="egl $GALLIUM_STATE_TRACKERS_DIRS"
GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS egl-static" GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS egl-static"