$OpenBSD: patch-configure_in,v 1.2 2006/12/04 01:20:31 espie Exp $
--- configure.in.orig	Sun Nov 26 20:28:33 2006
+++ configure.in	Mon Dec  4 01:52:47 2006
@@ -152,16 +152,11 @@ LIB_XINERAMA=""
 if test "$with_xinerama" != "no" ; then
 	AC_MSG_CHECKING([for Xinerama extension])
 
-	if "$PKG_CONFIG" --exists xinerama ; then
-		with_xinerama=yes
-		CFLAGS_XINERAMA=`"$PKG_CONFIG" --cflags xinerama`
-		LIB_XINERAMA=`"$PKG_CONFIG" --libs xinerama`
-		AC_DEFINE([HAVE_XINERAMA],,[Xinerama extension available])
-		AC_MSG_RESULT([yes])
-	else
-		with_xinerama=no
-		AC_MSG_RESULT([no])
-	fi
+	with_xinerama=yes
+	CFLAGS_XINERAMA="-I${ac_x_includes}"
+	LIB_XINERAMA="-L${ac_x_libraries} -lXinerama"
+	AC_DEFINE([HAVE_XINERAMA],,[Xinerama extension available])
+	AC_MSG_RESULT([yes])
 fi
 
 AC_SUBST([CFLAGS_XINERAMA])
@@ -242,7 +237,7 @@ dnl --------------------
 dnl check for cdparanoia
 dnl --------------------
 
-AC_CHECK_HEADER([cdda_interface.h], [with_cdparanoia=yes], [with_cdparanoia=no])
+KDE_CHECK_HEADER([cdda_interface.h], [with_cdparanoia=yes], [with_cdparanoia=no])
 
 if test "$with_cdparanoia" != "yes" ; then
 	echo ""
