diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2005-08-21 19:00:39 +0000 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2005-08-21 19:00:39 +0000 |
| commit | b96b4242f98f7933fab7c1ffe95d04a8b602969e (patch) | |
| tree | f032e24954402a15a18b59f27d7f24f39ed7ba54 | |
| parent | db7dde6e7db534e47f43a0b371f5474d24fcaf0f (diff) | |
Fix DRI header checks, bump to 1.1.2.2.
| -rw-r--r-- | configure.ac | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index e391316..77f2f49 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-mga], - 1.1.2.1, + 1.1.2.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-mga) @@ -59,7 +59,7 @@ sdkdir=$(pkg-config --variable=sdkdir xorg-server) # Checks for header files. AC_HEADER_STDC -if test "$DRI" != no; then +if test "x$DRI" != xno; then AC_CHECK_FILE([${sdkdir}/dri.h], [have_dri_h="yes"], [have_dri_h="no"]) AC_CHECK_FILE([${sdkdir}/sarea.h], @@ -69,10 +69,10 @@ if test "$DRI" != no; then fi AC_MSG_CHECKING([whether to include DRI support]) -if test x$DRI = xauto; then - if test "$ac_cv_header_dri_h" = yes -a \ - "$ac_cv_header_sarea_h" = yes -a \ - "$ac_cv_header_dristruct_h" = yes; then +if test "x$DRI" = xauto; then + if test "x$have_dri_h" = xyes && \ + test "x$have_sarea_h" = xyes && \ + test "x$have_dristruct_h" = xyes; then DRI="yes" else DRI="no" @@ -80,8 +80,8 @@ if test x$DRI = xauto; then fi AC_MSG_RESULT([$DRI]) -AM_CONDITIONAL(DRI, test x$DRI = xyes) -if test "$DRI" = yes; then +AM_CONDITIONAL(DRI, test "x$DRI" = xyes) +if test "x$DRI" = xyes; then PKG_CHECK_MODULES(DRI, [libdrm xf86driproto]) AC_DEFINE(XF86DRI,1,[Enable DRI driver support]) AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support]) |