fix indentation and a few typos

[deb_libcec.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 3b61291c422468c85b0a2238b4396024c414d8c1..0e73e023023901a353fc3205550dd09f5433eb16 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT([libcec], [2:0:0], [http://libcec.pulse-eight.com/])
+AC_INIT([libcec], [2:1:0], [http://libcec.pulse-eight.com/])
 AC_CONFIG_HEADERS([config.h])
 AH_TOP([#pragma once])
 
@@ -130,6 +130,7 @@ libs_client="$LIBS"
 use_udev="no"
 use_adapter_detection="yes"
 use_lockdev="no"
+SUPPRESS_MANGLING_WARNINGS=" -Wno-psabi"
 case "${host}" in
   *-*-linux*)
     ## search for udev if pkg-config was found
@@ -205,11 +206,26 @@ case "${host}" in
         LIBS="$libs_pre_rpi"
       fi
     fi
+    ## search for X11/xrandr
+    libs_tmp="$LIBS"
+    use_x11_xrandr="yes"
+    AC_CHECK_HEADER(X11/Xlib.h,,[use_x11_xrandr="no"])
+    AC_CHECK_HEADER(X11/Xatom.h,,[use_x11_xrandr="no"])
+    AC_CHECK_HEADER(X11/extensions/Xrandr.h,,[use_x11_xrandr="no"])
+    AC_CHECK_LIB(X11,XOpenDisplay,,[use_x11_xrandr="no"])
+    AC_CHECK_LIB(Xrandr,XRRGetScreenResources,,[use_x11_xrandr="no"])
+    if test "x$use_x11_xrandr" = "xyes"; then
+      AC_DEFINE([HAVE_RANDR],[1],[Define to 1 to include support for the X11 randr extension])
+      AM_CONDITIONAL(USE_X11_RANDR, true)
+    else
+      LIBS="$libs_tmp"
+    fi
     ;;
   *-apple-darwin*)
     AC_CHECK_HEADER(mach/mach_time.h,,AC_MSG_ERROR($msg_required_header_missing))
     AC_CHECK_HEADER(CoreVideo/CVHostTime.h,,AC_MSG_ERROR($msg_required_header_missing))
     AC_DEFINE([TARGET_DARWIN], [1], [Darwin target])
+    SUPPRESS_MANGLING_WARNINGS=""
     ;;
 esac
 
@@ -342,7 +358,7 @@ fi
 LIBS_LIBCEC="$LIBS"
 LIBS="$libs_client"
 
-CXXFLAGS="$CXXFLAGS -fPIC -Wall -Wextra -Wno-missing-field-initializers"
+CXXFLAGS="$CXXFLAGS -fPIC -Wall -Wextra -Wno-missing-field-initializers $SUPPRESS_MANGLING_WARNINGS"
 
 if test "x$use_debug" = "xyes"; then
   CXXFLAGS="$CXXFLAGS -g"