diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2013-10-12 00:19:55 +0100 |
|---|---|---|
| committer | Andreas Boll <andreas.boll.dev@gmail.com> | 2013-10-15 21:54:20 +0200 |
| commit | b1e7cd037e42255a249391547ce24cf4a3faba25 (patch) | |
| tree | b6d7db2e39d852b912f85858800ceec2c21abcd8 | |
| parent | cd3fa176a8dbae3e14c9426e7fbe13baa6e84256 (diff) | |
configure.ac: drop obsolete variable HAVE_COMMON_DRI
The original intent of the variable was to prevent adding
libdrm dependency for non drm drivers (swrast). This is
already handled with __NOT_HAVE_DRM_H, and with the recent
merge of the dri_util and drisw_util code this variable has
started causing build issues.
Eg. the following will fail
$ ./autogen.sh --with-dri-drivers=swrast --with-gallium-drivers=
$ make
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Andreas Boll <andreas.boll.dev@gmail.com>
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/Makefile.am | 2 |
2 files changed, 0 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 309b49385ba..08344c501cc 100644 --- a/configure.ac +++ b/configure.ac @@ -1025,8 +1025,6 @@ if test "x$enable_dri" = xyes; then if test "x$have_libdrm" != xyes; then AC_MSG_ERROR([DRI drivers requires libdrm >= $LIBDRM_REQUIRED]) fi - # ... and build dricommon - HAVE_COMMON_DRI=yes fi # put all the necessary libs together @@ -1669,7 +1667,6 @@ gallium_check_st() { fi if test "x$enable_dri" = xyes && test "x$2" != x; then GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $2" - HAVE_COMMON_DRI=yes fi if test "x$enable_xorg" = xyes && test "x$3" != x; then GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $3" @@ -1812,7 +1809,6 @@ if test "x$with_gallium_drivers" != x; then if test "x$enable_dri" = xyes; then GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS dri-swrast" - HAVE_COMMON_DRI=yes fi if test "x$enable_vdpau" = xyes; then GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS vdpau-softpipe" @@ -1916,7 +1912,6 @@ AM_CONDITIONAL(HAVE_NOUVEAU_DRI, test x$HAVE_NOUVEAU_DRI = xyes) AM_CONDITIONAL(HAVE_R200_DRI, test x$HAVE_R200_DRI = xyes) AM_CONDITIONAL(HAVE_RADEON_DRI, test x$HAVE_RADEON_DRI = xyes) AM_CONDITIONAL(HAVE_SWRAST_DRI, test x$HAVE_SWRAST_DRI = xyes) -AM_CONDITIONAL(HAVE_COMMON_DRI, test x$HAVE_COMMON_DRI = xyes) AM_CONDITIONAL(NEED_RADEON_DRM_WINSYS, test "x$NEED_NONNULL_WINSYS" = xyes -a \ "x$HAVE_GALLIUM_R300" = xyes -o \ diff --git a/src/mesa/drivers/dri/Makefile.am b/src/mesa/drivers/dri/Makefile.am index 48d36858bb7..7fa0ad73d01 100644 --- a/src/mesa/drivers/dri/Makefile.am +++ b/src/mesa/drivers/dri/Makefile.am @@ -1,8 +1,6 @@ SUBDIRS = -if HAVE_COMMON_DRI SUBDIRS+=common -endif if HAVE_I915_DRI SUBDIRS+=i915 |