Merge branch 'master' of git+ssh://git.freedesktop.org/git/xcb/libxcb

[free-sw/xcb/libxcb] / configure.ac

diff --git a/configure.ac b/configure.ac
index a8e171b..b8d5471 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -131,8 +131,23 @@ AC_PREREQ([2.59c], [], [AC_SUBST([htmldir], [m4_ifset([AC_PACKAGE_TARNAME],
 XCB_CHECK_DOXYGEN()
 
 case $host_os in
-       # darwin has poll() but can't be used to poll character devices (atleast through SnowLeopard)
-       darwin*) ;;
+       # darwin through Snow Leopard has poll() but can't be used to poll character devices.
+       darwin@<:@789@:>@*|darwin10*) ;;
+       darwin*)
+               _ac_xorg_macosx_version_min=""
+               if echo $CPPFLAGS $CFLAGS | grep -q mmacosx-version-min ; then
+                       _ac_xorg_macosx_version_min=`echo $CPPFLAGS $CFLAGS | sed 's/^.*-mmacosx-version-min=\(@<:@^ @:>@*\).*$/\1/'`
+               else
+                       _ac_xorg_macosx_version_min=$MACOSX_DEPLOYMENT_TARGET
+               fi
+               case $_ac_xorg_macosx_version_min in
+                       10.@<:@0123456@:>@|10.@<:@0123456@:>@.*) ;;
+                       *)
+                               AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
+                       ;;
+               esac
+               unset _ac_xorg_macosx_version_min
+               ;;
        *)
                AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
        ;;