From 86fd7247448880f8d3a00419b51b8cccfb23d596 Mon Sep 17 00:00:00 2001
From: mmdolze <mmdolze@users.sourceforge.net>
Date: Mon, 10 Jan 2011 06:47:44 +0000
Subject: [PATCH] Implement our own check for xosd. It's not more bad than
 xsod's macro but works if xosd it not installed.

---
 acinclude.m4 | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 460c0fc..ef57a68 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -466,13 +466,17 @@ dnl			else
 			fi
 			;;
 		xosd)
-			AM_PATH_LIBXOSD([
+			AC_PATH_PROG([LIBXOSD_CONFIG], [xosd-config], [no])
+			if test "$LIBXOSD_CONFIG" = "no"; then
+				AC_MSG_WARN([The xosd driver needs the xosd library])
+			else
+				LIBXOSD_CFLAGS=`$LIBXOSD_CONFIG --cflags`
+				LIBXOSD_LIBS=`$LIBXOSD_CONFIG --libs`
+				AC_SUBST(LIBXOSD_CFLAGS)
+				AC_SUBST(LIBXOSD_LIBS)
 				DRIVERS="$DRIVERS xosd${SO}"
 				actdrivers=["$actdrivers xosd"]
-			],[
-dnl			else
-				AC_MSG_WARN([The xosd driver needs the xosd library])
-			])
+			fi
 			;;
 		*)
 			AC_MSG_ERROR([Unknown driver $driver])