tracker r2269 - branches/indexer-split

[mr svn gnome org]

Author: mr
Date: Thu Sep 25 17:37:17 2008
New Revision: 2269
URL: http://svn.gnome.org/viewvc/tracker?rev=2269&view=rev

Log:
	* Makefile.am:
	* configure.ac: Added a message about the file removal of old data
	and binary files from older Tracker projects after the initial
	configure script has run.


Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/Makefile.am
   branches/indexer-split/configure.ac

Modified: branches/indexer-split/Makefile.am
==============================================================================
--- branches/indexer-split/Makefile.am	(original)
+++ branches/indexer-split/Makefile.am	Thu Sep 25 17:37:17 2008
@@ -26,15 +26,17 @@
 	--with-session-bus-services-dir="\$(datadir)"/dbus-1/services \
 	--disable-deskbar-applet
 
-# Clean up any old trunk files that might exist which we don't use now
+if OLD_EXEC_REMOVE_ALL
 install-exec-hook:
 	rm -Rf $(bindir)/trackerd
 	rm -Rf $(bindir)/tracker-indexer
 	rm -Rf $(bindir)/tracker-thumbnailer
 	rm -Rf $(bindir)/tracker-extract
+endif
 
+if OLD_DATA_REMOVE_ALL
 install-data-hook:
 	rm -Rf $(DBUS_SERVICES_DIR)/tracker.service
 	rm -Rf $(datadir)/tracker/sqlite-service-stored-procs.sql
 	rm -Rf $(datadir)/tracker/tracker-introspect.xml
-	
\ No newline at end of file
+endif	
\ No newline at end of file

Modified: branches/indexer-split/configure.ac
==============================================================================
--- branches/indexer-split/configure.ac	(original)
+++ branches/indexer-split/configure.ac	Thu Sep 25 17:37:17 2008
@@ -969,6 +969,47 @@
 )
 
 ##################################################################
+# Check for older tracker project files which can cause problems
+##################################################################
+
+old_exec_exists=yes
+old_data_exists=yes
+
+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
 ##################################################################
 
@@ -1086,6 +1127,9 @@
 Warning:
 
         You must make sure SQLite is compiled with --enable-threadsafe
-	Otherwise expect pain!
+
+	$old_exec_message
+	$old_data_message
+	$old_file_action
 
 "