Commit Graph

31 Commits

Author SHA1 Message Date
Javier Jardón
4e78a0a9df Revert "Use upstream gettext instead the glib one"
This causes several problems:
- Compilation in FreeBSD with --enable-gtk-doc broke
- Modules that still use the AM_GLIB_GNU_GETTEXT macro
  doesnt compile anymore because /usr/share/glib-2.0/gettext
  is not filled with the correct files, as this was done in
  the glib custom po/Makefile.in.in

See https://bugzilla.gnome.org/show_bug.cgi?id=622991

This reverts commit e5c752371c.
2016-01-10 22:44:24 +00:00
Javier Jardón
e5c752371c Use upstream gettext instead the glib one
https://bugzilla.gnome.org/show_bug.cgi?id=622991
2016-01-09 18:49:22 +00:00
Rico Tzschichholz
531be87f24 po: Fix Makefile.in.in syntax
Introduced by cff536c99e
2012-10-31 13:14:06 +01:00
Colin Walters
cff536c99e mkinstalldirs: Delete from version control
This is installed by automake.  By maintaining it in git, we create
merge conflicts as people build with different versions of automake.

Just use 'mkdir -p' instead in gettext.  Should be portable enough.

https://bugzilla.gnome.org/show_bug.cgi?id=686839
2012-10-29 09:39:36 -04:00
Javier Jardón
f8a5fc2e2e Revert "Use upstream gettext instead the glib one"
Commited by mistake
This reverts commit e930e3b3aa.
2012-08-15 02:46:16 +09:00
Javier Jardón
e930e3b3aa Use upstream gettext instead the glib one 2012-08-15 01:41:11 +09:00
Ryan Lortie
a2b350d9c3 po/Makefile.in.in: intltool compatibility fixes
Our infrastructure for updating the glib20.pot file was incompatible
with intltool in a couple of ways:

 - we didn't set the Report-Msgid-Bugs-To to

 - we used paths relative to the $(top_srcdir), rather than po/

This resulted in spamming of pointless changes to the .po files whenever
'make update-po' was run (since all of the translators are using
intltool-based tools).
2011-09-04 22:03:53 -04:00
Matthias Clasen
2fb57ff46f Quiet down the build a bit 2011-05-28 14:29:08 -04:00
Richard Hughes
f265319b59 Do not do update-po at distcheck time to avoid touching files checked into version control 2010-06-09 17:10:57 +01:00
Christian Persch
41b3f6885d Add g_dc[p]gettext, and use it in gsettings
Avoid using LC_MESSAGES, and just call g_d[c]gettext directly.

