diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2013-07-22 22:03:17 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2013-07-22 22:03:17 +0100 |
| commit | a8c7834e1d4d31097d0dd2c931d7662b5314a9b2 (patch) | |
| tree | 0be104cd7ce3322bb3eff916b3f2d252eb5b141b /configure.ac | |
| parent | 8d94f030c6af64f82d495a835a3b962480c068e7 (diff) | |
configure: Supply a default value for dridriverdir
Rather than fail to load DRI2 if not found.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 2b6ce916..e1c749b6 100644 --- a/configure.ac +++ b/configure.ac @@ -426,11 +426,10 @@ DRI2=no if test "x$enable_dri" != "xno"; then PKG_CHECK_MODULES(DRI2, [dri2proto >= 2.6], DRI2=yes, DRI2=no) dridriverdir=`$PKG_CONFIG --variable=dridriverdir dri` - if test "x$dridriverdir" != "x"; then - AC_DEFINE_DIR(DRI_DRIVER_PATH, dridriverdir, [Default DRI driver path]) - else - DRI2=no + if test "x$dridriverdir" = "x"; then + dridriverdir="$libdir/dri" fi + AC_DEFINE_DIR(DRI_DRIVER_PATH, dridriverdir, [Default DRI driver path]) if test "x$DRI2" != "xno"; then save_CFLAGS=$CFLAGS CFLAGS="$XORG_CFLAGS $DRM_CFLAGS $DRI_CFLAGS $DRI2_CFLAGS" |