[tracker] Fixes: Bug 632399 - [PATCH] configure.ac: Skip `AC_CHECK_FILE` when cross compiling
- From: Martyn James Russell <mr src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker] Fixes: Bug 632399 - [PATCH] configure.ac: Skip `AC_CHECK_FILE` when cross compiling
- Date: Mon, 18 Oct 2010 16:44:37 +0000 (UTC)
commit 6f8f5b8c79ed6a5f9ad448b03d53fe4c8b9ad8c7
Author: Martyn Russell <martyn lanedo com>
Date: Mon Oct 18 17:39:03 2010 +0100
Fixes: Bug 632399 - [PATCH] configure.ac: Skip `AC_CHECK_FILE` when cross compiling
We have removed all checks for old installed files
Makefile.am | 15 ---------------
configure.ac | 51 ---------------------------------------------------
2 files changed, 0 insertions(+), 66 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 53b4cf2..f421646 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -97,19 +97,4 @@ DISTCHECK_CONFIGURE_FLAGS = \
--enable-tracker-status-icon \
--with-enca
-if OLD_EXEC_REMOVE_ALL
-install-exec-hook:
- rm -Rf $(DESTDIR)$(bindir)/trackerd
- rm -Rf $(DESTDIR)$(bindir)/tracker-indexer
- rm -Rf $(DESTDIR)$(bindir)/tracker-thumbnailer
- rm -Rf $(DESTDIR)$(bindir)/tracker-extract
-endif
-
-if OLD_DATA_REMOVE_ALL
-install-data-hook:
- rm -Rf $(DESTDIR)$(DBUS_SERVICES_DIR)/tracker.service
- rm -Rf $(DESTDIR)$(datadir)/tracker/sqlite-service-stored-procs.sql
- rm -Rf $(DESTDIR)$(datadir)/tracker/tracker-introspect.xml
-endif
-
ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.ac b/configure.ac
index 8731af3..5d0278a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1817,44 +1817,6 @@ AM_CONDITIONAL(HAVE_GTK_DOC, test "$enable_gtk_doc" = "yes")
AM_CONDITIONAL(HAVE_GRAPHVIZ_FDP, test -n "$GRAPHVIZ_FDP")
##################################################################
-# Check for older tracker project files which can cause problems
-##################################################################
-
-old_exec_message=""
-old_data_message=""
-
-AC_CHECK_FILE("${prefix}/bin/trackerd", old_exec_trackerd=yes,,)
-AC_CHECK_FILE("${prefix}/bin/tracker-indexer", old_exec_tracker_indexer=yes,,)
-AC_CHECK_FILE("${prefix}/bin/tracker-extract", old_exec_tracker_extract=yes,,)
-AC_CHECK_FILE("${prefix}/bin/tracker-thumbnailer", old_exec_tracker_thumbnailer=yes,,)
-AC_CHECK_FILE("${DBUS_SERVICES_DIR}/tracker.service", old_data_dbus_service=yes,)
-AC_CHECK_FILE("${prefix}/share/tracker/tracker-introspect.xml", old_data_dbus_xml=yes,,)
-AC_CHECK_FILE("${prefix}/share/tracker/sqlite-service-stored-procs.sql", old_data_stored_procs=yes,,)
-
-if test "x$old_exec_trackerd" = "xyes" -o \
- "x$old_exec_tracker_indexer" = "xyes" -o \
- "x$old_exec_tracker_extract" = "xyes" -o \
- "x$old_exec_tracker_thumbnailer" = "xyes"; then
- old_exec_message="
- Old Tracker executable files were found in your path.
- (trackerd, tracker-indexer, tracker-thumbnailer, tracker-extract)"
- old_file_action="
- ** These files will be removed as part of the installation **"
-fi
-
-if test "x$old_data_dbus_service" = "xyes" -o \
- "x$old_data_dbus_xml" = "xyes" -o \
- "x$old_data_stored_procs" = "xyes"; then
- old_data_message="
- Old Tracker data files were found in the prefix you are installing to."
- old_file_action="
- ** These files will be removed as part of the installation **"
-fi
-
-AM_CONDITIONAL(OLD_EXEC_REMOVE_ALL, test -n "$old_exec_message")
-AM_CONDITIONAL(OLD_DATA_REMOVE_ALL, test -n "$old_data_message")
-
-##################################################################
# Write generated files
##################################################################
@@ -2071,16 +2033,3 @@ Frameworks:
Support Maemo $enable_maemo
"
-
-if test "x$old_exec_message" != "x" -o \
- "x$old_data_message" != "x" -o \
- "x$old_file_action" != "x"; then
-echo "
-Warnings:
-
- $old_exec_message
- $old_data_message
- $old_file_action
-
-"
-fi
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]