libdrm,intel: rework android header handling

[platform/upstream/libdrm.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index ee4ac72..bb0559a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 
 AC_PREREQ([2.63])
 AC_INIT([libdrm],
-        [2.4.42],
+        [2.4.56],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=DRI],
         [libdrm])
 
@@ -98,6 +98,11 @@ AC_ARG_ENABLE(freedreno-experimental-api,
              [Enable support for freedreno's experimental API (default: disabled)]),
              [FREEDRENO=$enableval], [FREEDRENO=no])
 
+AC_ARG_ENABLE(install-test-programs,
+                 AS_HELP_STRING([--enable-install-test-programs],
+                 [Install test programs (default: no)]),
+                 [INSTALL_TESTS=$enableval], [INSTALL_TESTS=no])
+
 dnl ===========================================================================
 dnl check compiler flags
 AC_DEFUN([LIBDRM_CC_TRY_FLAG], [
@@ -106,7 +111,7 @@ AC_DEFUN([LIBDRM_CC_TRY_FLAG], [
   libdrm_save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS $1"
 
-  AC_COMPILE_IFELSE([ ], [libdrm_cc_flag=yes], [libdrm_cc_flag=no])
+  AC_COMPILE_IFELSE([AC_LANG_SOURCE([ ])], [libdrm_cc_flag=yes], [libdrm_cc_flag=no])
   CFLAGS="$libdrm_save_CFLAGS"
 
   if test "x$libdrm_cc_flag" = "xyes"; then
@@ -180,6 +185,9 @@ AC_CANONICAL_HOST
 if test "x$LIBKMS" = xauto ; then
        case $host_os in
                linux*)         LIBKMS="yes" ;;
+               freebsd* | kfreebsd*-gnu)
+                               LIBKMS="yes" ;;
+               dragonfly*)     LIBKMS="yes" ;;
                *)              LIBKMS="no" ;;
        esac
 fi
@@ -211,6 +219,11 @@ if test "x$FREEDRENO" = xyes; then
        AC_DEFINE(HAVE_FREEDRENO, 1, [Have freedreno support])
 fi
 
+AM_CONDITIONAL(HAVE_INSTALL_TESTS, [test "x$INSTALL_TESTS" = xyes])
+if test "x$INSTALL_TESTS" = xyes; then
+       AC_DEFINE(HAVE_INSTALL_TESTS, 1, [Install test programs])
+fi
+
 AC_ARG_ENABLE([cairo-tests],
               [AS_HELP_STRING([--enable-cairo-tests],
                               [Enable support for Cairo rendering in tests (default: auto)])],
@@ -353,6 +366,26 @@ AC_ARG_WITH([kernel-source],
            [kernel_source="$with_kernel_source"])
 AC_SUBST(kernel_source)
 
+dnl Add flags for gcc and g++
+if test "x$GCC" = xyes; then
+    # Enable -fvisibility=hidden if using a gcc that supports it
+    save_CFLAGS="$CFLAGS"
+    AC_MSG_CHECKING([whether $CC supports -fvisibility=hidden])
+    VISIBILITY_CFLAGS="-fvisibility=hidden"
+    CFLAGS="$CFLAGS $VISIBILITY_CFLAGS"
+    AC_LINK_IFELSE([AC_LANG_PROGRAM()], AC_MSG_RESULT([yes]),
+                   [VISIBILITY_CFLAGS=""; AC_MSG_RESULT([no])]);
+
+    # Restore CFLAGS; VISIBILITY_CFLAGS are added to it where needed.
+    CFLAGS=$save_CFLAGS
+
+    if test "x$VISIBILITY_CFLAGS" != x; then
+        AC_DEFINE(HAVE_VISIBILITY, 1, [Compiler has -fvisibility support])
+    fi
+
+    AC_SUBST([VISIBILITY_CFLAGS])
+fi
+
 AC_SUBST(WARN_CFLAGS)
 AC_CONFIG_FILES([
        Makefile