diff --git a/configure.ac b/configure.ac

index b770c88..94abea4 100644

--- a/configure.ac

+++ b/configure.ac

@@ -1,3 +1,6 @@

+#

+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.

+#

# Copyright 2005 Adam Jackson.

#

# Permission is hereby granted, free of charge, to any person obtaining a

@@ -156,7 +159,8 @@ if test "x$EXA" = xyes; then

SAVE_CPPFLAGS="$CPPFLAGS"

CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"

AC_CHECK_HEADER(exa.h,

- [have_exa_h="yes"], [have_exa_h="no"])

+ [have_exa_h="yes"], [have_exa_h="no"],

+ [#include "xorg-server.h"])

CPPFLAGS="$SAVE_CPPFLAGS"

else

AC_MSG_RESULT(no)

@@ -167,6 +171,7 @@ CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"

if test "x$have_exa_h" = xyes; then

AC_MSG_CHECKING([whether EXA version is at least 2.0.0])

AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[

+#include "xorg-server.h"

#include "exa.h"

#if EXA_VERSION_MAJOR < 2

#error OLD EXA!