diff options
| author | Chia-I Wu <[email protected]> | 2011-07-02 09:49:17 +0900 |
|---|---|---|
| committer | Chia-I Wu <[email protected]> | 2011-07-02 10:15:23 +0900 |
| commit | 8123934d5a6a4a25a30dcd77e9f0f0d7b7b74a74 (patch) | |
| tree | 442c8d5283b8e1ee95696f3d4657acd14584de0f | |
| parent | b11566260778bb35f4f6e9dc9bc3470ee99b3557 (diff) | |
autoconf: swrast does not require libdrm
This fixes
$ ./configure --disable-driglx-direct \
--with-dri-drivers=swrast \
--with-gallium-drivers=
| -rw-r--r-- | configure.ac | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 6568472bcfa..5a54370b51d 100644 --- a/configure.ac +++ b/configure.ac @@ -819,11 +819,10 @@ if test "x$enable_dri" = xyes; 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]) + # not a hard requirement as swrast does not depend on it + if test "x$have_libdrm" = xyes; then + DRI_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED" fi - - DRI_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED" fi dnl @@ -1206,6 +1205,13 @@ if test "x$enable_dri" = xyes; then [AC_MSG_ERROR([Expat required for DRI.])]) fi + # libdrm is required for all except swrast + if test -n "$DRI_DIRS" -a x"$DRI_DIRS" != xswrast; then + if test "x$have_libdrm" != xyes; then + AC_MSG_ERROR([DRI drivers requires libdrm >= $LIBDRM_REQUIRED]) + fi + fi + # put all the necessary libs together, including possibly libdricore DRI_LIB_DEPS="$DRI_LIB_DEPS $SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIB -lm -lpthread $DLOPEN_LIBS" fi @@ -1793,6 +1799,9 @@ dnl Gallium helper functions dnl gallium_check_st() { if test "x$HAVE_ST_DRI" = xyes || test "x$HAVE_ST_XORG" = xyes; then + if test "x$have_libdrm" != xyes; then + AC_MSG_ERROR([DRI or Xorg DDX requires libdrm >= $LIBDRM_REQUIRED]) + fi GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS $1" fi if test "x$HAVE_ST_DRI" = xyes && test "x$2" != x; then |