1) cleanup for VA_FOOL

[profile/ivi/libva.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index ce0e8ea..74c08f8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -22,14 +22,14 @@
 
 # libva package version number, (as distinct from shared library version)
 m4_define([libva_major_version], [0])
-m4_define([libva_minor_version], [31])
-m4_define([libva_micro_version], [1])
+m4_define([libva_minor_version], [32])
+m4_define([libva_micro_version], [0])
 
 m4_define([libva_version],
           [libva_major_version.libva_minor_version.libva_micro_version])
 
 # if the library source code has changed, increment revision
-m4_define([libva_lt_revision], [6])
+m4_define([libva_lt_revision], [8])
 # if any interface was added/removed/changed, then inc current, reset revision
 m4_define([libva_lt_current], [1])
 # if any interface was added since last public release, then increment age
@@ -104,9 +104,9 @@ PKG_CHECK_MODULES([DRM], [libdrm])
 PKG_CHECK_MODULES(GEN4ASM, [intel-gen4asm >= 1.1], [gen4asm=yes], [gen4asm=no])
 AM_CONDITIONAL(HAVE_GEN4ASM, test x$gen4asm = xyes)
 
-# Check for libdrm >= 2.4.21 (needed for i965_drv_video.so)
-if test x$enable_i965_driver = xyes && ! $PKG_CONFIG --atleast-version=2.4.21 libdrm; then
-    AC_MSG_WARN([libdrm < 2.4.21 found, disabling build of i965 video driver])
+# Check for libdrm >= 2.4.23 (needed for i965_drv_video.so)
+if test x$enable_i965_driver = xyes && ! $PKG_CONFIG --atleast-version=2.4.23 libdrm; then
+    AC_MSG_WARN([libdrm < 2.4.23 found, disabling build of i965 video driver])
     enable_i965_driver=no
 fi
 AM_CONDITIONAL(BUILD_I965_DRIVER, test x$enable_i965_driver = xyes)
@@ -135,6 +135,13 @@ AC_SUBST(GL_DEPS_CFLAGS)
 AC_SUBST(GL_DEPS_LIBS)
 AM_CONDITIONAL(USE_GLX, test "$USE_GLX" = "yes")
 
+# Make sure drivers use the correctly versioned __vaDriverInit*() function name
+VA_DRIVER_INIT_FUNC="__vaDriverInit_${LIBVA_MAJOR_VERSION}_${LIBVA_MINOR_VERSION}"
+AC_DEFINE_UNQUOTED([VA_DRIVER_INIT_FUNC], [$VA_DRIVER_INIT_FUNC],
+    [Defined to the versioned __vaDriverInit function name])
+AC_DEFINE_UNQUOTED([VA_DRIVER_INIT_FUNC_S], ["$VA_DRIVER_INIT_FUNC"],
+    [Defined to the versioned __vaDriverInit function name (in string form)])
+
 # We only need the headers, we don't link against the DRM libraries
 LIBVA_CFLAGS="$DRM_CFLAGS"
 AC_SUBST(LIBVA_CFLAGS)
@@ -155,6 +162,7 @@ AC_OUTPUT([
        va/va_version.h
        va/x11/Makefile
        va/glx/Makefile
+       va/egl/Makefile
        va/dummy/Makefile
        dummy_drv_video/Makefile
        i965_drv_video/Makefile
@@ -170,9 +178,11 @@ AC_OUTPUT([
        test/decode/Makefile
        test/putsurface/Makefile
        test/encode/Makefile
+       test/vainfo/Makefile
        libva.pc
        libva-x11.pc
        libva-glx.pc
+       libva-egl.pc
        libva-tpi.pc
 ])