Drop libva_display. Explicitly use libva-x11.

diff --git a/Makefile.am b/Makefile.am
index f2defab..07385e6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,17 +30,12 @@ if BUILD_I965_DRIVER
 SUBDIRS += i965_drv_video
 endif
 
-pcfiles = \
-       libva.pc \
-       libva-$(LIBVA_DISPLAY).pc
-
-# libva-<display>.pc - for display-specific dependencies
-libva-$(LIBVA_DISPLAY).pc: libva_display.pc
-       @cp $< $@
+pcfiles = libva.pc
+pcfiles += libva-x11.pc
 
 pkgconfigdir = @pkgconfigdir@
 pkgconfig_DATA = $(pcfiles)
 
-EXTRA_DIST = libva.pc.in libva_display.pc.in
+EXTRA_DIST = libva.pc.in libva-x11.pc.in
 
 CLEANFILES = $(pcfiles)

diff --git a/configure.ac b/configure.ac
index 4be2b56..c3aba90 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -113,7 +113,6 @@ libvacorelib=libva.la
 libvabackendlib=libva-$LIBVA_DISPLAY.la
 AC_SUBST([libvacorelib])
 AC_SUBST([libvabackendlib])
-AC_SUBST(LIBVA_DISPLAY)
 
 AC_OUTPUT([
        Makefile
@@ -128,6 +127,6 @@ AC_OUTPUT([
        i965_drv_video/shaders/render/Makefile
        test/Makefile
        libva.pc
-       libva_display.pc
+       libva-x11.pc
 ])
 

diff --git a/libva_display.pc.in b/libva_display.pc.in
index c9c5cd6..75e4f0b 100644 (file)
--- a/libva_display.pc.in
+++ b/libva_display.pc.in
@@ -2,7 +2,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
-display=@LIBVA_DISPLAY@
+display=x11
 
 Name: libva-${display}
 Description: Userspace Video Acceleration (VA) ${display} interface