xf86-video-ati: Branch 'master'

[Alex Deucher]

 configure.ac |   15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

New commits:
commit aabcf5ea30195274c79ae94c0fe6edc965f5c123
Author: Tomas Chvatal <tchvatal at suse.cz>
Date:   Mon Aug 13 22:58:18 2012 +0200

    Add switch for udev to disable automagic detection.
    
    Signed-off-by: Tomas Chvatal <tchvatal at suse.cz>

diff --git a/configure.ac b/configure.ac
index 86199f2..57f6742 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,10 +81,17 @@ PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
                   HAVE_XEXTPROTO_71="no")
 AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
 
-
-PKG_CHECK_MODULES(LIBUDEV, [libudev], [LIBUDEV=yes], [LIBUDEV=no])
-if test "x$LIBUDEV" = xyes; then
-       AC_DEFINE(HAVE_LIBUDEV, 1,[libudev support])
+AC_ARG_ENABLE([udev],
+		AS_HELP_STRING([--disable-udev], [Disable libudev support [default=auto]]),
+		[enable_udev="$enableval"],
+		[enable_udev=auto])
+if test "x$enable_udev" != "xno"; then
+	PKG_CHECK_MODULES(LIBUDEV, [libudev], [LIBUDEV=yes], [LIBUDEV=no])
+	if test "x$LIBUDEV" = xyes; then
+		AC_DEFINE(HAVE_LIBUDEV, 1,[libudev support])
+	elif test "x$enable_udev" != "xauto"; then
+		AC_MSG_ERROR([Building with udev requested but libudev not found])
+	fi
 fi
 AM_CONDITIONAL(LIBUDEV, test x$LIBUDEV = xyes)