save

Signed-off-by: Austin Yuan <shengquan.yuan@gmail.com>

diff --git a/configure.ac b/configure.ac
index 9bb2db8..a6d01ee 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -66,6 +66,11 @@ AC_ARG_ENABLE(dummy-driver,
               [], [enable_dummy_driver=yes])
 AM_CONDITIONAL(BUILD_DUMMY_DRIVER, test x$enable_dummy_driver = xyes)
 
+AC_ARG_ENABLE(dummy-backend,
+              [AC_HELP_STRING([--enable-dummy-backend],
+                              [build dummy libva backend])],
+              [], [enable_dummy_backend=no])
+
 AC_ARG_ENABLE(i965-driver,
               [AC_HELP_STRING([--enable-i965-driver],
                               [build i965 video driver])],
@@ -100,6 +105,14 @@ if test x$enable_i965_driver = xyes && ! $PKG_CONFIG --atleast-version=2.4 libdr
 fi
 AM_CONDITIONAL(BUILD_I965_DRIVER, test x$enable_i965_driver = xyes)
 
+if test x$enable_dummy_backend = xyes; then
+    PKG_CHECK_MODULES([UDEV], [libudev], [libudev=yes], [libudev=no])
+fi
+if test x$libudev = xno; then
+   enable_dummy_backend=no
+fi
+AM_CONDITIONAL(BUILD_DUMMY_BACKEND, test x$enable_dummy_backend = xyes)
+
 # We only need the headers, we don't link against the DRM libraries
 LIBVA_CFLAGS="$DRM_CFLAGS"
 AC_SUBST(LIBVA_CFLAGS)

diff --git a/va/Makefile.am b/va/Makefile.am
index 1e14c1a..508cf7e 100644 (file)
--- a/va/Makefile.am
+++ b/va/Makefile.am
@@ -29,8 +29,7 @@ LDADD = \
 
 lib_LTLIBRARIES = \
        libva.la \
-       libva-x11.la \
-       libva-dummy.la
+       libva-x11.la
 
 libva_ladir = $(libdir)
 libva_la_LDFLAGS = $(LDADD) -no-undefined
@@ -41,12 +40,19 @@ libva_x11_la_LIBADD  = $(libvacorelib) x11/libva_x11.la $(LIBVA_LIBS) $(X11_LIBS
 libva_x11_la_LDFLAGS = $(LDADD)
 libva_x11_la_DEPENDENCIES = $(libvacorelib) x11/libva_x11.la
 
+
+SUBDIRS = x11 
+
+if BUILD_DUMMY_BACKEND
+lib_LTLIBRARIES += libva-dummy.la
+
 libva_dummy_la_SOURCES = 
-libva_dummy_la_LIBADD  = $(libvacorelib) android/libva_dummy.la $(LIBVA_LIBS) $(DRM_LIBS)
+libva_dummy_la_LIBADD  = $(libvacorelib) dummy/libva_dummy.la $(LIBVA_LIBS) $(DRM_LIBS)
 libva_dummy_la_LDFLAGS = $(LDADD)
-libva_dummy_la_DEPENDENCIES = $(libvacorelib) android/libva_dummy.la
+libva_dummy_la_DEPENDENCIES = $(libvacorelib) dummy/libva_dummy.la
 
-SUBDIRS = x11 android
+SUBDIRS += dummy
+endif
 
 libva_la_SOURCES = va.c va_trace.c
 

diff --git a/va/dummy b/va/dummy
new file mode 120000 (symlink)
index 0000000..1fd74d1
--- /dev/null
+++ b/va/dummy
@@ -0,0 +1 @@
+android
\ No newline at end of file