diff options
| author | Xavier Bachelot <xavier@bachelot.org> | 2012-07-30 21:05:23 +0200 |
|---|---|---|
| committer | Xavier Bachelot <xavier@bachelot.org> | 2012-07-30 21:11:01 +0200 |
| commit | 592fbd189bd0052b542eb6a351690042bcbee39e (patch) | |
| tree | 675fca2283c08f6e5ef7b1a86bc2043ae705ecb8 | |
| parent | f5c1627ff0cbac097173e509f96f62b6021397ca (diff) | |
Remove --(enable|disable)-dri configure option, it depends on whether the X server was built with or w/o DRI support.
| -rw-r--r-- | configure.ac | 45 |
1 files changed, 18 insertions, 27 deletions
diff --git a/configure.ac b/configure.ac index 9f4cf3b..f98d13a 100644 --- a/configure.ac +++ b/configure.ac @@ -64,11 +64,6 @@ AC_ARG_WITH(xorg-module-dir, [moduledir="$withval"], [moduledir="$libdir/xorg/modules"]) -AC_ARG_ENABLE(dri, AC_HELP_STRING([--disable-dri], - [Disable DRI support [[default=auto]]]), - [DRI="$enableval"], - [DRI=auto]) - AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [Enable debugging support [[default=no]]]), [DEBUG="$enableval"], @@ -115,33 +110,29 @@ if test x$XSERVER_LIBPCIACCESS = xyes; then PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0]) fi -if test "$DRI" != no; then - PKG_CHECK_MODULES(DRI, [libdrm >= 2.0 xf86driproto]) - save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$XORG_CFLAGS $DRI_CFLAGS" - AC_CHECK_HEADER([dri.h], - [have_dri_h="yes"], [have_dri_h="no"],[-]) - AC_CHECK_HEADER([sarea.h], - [have_sarea_h="yes"], [have_sarea_h="no"],[-]) +PKG_CHECK_MODULES(DRI, [libdrm >= 2.0 xf86driproto]) +save_CPPFLAGS="$CPPFLAGS" +CPPFLAGS="$XORG_CFLAGS $DRI_CFLAGS" +AC_CHECK_HEADER([dri.h], + [have_dri_h="yes"], [have_dri_h="no"],[-]) +AC_CHECK_HEADER([sarea.h], + [have_sarea_h="yes"], [have_sarea_h="no"],[-]) AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[ #include <xorg-server.h> #include <dristruct.h> - ]])], - [have_dristruct_h="yes"], [have_dristruct_h="no"],[-]) - AC_CHECK_HEADER([damage.h], - [have_damage_h="yes"], [have_damage_h="no"],[-]) - CPPFLAGS="$save_CPPFLAGS" -fi + ]])], + [have_dristruct_h="yes"], [have_dristruct_h="no"],[-]) +AC_CHECK_HEADER([damage.h], + [have_damage_h="yes"], [have_damage_h="no"],[-]) +CPPFLAGS="$save_CPPFLAGS" AC_MSG_CHECKING([whether to include DRI support]) -if test x$DRI = xauto; then - if test "$have_dri_h" = yes -a \ - "$have_sarea_h" = yes -a \ - "$have_dristruct_h" = yes; then - DRI="yes" - else - DRI="no" - fi +if test "$have_dri_h" = yes -a \ + "$have_sarea_h" = yes -a \ + "$have_dristruct_h" = yes; then + DRI="yes" +else + DRI="no" fi AC_MSG_RESULT([$DRI]) |