tests/pm_rpm: Convert to new optparsing

[platform/upstream/intel-gpu-tools.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 37f434e..301ea11 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ([2.60])
 AC_INIT([intel-gpu-tools],
-       [1.5],
+       [1.7],
        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
        [intel-gpu-tools])
 
@@ -42,6 +42,15 @@ AC_PROG_CC
 AM_PROG_LEX
 AC_PROG_YACC
 
+# check for gtk-doc
+m4_ifdef([GTK_DOC_CHECK], [
+GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
+],[
+AM_CONDITIONAL([ENABLE_GTK_DOC], false)
+enable_gtk_doc=no
+])
+
+
 # Checks for functions, headers, structures, etc.
 AC_HEADER_STDC
 AC_CHECK_HEADERS([termios.h])
@@ -71,21 +80,19 @@ if test "x$GCC" = "xyes"; then
 fi
 AC_SUBST(ASSEMBLER_WARN_CFLAGS)
 
-PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.47 libdrm])
+PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.52 libdrm])
 PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
-PKG_CHECK_MODULES(OVERLAY_XVLIB, [xv x11 xext], enable_overlay_xvlib=yes, enable_overlay_xvlib=no)
-PKG_CHECK_MODULES(OVERLAY_XLIB, [cairo-xlib], enable_overlay_xlib=yes, enable_overlay_xlib=no)
+PKG_CHECK_MODULES(OVERLAY_XVLIB, [xv x11 xext dri2proto >= 2.6], enable_overlay_xvlib=yes, enable_overlay_xvlib=no)
+PKG_CHECK_MODULES(OVERLAY_XLIB, [cairo-xlib dri2proto >= 2.6], enable_overlay_xlib=yes, enable_overlay_xlib=no)
 
 AM_CONDITIONAL(BUILD_OVERLAY_XVLIB, [test "x$enable_overlay_xvlib" = xyes])
 AM_CONDITIONAL(BUILD_OVERLAY_XLIB, [test "x$enable_overlay_xlib" = xyes])
 AM_CONDITIONAL(BUILD_OVERLAY, [test "x$enable_overlay_xlib" = xyes -o "x$enable_overlay_xvlib"])
 if test x$enable_overlay_xvlib = xyes; then
        AC_DEFINE(HAVE_OVERLAY_XVLIB, 1, [Enable XV backend])
-       PKG_CHECK_MODULES(DRI2PROTO, [dri2proto >= 2.6])
 fi
 if test x$enable_overlay_xlib = xyes; then
        AC_DEFINE(HAVE_OVERLAY_XLIB, 1, [Enable X backend])
-       PKG_CHECK_MODULES(DRI2PROTO, [dri2proto >= 2.6])
 fi
 PKG_CHECK_MODULES(XRANDR, xrandr >= 1.3, AC_DEFINE(HAVE_XRANDR, 1, [Have libXrandr]), [have_xrandr=no])
 
@@ -123,7 +130,13 @@ AM_CONDITIONAL(HAVE_NOUVEAU, [test "x$NOUVEAU" = xyes])
 AC_ARG_ENABLE(dumper,
              AS_HELP_STRING([--disable-dumper],
                             [Disable the python based register dumper (default: enabled)]),
-                            [DUMPER=$enableval], [DUMPER=yes])
+                            [DUMPER=$enableval], [DUMPER=auto])
+if test "x$DUMPER" = xauto; then
+       # AX_PYTHON_DEVEL/AX_SWIG_PYTHON are not super friendly and don't
+       # easily allow us to introspect the result of their checks. So if we
+       # find SWING on the system, that's enough to try compiling the dumper.
+       AX_PKG_SWIG(2.0.0, [DUMPER=yes], [DUMPER=no])
+fi
 if test "x$DUMPER" == xyes; then
        AC_DEFINE(HAVE_DUMPER, 1, [Have dumper support])
        # SWIG configuration
@@ -142,6 +155,7 @@ AC_ARG_ENABLE(shader-debugger, AS_HELP_STRING([--enable-shader-debugger],
 if test "x$BUILD_SHADER_DEBUGGER" != xno; then
        # Check that the assembler is built
        if test "x$enable_assembler" = xno; then
+               BUILD_SHADER_DEBUGGER=no
                if test "x$BUILD_SHADER_DEBUGGER" = xyes; then
                        AC_MSG_ERROR([Shader debugger requested, but assembler not enabled.])
                fi
@@ -170,8 +184,6 @@ fi
 AM_CONDITIONAL(BUILD_SHADER_DEBUGGER, [test "x$BUILD_SHADER_DEBUGGER" != xno])
 AS_IF([test "x$BUILD_SHADER_DEBUGGER" != xno],
       [enable_debugger=yes], [enable_debugger=no])
-AS_IF([test "x$enable_assembler" = xno],
-      [enable_debugger=no], 1)
 
 # -----------------------------------------------------------------------------
 
@@ -189,16 +201,27 @@ fi
 AM_CONDITIONAL(BUILD_TESTS, [test "x$BUILD_TESTS" = xyes])
 AC_DEFINE_UNQUOTED(TARGET_CPU_PLATFORM, ["$host_cpu"], [Target platform])
 
+files="broadwell cherryview haswell ivybridge sandybridge valleyview"
+for file in $files; do
+       QUICK_DUMP_EXTRA_DIST+="$file `tr '\n' ' ' < tools/quick_dump/$file`"
+done
+AC_SUBST(QUICK_DUMP_EXTRA_DIST)
+
 AC_CONFIG_FILES([
                 Makefile
                 benchmarks/Makefile
                 demos/Makefile
+                docs/Makefile
+                docs/reference/Makefile
+                docs/reference/intel-gpu-tools/Makefile
+                docs/reference/intel-gpu-tools/version.xml
                 lib/Makefile
                 man/Makefile
                 scripts/Makefile
                 tests/Makefile
                 tools/Makefile
                 tools/quick_dump/Makefile
+                tools/null_state_gen/Makefile
                 debugger/Makefile
                 debugger/system_routine/Makefile
                 assembler/Makefile
@@ -224,5 +247,7 @@ echo "       Debugger           : ${enable_debugger}"
 echo "       Python dumper      : ${DUMPER}"
 echo "       Overlay            : X: ${enable_overlay_xlib}, Xv: ${enable_overlay_xvlib}"
 echo ""
+echo " • API-Documentation      : ${enable_gtk_doc}"
+echo ""
 
 # vim: set ft=config ts=8 sw=8 tw=0 noet :