diff options
| author | Jakob Bornecrantz <jakob@vmware.com> | 2010-01-05 20:59:24 +0100 |
|---|---|---|
| committer | Jakob Bornecrantz <jakob@vmware.com> | 2010-01-05 20:59:24 +0100 |
| commit | 2f7f7ceccab4176217c399502b3ff95df1517627 (patch) | |
| tree | 1a9f6e6c8ebcf5b13d9877685fce91b87a971ed2 /configure.ac | |
| parent | d6059c3dd1300662e941ccd5e55649534fbb9a63 (diff) | |
| parent | 6d3b8bbddd44b42d89adb1aafb7645e7f802673a (diff) | |
Merge branch 'master' into libkms-master
Conflicts:
configure.ac
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index d4b7d78b..b9573145 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. AC_PREREQ(2.60) -AC_INIT([libdrm], 2.4.16, [dri-devel@lists.sourceforge.net], libdrm) +AC_INIT([libdrm], 2.4.17, [dri-devel@lists.sourceforge.net], libdrm) AC_USE_SYSTEM_EXTENSIONS AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([dist-bzip2]) @@ -53,6 +53,11 @@ AC_ARG_ENABLE(intel, [Enable support for intel's KMS API (default: auto)]), [INTEL=$enableval], [INTEL=auto]) +AC_ARG_ENABLE(vmwgfx-experimental-api, + AS_HELP_STRING([--enable-vmwgfx-experimental-api], + [Install vmwgfx's experimental kernel API header (default: disabled)]), + [VMWGFX=$enableval], [VMWGFX=no]) + AC_ARG_ENABLE(nouveau-experimental-api, AS_HELP_STRING([--enable-nouveau-experimental-api], [Enable support for nouveau's experimental API (default: disabled)]), @@ -141,6 +146,8 @@ fi AM_CONDITIONAL(HAVE_LIBKMS, [test "x$LIBKMS" = xyes]) +AM_CONDITIONAL(HAVE_VMWGFX, [test "x$VMWGFX" = xyes]) + AM_CONDITIONAL(HAVE_NOUVEAU, [test "x$NOUVEAU" = xyes]) AM_CONDITIONAL(HAVE_RADEON, [test "x$RADEON" = xyes]) @@ -226,6 +233,7 @@ echo "$PACKAGE_STRING will be compiled with:" echo "" echo " libkms $LIBKMS" echo " Intel API $INTEL" +echo " vmwgfx API $VMWGFX" echo " Radeon API $RADEON" echo " Nouveau API $NOUVEAU" echo "" |