Merge branch 'master' into libkms-master
authorJakob Bornecrantz <jakob@vmware.com>
Tue, 5 Jan 2010 19:59:24 +0000 (20:59 +0100)
committerJakob Bornecrantz <jakob@vmware.com>
Tue, 5 Jan 2010 19:59:24 +0000 (20:59 +0100)
Conflicts:
configure.ac

1  2 
configure.ac

diff --combined configure.ac
index d4b7d78b6f6bd6de7817511753970aefb9ea4a10,a9354c90121d856b756d4ec501c7a29a14e14f9c..b95731452deee756a376c07f0c6d400709f985df
@@@ -19,7 -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])
@@@ -43,16 -43,16 +43,21 @@@ AC_ARG_ENABLE(udev,        AS_HELP_STRING([--e
                                [Enable support for using udev instead of mknod (default: disabled)]),
                                [UDEV=$enableval], [UDEV=no])
  
 +AC_ARG_ENABLE(libkms,
 +            AS_HELP_STRING([--enable-libkms],
 +            [Enable KMS mm abstraction library (default: disabled)]),
 +            [LIBKMS=$enableval], [LIBKMS=no])
 +
  AC_ARG_ENABLE(intel,
              AS_HELP_STRING([--disable-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)]),
@@@ -139,8 -139,8 +144,10 @@@ if test "x$UDEV" = xyes; the
        AC_DEFINE(UDEV, 1, [Have UDEV support])
  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])
@@@ -206,8 -206,6 +213,8 @@@ AC_SUBST(kernel_source
  AC_SUBST(WARN_CFLAGS)
  AC_OUTPUT([
        Makefile
 +      libkms/Makefile
 +      libkms/libkms.pc
        intel/Makefile
        intel/libdrm_intel.pc
        radeon/Makefile
  echo ""
  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 ""