gvfs r1083 - in trunk: . po

[lferrett svn gnome org]

Author: lferrett
Date: Wed Jan  9 10:56:00 2008
New Revision: 1083
URL: http://svn.gnome.org/viewvc/gvfs?rev=1083&view=rev

Log:
2008-01-09  Luca Ferretti  <elle uca libero it>

	* Makefile.am:
	* autogen.sh:
	* configure.ac:

	Reuse intltool by now, glib-gettext rules seems unable
	to properly remove "[encoding: UTF-8]" generating
	po/POTFILES.
	
	* mkinstalldirs:
	* po/Makefile.in.in:

	Removed, autogenerated using intltool by now.
	
	* po/POTFILES.in:

	Added new missing files for computer:// backend.



Removed:
   trunk/mkinstalldirs
   trunk/po/Makefile.in.in
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/autogen.sh
   trunk/configure.ac
   trunk/po/ChangeLog
   trunk/po/POTFILES.in

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Wed Jan  9 10:56:00 2008
@@ -12,4 +12,15 @@
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 
-EXTRA_DIST = mkinstalldirs
+EXTRA_DIST = \
+	MAINTAINERS		\
+	intltool-extract.in	\
+	intltool-merge.in	\
+	intltool-update.in	\
+	$(NULL)
+
+DISTCLEANFILES = \
+	intltool-extract	\
+	intltool-merge		\
+	intltool-update		\
+	$(NULL)
\ No newline at end of file

Modified: trunk/autogen.sh
==============================================================================
--- trunk/autogen.sh	(original)
+++ trunk/autogen.sh	Wed Jan  9 10:56:00 2008
@@ -29,6 +29,14 @@
 	DIE=1
 fi
 
+(intltoolize --version) < /dev/null > /dev/null 2>&1 || {
+	echo
+	echo "You must have intltool installed to compile $PROJECT."
+	echo "Install the appropriate package for your distribution,"
+	echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/intltool";
+	DIE=1
+}
+
 (gtkdocize --version) < /dev/null > /dev/null 2>&1 || {
 	echo
 	echo "You must have gtk-doc installed to compile $PROJECT."
@@ -99,6 +107,7 @@
 touch README INSTALL
 
 libtoolize --force || exit $?
+intltoolize --force --copy --automake || exit $?
 gtkdocize || exit $?
 
 $ACLOCAL $ACLOCAL_FLAGS || exit $?

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Wed Jan  9 10:56:00 2008
@@ -52,20 +52,37 @@
 AC_SUBST(DBUS_SERVICE_DIR)
 
 dnl ****************************
-dnl *** Checks for gettext   ***
+dnl *** Checks for intltool  ***
 dnl ****************************
 
+AC_PROG_INTLTOOL([0.31.0])
 GETTEXT_PACKAGE=gvfs
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [The gettext domain name])
-AC_SUBST(GETTEXT_PACKAGE)
 
-ALL_LINGUAS="it"
+ALL_LINGUAS="it nb"
 
+AC_SUBST([GETTEXT_PACKAGE])
+AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[The gettext domain name])
 AM_GLIB_GNU_GETTEXT
 
-LIBS="$LIBS $INTLLIBS"
+dnl ****************************
+dnl *** Checks for gettext   ***
+dnl ****************************
+
+dnl *** disabled by now, using intltool ***
+dnl *** we'll revert when glib-gettexttize will be able
+dnl *** to manage [enconding: UTF-8] in POTIFILES.in
+
+dnl GETTEXT_PACKAGE=gvfs
+dnl AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [The gettext domain name])
+dnl AC_SUBST(GETTEXT_PACKAGE)
+
+dnl ALL_LINGUAS=""
+
+dnl AM_GLIB_GNU_GETTEXT
+
+dnl LIBS="$LIBS $INTLLIBS"
 
-AM_GLIB_DEFINE_LOCALEDIR(GVFS_LOCALEDIR)
+dnl AM_GLIB_DEFINE_LOCALEDIR(GVFS_LOCALEDIR)
 
 dnl ****************************
 dnl *** Checks for ssh stuff ***

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Wed Jan  9 10:56:00 2008
@@ -1,5 +1,6 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
+[encoding: UTF-8]
 client/gdaemonfile.c
 client/gdaemonfileinputstream.c
 client/gdaemonfileoutputstream.c
@@ -11,6 +12,7 @@
 daemon/daemon-main.c
 daemon/gvfsbackend.c
 daemon/gvfsbackendcdda.c
+daemon/gvfsbackendcomputer.c
 daemon/gvfsbackendftp.c
 daemon/gvfsbackendsftp.c
 daemon/gvfsbackendsmb.c
@@ -44,6 +46,7 @@
 daemon/gvfsjobsetdisplayname.c
 daemon/gvfsjobtrash.c
 daemon/gvfsjobunmount.c
+daemon/gvfsjobunmountmountable.c
 daemon/gvfsjobwrite.c
 daemon/main.c
 daemon/mount.c