[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [Tracker] Any oustanding patches I have missed?



2007/7/1, Michael Biebl <mbiebl gmail com>:
2007/7/1, jamie <jamiemcc blueyonder co uk>:
> Speak up now!

Hi Jamie,

nice to see you back in action again.

commit r602 reintroduced some stuff in configure.ac which is
superfluous and should be removed again.
Patch attached.

I spotted two more issues: a typo (localdir vs localedir) in
src/libtracker/Makefile.am and because we use localedir, the autoconf
requirement has to be bumped to 2.59c.

Updated patch attached.

Michael
--
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?
Index: configure.ac
===================================================================
--- configure.ac	(Revision 605)
+++ configure.ac	(Arbeitskopie)
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 # This file is part of Tracker.
 
-AC_PREREQ(2.57)
+AC_PREREQ(2.59c)
 AC_INIT([tracker],[0.6.0],[tracker-list gnome org])
 
 AC_CONFIG_SRCDIR([src/trackerd/trackerd.c])
@@ -150,22 +150,6 @@
 AM_GLIB_GNU_GETTEXT
 IT_PROG_INTLTOOL([0.35.0])
 
-# The following lines replace AM_GLIB_DEFINE_LOCALEDIR(TRACKER_LOCALEDIR)
-# due to the bug with autoconf 2.60
-
-dnl Set TRACKER_LOCALEDIR in config.h.
-if test "x${prefix}" = "xNONE";
-then
-	TRACKER_LOCALEDIR="${ac_default_prefix}/${DATADIRNAME}/locale"
-else
-	TRACKER_LOCALEDIR="${prefix}/${DATADIRNAME}/locale"
-fi
-
-AC_DEFINE_UNQUOTED(TRACKER_LOCALEDIR, "$TRACKER_LOCALEDIR",
-		[The directory in which locale data will be stored])
-
-# end of AM_GLIB_DEFINE_LOCALEDIR(TRACKER_LOCALEDIR) replacement
-
 ####################################################################
 # check for newer glib (>= 2.12.0) for g_option_context_set_summary ()
 # availability
Index: src/libtracker/Makefile.am
===================================================================
--- src/libtracker/Makefile.am	(Revision 605)
+++ src/libtracker/Makefile.am	(Arbeitskopie)
@@ -1,6 +1,6 @@
 INCLUDES =				\
 	-DDATADIR=\""$(datadir)"\"	\
-	-DTRACKER_LOCALEDIR=\""$(localdir)"\" \
+	-DTRACKER_LOCALEDIR=\""$(localedir)"\" \
 	$(GLIB2_CFLAGS)			\
 	$(DBUS_CFLAGS)			
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]