[tracker] Revert "tracker-extract: Don't try to spawn odt2txt if it isn't installed"

[Michael Biebl <mbiebl src gnome org>]

commit 62dd371745969bc6e4bd005d50decb5941c433ae
Author: Michael Biebl <biebl debian org>
Date:   Fri Mar 12 20:37:24 2010 +0100

    Revert "tracker-extract: Don't try to spawn odt2txt if it isn't installed"
    
    A configure check is not sufficient to detect if a binary is installed
    or not as build system != runtime system in the majority of cases.
    
    A correct fix would be to check for odt2txt at runtime.
    
    This reverts commit 232e3b0190ae538160162c3d5fd14b346b23323a.
    
    Conflicts:
    
    	src/tracker-extract/tracker-extract-oasis.c

 configure.ac                                |   10 ----------
 src/tracker-extract/tracker-extract-oasis.c |    6 ------
 2 files changed, 0 insertions(+), 16 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b543749..f1278f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1027,16 +1027,6 @@ if test x$enable_unzip_psgz_files != "xno"; then
   AC_DEFINE(USING_UNZIPPSFILES, 1, [Unzip ps.gz files])
 fi
 
-####################################################################
-# Oasis odt2txt binary check
-####################################################################
-
-AC_CHECK_PROG(have_odt2txt, odt2txt, "yes", "no")
-
-if test "x$have_odt2txt" = "xyes"; then
-   AC_DEFINE(HAVE_ODT2TXT, 1, [Define if we have odt2txt binary available])
-fi
-
 ##################################################################
 # Check for poppler's glib bingings
 ##################################################################
diff --git a/src/tracker-extract/tracker-extract-oasis.c b/src/tracker-extract/tracker-extract-oasis.c
index cccfcd6..6ca0275 100644
--- a/src/tracker-extract/tracker-extract-oasis.c
+++ b/src/tracker-extract/tracker-extract-oasis.c
@@ -18,8 +18,6 @@
  * Boston, MA  02110-1301, USA.
  */
 
-#include "config.h"
-
 #include <libtracker-common/tracker-os-dependant.h>
 
 #include <libtracker-extract/tracker-extract.h>
@@ -72,7 +70,6 @@ static gchar *
 extract_content (const gchar *path,
                  guint        n_words)
 {
-#ifdef HAVE_ODT2TXT
 	gchar *command, *output, *text;
 	GError *error = NULL;
 
@@ -94,9 +91,6 @@ extract_content (const gchar *path,
 	g_free (output);
 
 	return text;
-#else  /* HAVE_ODT2TXT */
-	return NULL;
-#endif /* HAVE_ODT2TXT */
 }
 
 static void