Bug #617004.
2010-05-20 21:16:29 +02:00
Matthias Clasen
b0bba8520a Extract strings from g_dngettext too
There is one occurrence of this in glib, which we currently miss.
See bug 585717.
2009-06-15 00:52:43 -04:00
Matthias Clasen
87a7377338 Don't use obsolete calling convention for config.status
svn path=/trunk/; revision=7929
2009-03-01 07:14:12 +00:00
Matthias Clasen
92ad0439a8 Don't hardcode /bin/sh as shell
svn path=/trunk/; revision=7928
2009-03-01 07:05:52 +00:00
Matthias Clasen
3305266a37 Use po/LINGUAS
svn path=/trunk/; revision=7017
2008-06-11 20:31:44 +00:00
Matthias Clasen
04b0520e09 Work with Solaris gettext (#341988, Laszlo Peter)
2007-03-06  Matthias Clasen  <mclasen@redhat.com>

        Work with Solaris gettext (#341988, Laszlo Peter)

        * m4macros/glib-gettext.m4: Make GLIB_WITH_NLS define
        MSGFMT_OPTS if msgfmt supports -c.

        * po/Makefile.in.in: Use MSGFMT_OPTS when calling
        msgfmt.


svn path=/trunk/; revision=5369
2007-03-06 05:23:26 +00:00
Matthias Clasen
284678d239 Silence autoconf 2.60 2006-12-17 18:35:23 +00:00
Matthias Clasen
81eb80112f Tell xgettext about all the printf-like functions we use.
2005-09-06  Matthias Clasen  <mclasen@redhat.com>

	* Makefile.in.in: Tell xgettext about all the
        printf-like functions we use.
2005-09-06 16:33:28 +00:00
Matthias Clasen
1eb5f925c2 Call msgfmt with -c to catch format errors.
2005-07-25  Matthias Clasen  <mclasen@redhat.com>

	* Makefile.in.in: Call msgfmt with -c to catch
	format errors.
2005-07-25 14:17:30 +00:00
James Henstridge
c4391cbf37 require automake 1.7. Add calls to libtoolize and gtkdocize. Clean up some
2003-03-01  James Henstridge  <james@daa.com.au>

    * autogen.sh: require automake 1.7.  Add calls to libtoolize and
    gtkdocize.  Clean up some of the error messages.

    * configure.in: move version declaration to the top of the file
    (before AC_INIT), using M4 macros.
    GLIB_AC_DIVERT_BEFORE_HELP() calls no longer necessary, due to use
    of M4 macro expansion in help messages instead.
    Convert AC_ARG_WITH/AC_ARG_ENABLE calls to use AC_HELP_STRING to
    format help strings.  Use quadrigraphs to get square brackets to
    show correctly.
    Replace gtk-doc checks with a call to GTK_DOC_CHECK() macro.
    Use AC_CONFIG_COMMANDS([glibconfig.h], ...) to output
    glibconfig.h, so that "./config.status glibconfig.h" works.
    Add an extra AC_CONFIG_FILES call listing other files we want
    generated by config.status protected by an "if false" block.  This
    way automake generates the rules needed to rebuild the files for
    us.
    Add quotes in various places.

    * docs/reference/*/Makefile.am: convert to use the common
    gtk-doc.make file.  This localises the complexity to a single
    makefile fragment maintained with gtk-doc itself.

    * */Makefile.am: remove unneeded rules to build win32 files with
    config.status.  Automake now does this for us.
    Replace instances of @FOO@ with $(FOO) where appropriate -- this
    allows automake to do a better job checking the makefile.
    Add some files to DISTCLEANFILES where appropriate

    * Makefile.am: use the DISTCHECK_CONFIGURE_FLAGS variable to
    ensure that --enable-gtk-doc is passed to configure during a
    distcheck.  Remove the custom distcheck, since the standard one
    will now do.

    * gobject/Makefile.am: switch to BUILT_SOURCES, since that now
    works.
2003-03-04 10:10:48 +00:00
Owen Taylor
8b06efc5d3 Fix problem from recent commit where non GNU-format message catalogs would
Wed Dec 11 14:06:50 2002  Owen Taylor  <otaylor@redhat.com>

        * po/Makefile.in.in: Fix problem from recent commit where
        non GNU-format message catalogs would be installed in
        datadir. Remove some leftover setting of PATH=../src:$PATH.
2002-12-11 19:43:22 +00:00
Owen Taylor
133a61d906 Use datadir, not $(prefix)/share. (#89339)
Tue Dec  3 20:40:56 2002  Owen Taylor  <otaylor@redhat.com>

        * Makefile.in.in: Use datadir, not $(prefix)/share. (#89339)
2002-12-04 01:48:15 +00:00
jacob berkman
37769358f3 remove cat-id-tbl.c references (this really
2002-01-31  jacob berkman  <jacob@ximian.com>

	* Makefile.in.in: remove cat-id-tbl.c references (this really
2002-02-01 00:02:12 +00:00
jacob berkman
fd1eac51e6 remove stamp-cat-id
2002-01-31  jacob berkman  <jacob@ximian.com>

	* Makefile.in.in (DISTFILES): remove stamp-cat-id
2002-01-31 23:26:20 +00:00
jacob berkman
abe0ca1315 remove references to po2tbl
2002-01-31  jacob berkman  <jacob@ximian.com>

	* glib-gettextize.in:
	* m4macros/glib-gettext.m4 (AM_GLIB_GNU_GETTEXT): remove
	references to po2tbl
2002-01-31 22:26:59 +00:00
ERDI Gergo
c711ceab01 Remove inlttool [] tags from POTFILE.in
2002-01-23  ERDI Gergo  <cactus@cactus.rulez.org>

	* Makefile.in.in (POTFILES): Remove inlttool [] tags from
	POTFILE.in
2002-01-25 00:30:43 +00:00
jacob berkman
d59c859aec version of gettextize which uses glib's po/Makefile.in.in and
2001-10-28  jacob berkman  <jacob@ximian.com>

	* glib-gettextize.in: version of gettextize which uses glib's
	po/Makefile.in.in and po2tbl.sed.in, and no longer copies in intl/
	or installs ChangeLog entries in po/ChangeLog

	* configure.in (AC_OUTPUT): generate glib-gettextize

	* Makefile.am (bin_SCRIPTS): install glib-gettextize

2001-10-28  jacob berkman  <jacob@ximian.com>

	* Makefile.in.in: install Makefile.in.in and po2tbl.sed.in for use
	with glib-gettextize by other packages
2001-10-28 16:34:24 +00:00
Owen Taylor
861fb083f2 Fix distclean to remove some extra files. #60993, Ben Gertzfield
Wed Sep 26 15:33:37 2001  Owen Taylor  <otaylor@redhat.com>

	* Makefile.am po/Makefile.in.in: Fix distclean to
	remove some extra files. #60993, Ben Gertzfield
2001-09-26 19:37:08 +00:00
Ross Golder
e7a624f94a Take DESTDIR into account in install/uninstall 2001-09-05 21:55:59 +00:00
Owen Taylor
e60a91344e Revert last change to Makefile.in.in - no this is not the Makefile.in.in
Wed Sep  5 09:27:34 2001  Owen Taylor  <otaylor@redhat.com>

        * Revert last change to Makefile.in.in - no this
        is not the Makefile.in.in from gettext.
2001-09-05 13:28:24 +00:00
Ross Golder
dcb3811885 Updated from gettext-0.10.35, to fix broken DESTDIR handling 2001-09-05 10:04:08 +00:00
Owen Taylor
b8796462fb Add gettext support.
Mon Jan 15 21:12:49 2001  Owen Taylor  <otaylor@redhat.com>

        * configure.in acconfig.h glibintl.h gutils.c
	po/{Makefile.in.in,POTFILES.in,po2tbl.in}: Add gettext
	support.

	* glib-gettext.m4 acinclude.m4: Clean up the GTK+ gettext macros
	some more and put them in this file, though they also need
	to be included in acinclude.m4 due to the brokeness of
	aclocal.

	* gspawn.c gspawn-win32.c gutf8.c gconvert.c gfileutils.c
	gshell.c: Remove dummy _() #defines, include glibintl.m4.
2001-01-16 02:24:24 +00:00