tracker r2644 - in trunk: . src/tracker-indexer/modules src/trackerd

[mr svn gnome org]

Author: mr
Date: Wed Dec  3 15:03:09 2008
New Revision: 2644
URL: http://svn.gnome.org/viewvc/tracker?rev=2644&view=rev

Log:
	* configure.ac:
	* src/tracker-indexer/modules/evolution-common.c:
	* src/trackerd/tracker-files.c: Support __FUNCTION__ for compilers
	which don't have it as standard. Based on a patch from Jerry Tan.


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/tracker-indexer/modules/evolution-common.c
   trunk/src/trackerd/tracker-files.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Wed Dec  3 15:03:09 2008
@@ -85,6 +85,22 @@
 AC_CHECK_FUNCS([posix_fadvise])
 AC_CHECK_FUNCS([getline])
 
+# Check for defines we expect
+AC_TRY_COMPILE(,
+	[
+#include "stdio.h"
+printf ("%s", __FUNCTION__);
+	],
+	have_function=yes,
+	have_function=no,
+)
+
+if test "x$have_function" = "xno" ; then
+   AC_DEFINE(__FUNCTION__, 
+   	     __func__, 
+   	     [Defined for compilers not supporting __FUNCTION__])
+fi
+
 # Library required versions
 DBUS_REQUIRED=0.60
 GLIB_REQUIRED=2.16.0
@@ -243,7 +259,7 @@
 
 GETTEXT_PACKAGE=AC_PACKAGE_NAME
 AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [The gettext translation domain])
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [The gettext translation domain])
 
 AM_GLIB_GNU_GETTEXT
 IT_PROG_INTLTOOL([0.35.0])

Modified: trunk/src/tracker-indexer/modules/evolution-common.c
==============================================================================
--- trunk/src/tracker-indexer/modules/evolution-common.c	(original)
+++ trunk/src/tracker-indexer/modules/evolution-common.c	Wed Dec  3 15:03:09 2008
@@ -24,6 +24,7 @@
 #include <string.h>
 #include <fcntl.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 
 #include <tracker-indexer/tracker-metadata-utils.h>
 

Modified: trunk/src/trackerd/tracker-files.c
==============================================================================
--- trunk/src/trackerd/tracker-files.c	(original)
+++ trunk/src/trackerd/tracker-files.c	Wed Dec  3 15:03:09 2008
@@ -483,7 +483,7 @@
 	tracker_dbus_request_failed (request_id,
 				     &actual_error,
 				     "%s not implemented yet",
-				     __PRETTY_FUNCTION__);
+				     __FUNCTION__);
 	dbus_g_method_return_error (context, actual_error);
 	g_error_free (actual_error);
 }