Commit Graph

38 Commits

Author SHA1 Message Date
Philip Withnall
3a926db37b build: Include gettext libraries for static compilation on Mac OS X
When compiling statically against the system-provided gettext on Mac OS
X, GLib needs to be linked against CoreFramework, which provides some
functions used by gettext.

Fix this by including the necessary macro magic from upstream gettext.

https://bugzilla.gnome.org/show_bug.cgi?id=725894
2017-04-03 10:32:55 +01:00
Javier Jardón
6b577196ee Deprecate GLIB_GNU_GETTEXT macro, use upstream gettext instead
https://bugzilla.gnome.org/show_bug.cgi?id=624186
2016-01-11 16:07:06 +00:00
Adrian Bunk
c81a9556ff m4macros/glib-gettext.m4: Don't use AC_HEADER_STDC
AC_HEADER_STDC is obsolete (pre-C89 headers are no longer an issue),
and the resulting STDC_HEADERS define is anyway not used.

https://bugzilla.gnome.org/show_bug.cgi?id=700263
2013-05-15 15:43:50 -04:00
Antoine Jacoutot
8f58c2c0c4 Fix DATADIRNAME on OpenBSD.
On OpenBSD translation files are always installed under PREFIX/share/locale,
there is no such thing as PREFIX/lib/locale; according to that, set
DATADIRNAME to "share".
2011-10-04 16:30:18 +02:00
Ryan Lortie
3a8ab85d96 rename configure.in to configure.ac 2010-07-13 11:59:16 -04:00
Matthias Clasen
69c903e5b2 Remove AC_CANONICAL_HOST from GLIB_WITH_NLS again. (#385132)
2008-01-27  Matthias Clasen  <mclasen@redhat.com>

        * m4macros/glib-gettext.m4: Remove AC_CANONICAL_HOST from
        GLIB_WITH_NLS again.  (#385132)



svn path=/trunk/; revision=6388
2008-01-27 23:01:43 +00:00
Matthias Clasen
7a55a55fdc Fix a small problem with msgfmt -c detection
svn path=/trunk/; revision=5606
2007-07-09 05:21:05 +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
b6aad8a6f0 Require AC_CANONICAL_HOST in GLIB_WITH_NLS. (#385132, Laszlo Peter)
2006-12-13  Matthias Clasen  <mclasen@redhat.com>

        * m4macros/glib-gettext.m4: Require AC_CANONICAL_HOST in
        GLIB_WITH_NLS.  (#385132, Laszlo Peter)
2006-12-13 20:08:22 +00:00
Matthias Clasen
ea372366de fix 343825 2006-11-15 19:17:16 +00:00
Matthias Clasen
aae7e432c6 Avoid stupid compiler complaints about precision loss.
2005-03-11  Matthias Clasen  <mclasen@redhat.com>

	* m4macros/glib-gettext.m4: Avoid stupid compiler complaints
	about precision loss.
2005-03-11 18:02:35 +00:00
Matthias Clasen
b324ed6804 Require ngettext. (#123847, Danilo Segan)
2004-08-06  Matthias Clasen  <mclasen@redhat.com>

	* m4macros/glib-gettext.m4: Require ngettext.  (#123847,
	Danilo Segan)
2004-08-06 17:26:28 +00:00
Manish Singh
0c5dee77e1 m4macros/glib-2.0.m4 quote AC_DEFUN macro names so automake 1.8 won't
Tue Jan 27 18:45:47 2004  Manish Singh  <yosh@gimp.org>

        * m4macros/glib-2.0.m4
        * m4macros/glib-gettext.m4: quote AC_DEFUN macro names so automake
        1.8 won't whine at us.
2004-01-28 02:46:30 +00:00
Matthias Clasen
355807fff6 Quote macro names to support reading the file multiple times. (#125537)
Sun Dec 21 22:57:58 2003  Matthias Clasen  <maclas@gmx.de>

	* m4macros/glib-gettext.m4: Quote macro names to support
	reading the file multiple times.  (#125537)
2003-12-21 21:57:32 +00:00
Owen Taylor
9d8e67597c Add $INTLLIBS to $LIBS temporarily, not -lintl. (Problem with fix for
Tue Aug 19 09:42:06 2003  Owen Taylor  <otaylor@redhat.com>

        * m4macros/glib-gettext.m4: Add $INTLLIBS to $LIBS
        temporarily, not -lintl. (Problem with fix for
        #119171, pointed out by James Henstridge)
2003-08-19 13:45:33 +00:00
Owen Taylor
ba0c0d91f7 Set $LIBS to include -lintl when checking for dcgettext and
Thu Aug  7 15:01:09 2003  Owen Taylor  <otaylor@redhat.com>

        * m4macros/glib-gettext.m4: Set $LIBS to include
        -lintl when checking for dcgettext and
        _nl_msg_cat_cntr. (Tim Mooney, #119171)
2003-08-07 19:10:41 +00:00
Hidetoshi Tajima
3bfb73d477 Test for Solaris native gettext in libc, seeing if it supports GNU catalog
Fri Jun  6 10:24:23 2003  Hidetoshi Tajima  <hidetoshi.tajima@sun.com>

	* m4macros/glib-gettext.m4: Test for Solaris native gettext
	in libc, seeing if it supports GNU catalog format (#85217).
2003-06-06 17:31:50 +00:00
Owen Taylor
b3ec0170ab Backport better handling of ALL_LINGUAS from gettext.m4. (#103808, Andras
Fri May 30 19:09:25 2003  Owen Taylor  <otaylor@redhat.com>

        * m4macros/glib-gettext.m4: Backport better handling
        of ALL_LINGUAS from gettext.m4. (#103808, Andras Salamon)
2003-05-30 23:13:55 +00:00
Owen Taylor
f558a8cc11 expand $exec_prefix as well as $prefix. (#107290, reported by Morten
Fri May 30 18:46:05 2003  Owen Taylor  <otaylor@redhat.com>

        * m4macros/glib-gettext.m4: expand $exec_prefix as
        well as $prefix. (#107290, reported by Morten Welinder,
        patch from Raja Harinath)
2003-05-30 22:49:13 +00:00
Owen Taylor
ceca3f430b If msgfmt isn't found, unset gt_cv_have_gettext. (#102552, Tim Mooney)
Tue Jan 28 16:08:56 2003  Owen Taylor  <otaylor@redhat.com>

        * m4macros/glib-gettext.m4: If msgfmt isn't found,
        unset gt_cv_have_gettext. (#102552, Tim Mooney)
2003-01-28 21:13:43 +00:00
Owen Taylor
be29f0e43e AC_SUBST() DATADIRNAME, not DATADIR.
Sun Dec 15 19:51:58 2002  Owen Taylor  <otaylor@redhat.com>

        * m4macros/glib-gettext.m4: AC_SUBST() DATADIRNAME, not
        DATADIR.
2002-12-16 00:53:45 +00:00
Owen Taylor
0b2996bc75 Restore a missing AC_SUBST() for DATADIRNAME. (Found by Kjartan Maraas)
Sun Dec 15 19:22:58 2002  Owen Taylor  <otaylor@redhat.com>

        * m4macros/glib-gettext.m4: Restore a missing AC_SUBST()
        for DATADIRNAME. (Found by Kjartan Maraas)
2002-12-16 00:25:26 +00:00
Owen Taylor
1cac48d3a8 Actually set INTLLIBS when needed. (Reported by Tor Lillqvist)
Sun Dec 15 11:24:29 2002  Owen Taylor  <otaylor@redhat.com>

	* m4macros/glib-gettext.m4: Actually set INTLLIBS
	when needed. (Reported by Tor Lillqvist)
2002-12-15 16:26:58 +00:00
Owen Taylor
42f04422b0 Fixes from Johannes Stezenbach [...] Remove a stray setting of $LIBS.
Thu Dec 12 23:08:29 2002  Owen Taylor  <otaylor@redhat.com>

        Fixes from Johannes Stezenbach
[...]
        * m4macros/glib-gettext.m4: Remove a stray setting of $LIBS.
2002-12-15 02:51:33 +00:00
Owen Taylor
98ccd05da3 AC_PREREQ(2.53) here; convinces Debian's wrappers to use the right
Thu Dec 12 13:52:58 2002  Owen Taylor  <otaylor@redhat.com>

        * m4macros/glib-gettext.m4: AC_PREREQ(2.53) here; convinces
        Debian's wrappers to use the right autoconf for atk, etc.
        (Reported by Jody Goldberg)
2002-12-12 18:59:54 +00:00
Owen Taylor
0aa7b51ef3 Unset ac_cv_func_bind_textdomain_codeset before calling
Wed Dec 11 17:49:15 2002  Owen Taylor  <otaylor@redhat.com>

        * m4macros/glib-gettext.m4: Unset
        ac_cv_func_bind_textdomain_codeset before calling
        AC_CHECK_FUNCS(bind_textdomain_codeset) again.

        * configure.in: Remove duplicate call to
        AC_CHECK_FUNCS(bind_textdomain_codeset)
2002-12-11 22:51:37 +00:00
Owen Taylor
d67044c391 Factor out repeated thread test into a m4_define(); when cross-compiling,
Wed Dec 11 15:10:25 2002  Owen Taylor  <otaylor@redhat.com>

        * configure.in: Factor out repeated thread test into
        a m4_define(); when cross-compiling, assume that
        AC_LINK_IFELSE() is good enough for thinking that
        -pthread[s] is OK. (More of #58786)

        * m4macros/glib-gettext.m4: Fix typo. (Manish Singh)
2002-12-11 20:28:46 +00:00
Owen Taylor
b275382769 Version 2.1.4, interface age 1.
Wed Dec 11 14:28:50 2002  Owen Taylor  <otaylor@redhat.com>

        * configure.in: Version 2.1.4, interface age 1.

        * m4macros/glib-gettext.m4: Major rewrite; remove leftovers
        from building intl/, prefer libintl if both libc and libintl
        have dgettext and libintl also has bind_textdomain_codeset().
        (#70627)

        * configure.in acinclude.m4: Use an include to avoid having
        to duplicate the gettext macros between glib-gettext.m4
        and acinclude.m4.

        * m4macros/glib-gettext.m4: Do some tricks so that configure.in
        can use macros under hidden names, but aclocal will still
        find them when installed.

        * m4macros/glib-gettext.m4: Add AM_GLIB_DEFINE_LOCALEDIR
        to encapsulate install location of catalog files.

        * m4macros/glib-gettext.m4 (AM_GLIB_DEFINE_LOCALEDIR):
        Fix bug where if --prefix wasn't set on the configure line,
        GLib would look for translations in NONE/share/locale.
2002-12-11 19:42:31 +00:00
jacob berkman
5a5df3aaa3 fix tyop
2002-05-22  jacob berkman  <jacob@ximian.com>

	* m4macros/glib-gettext.m4 (AM_GLIB_WITH_NLS): fix tyop
2002-05-22 23:11:13 +00:00
Owen Taylor
71e5efb9cb Remove notes about now-fixed-bugs.
Wed May 22 15:40:47 2002  Owen Taylor  <otaylor@redhat.com>

        * README.in: Remove notes about now-fixed-bugs.

        * m4macros/glib-gettext.m4 acinclude.m4: Get rid
        of AC_MSG_NOTICE() usage, since some broken systems
        (Hi Debian!) might not be using autoconf-2.5x for
        downstream packages even though we require it for
        glib itself.

        * INSTALL.in: Add a note about installing extra
        converters for Solaris.

        * glib/gutils.h (g_bit_nth_msf): Fix termination
        condition. (#82582, Paolo Molaro)

Wed May 22 15:24:04 2002  Owen Taylor  <otaylor@redhat.com>

        * README.translators: Add from GTK+.

        * *.po: Convert all po files to UTF-8.
2002-05-22 19:52:41 +00:00
Owen Taylor
679d9be8a5 Move iconv tests before gettext checks. (#81999)
Mon May 20 18:02:46 2002  Owen Taylor  <otaylor@redhat.com>

        * configure.in: Move iconv tests before gettext
        checks. (#81999)

        * m4macros/glib-gettext.m4 acinclude.m4: If we can't
        link to gettext, try adding in -liconv. (#80076,
        Boyd Lynn Gerber)

        * m4macros/glib-gettext.m4 acinclude.m4: Suppress
        warnings about xgettext not being GNU gettext when
        libintl wasn't found at all.
        (#79016, Andrew P. Lentvorski, Jr.)
2002-05-21 19:09:37 +00:00
Owen Taylor
93cc655dab Incorporate AM_LC_MESSAGES, AM_PATH_PROG_WITH_TEST as AM_GLIB_* to avoid
Thu May 16 12:24:00 2002  Owen Taylor  <otaylor@redhat.com>

        * acinclude.m4 m4macros/glib-gettext.m4: Incorporate
        AM_LC_MESSAGES, AM_PATH_PROG_WITH_TEST as AM_GLIB_* to avoid
        dependencies on gettext m4 files. (#81885, Hidetoshi Tajima.)
2002-05-16 16:29:37 +00:00
James Henstridge
b0db44badc add third argument to the AC_DEFINE calls, so users of the macro don't
2002-02-14  James Henstridge  <james@daa.com.au>

	* m4macros/glib-gettext.m4: add third argument to the AC_DEFINE
	calls, so users of the macro don't need to add entries to
	acconfig.h in their package.
2002-02-14 00:28:02 +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
Sven Neumann
a1ebb7048f acinclude.m4 removed the --disable-nls option. You can't disable Native
2002-01-16  Sven Neumann  <sven@gimp.org>

        * acinclude.m4
        * m4macros/glib-gettext.m4: removed the --disable-nls option. You
        can't disable Native Language Support since we rely on it.

        * configure.in: nicer --help output.
2002-01-16 19:29:16 +00:00
Owen Taylor
a9b48f3327 Fixes for compilation on Solaris (#59026, Frank Belew)
Tue Sep 18 18:23:02 2001  Owen Taylor  <otaylor@redhat.com>

        Fixes for compilation on Solaris (#59026, Frank Belew)

        * glib/gqsort.c (g_qsort_with_data): Use g_alloca().

        * glib/giochannel.c (g_io_channel_read_to_end): Fix use
        of ternary on left-hand-side.

        * configure.in: Handle the ac_cv_working_alloca_h variable
        set by autoconf-2.5x.

Tue Sep 11 18:50:44 2001  Owen Taylor  <otaylor@redhat.com>

        * m4macros/glib-gettext.m4 acinclude.m4: Remove commented
        out sections for clarity.
2001-09-18 22:28:32 +00:00
Owen Taylor
2ab0ce294d Fix problem with --disable-nls.
Wed Jan 31 13:46:58 2001  Owen Taylor  <otaylor@redhat.com>

	* acinclude.m4 glib-gettext.m4: Fix problem with --disable-nls.
2001-01-31 19:18:48 +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