[tracker/albumart-quill] Fixed merge problem in configure.ac

[Philip Van Hoof <pvanhoof src gnome org>]

commit bda4566d6819f87776150dd62a4ee9770e12041b
Author: Philip Van Hoof <philip codeminded be>
Date:   Tue Nov 3 12:46:29 2009 +0100

    Fixed merge problem in configure.ac

 configure.ac |   26 ++++++++++++--------------
 1 files changed, 12 insertions(+), 14 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c3b14c1..604344e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -448,7 +448,7 @@ fi
 AM_CONDITIONAL(HAVE_LIBXML2, test "x$have_libxml2" = "xyes")
 
 ##################################################################
-# Check for GdkPixbuf needed for the MP3 album art extractor
+# Check for GdkPixbuf, needed for the MP3 album art extractor
 ##################################################################
 
 AC_ARG_ENABLE(gdkpixbuf, 
@@ -1198,17 +1198,15 @@ AM_CONDITIONAL(HAVE_LIBVORBIS, test "x$have_libvorbis" = "xyes")
 # Check ioprio support
 ####################################################################
 
-AC_MSG_CHECKING([[ioprio support]])
-have_ioprio=no
-
-AC_RUN_IFELSE(
-[AC_LANG_PROGRAM([[
+AC_CACHE_CHECK([if we have ioprio],[tracker_cv_have_ioprio],
+  [AC_RUN_IFELSE(
+    [AC_LANG_PROGRAM([[
 	#include <stdlib.h>
 	#include <errno.h>
 	#include <sys/syscall.h>
 	#include <unistd.h>
-]], 
-[[
+      ]], 
+      [[
         inline int ioprio_get (int which, int who) 
 	{
 	       return syscall (__NR_ioprio_get, which, who);
@@ -1218,16 +1216,16 @@ AC_RUN_IFELSE(
 	{
 	       return ioprio_get (1, 0);
 	}
-]]
-)],
-[have_ioprio=yes],[])
+      ]])],
+    [tracker_cv_have_ioprio=yes],
+    [tracker_cv_have_ioprio=no],
+    [AC_MSG_ERROR([cross-compiling: please set 'tracker_cv_have_ioprio'])])
+  ])
 
-if test "$have_ioprio" = "yes" ; then
+if test "x$tracker_cv_have_ioprio" = "xyes" ; then
    AC_DEFINE(HAVE_IOPRIO, 1, [Define if we have ioprio])
 fi
 
-AC_MSG_RESULT([$have_ioprio])
-
 ##################################################################
 # Check for exempi
 ##################################################################