Commit Graph

39 Commits

Author SHA1 Message Date
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
Owen Taylor
83fbec4d46 [ merged from stable ]
Mon May  6 11:48:08 2002  Owen Taylor  <otaylor@redhat.com>

	[ merged from stable ]

        * Makefile.am (EXTRA_DIST): Add ChangeLog.pre-2-0 (#78641)

        * m4macros/glib-2.0.m4: save CFLAGS/LIBS properly when
        compiling "what went wrong" test case. (#79330)

        * m4macros/glib-2.0.m4: Remove reference to editing
        pkg-config script. (From Jim Gettys)

        * configure.in: (Look for dyld interfaces before dlopen()
        since OS X can have both. Patch from Jacob Berkman,
        #80438)
2002-05-06 16:07:03 +00:00
Owen Taylor
fc8fd6f8cb Default to --disable-gtk-doc, to avoid Jade setup hassles.
Sun Mar  3 21:09:24 2002  Owen Taylor  <otaylor@redhat.com>

        * configure.in: Default to --disable-gtk-doc, to avoid
        Jade setup hassles.

        * autogen.sh: Add --enable-gtk-doc.

        * configure.in: Default to --disable-static to go
        along with Pango, GTK+ where we need to do that for
        bin-compat reasons.

        * Makefile.am: Add a slightly modified distcheck rule
        that passes --enable-gtk-doc to the configure inside.
        (So that 'make dist' succeeds inside.)

        * configure.in *.pc.in **/Makefile.am m4macros/glib-2.0.m4
        tests/makefile.mingw.in: Switch everything over to
        glib-2.0.
2002-03-05 05:18:23 +00:00
Sven Neumann
576fb70b5a nicer output of configure --help.
2002-02-28  Sven Neumann  <sven@gimp.org>

	* m4macros/glib-2.0.m4: nicer output of configure --help.
2002-02-28 10:03:24 +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
227ae2a96c Don't try to use PKG_CONFIG when we didn't find it. (#62944, Eric Lemings)
Mon Oct 29 11:29:37 2001  Owen Taylor  <otaylor@redhat.com>

        * m4macros/glib-2.0.m4: Don't try to use PKG_CONFIG
        when we didn't find it. (#62944, Eric Lemings)

        * m4macros/glib-2.0.m4: Fix problem with spaces around =
        sign in assignment. (#63209, Arkadiusz Miskiewicz)
2001-10-29 16:48:40 +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
Darin Adler
07638db802 Update location of pkgconfig from sourceforge.net to new location at
* configure.in:
	* m4macros/glib-2.0.m4:
	Update location of pkgconfig from sourceforge.net to new
	location at freedeskop.org.
2001-07-26 20:11:42 +00:00
Havoc Pennington
fab889b14d subst GLIB_GENMARSHAL, GOBJECT_QUERY, GLIB_MKENUMS variables
2001-06-07  Havoc Pennington  <hp@redhat.com>

	* m4macros/glib-2.0.m4: subst GLIB_GENMARSHAL, GOBJECT_QUERY,
	GLIB_MKENUMS variables

	* gmodule-2.0.pc.in: add gmodule_supported variable

	* glib-2.0.pc.in: add glib_genmarshal, gobject_query,
	glib_mkenums variables

	* configure.in: put G_MODULE_SUPPORTED value into
	.pc files

	* autogen.sh: support AUTOGEN_SUBDIR_MODE

	* Makefile.am: add -uninstalled.pc.in to EXTRA_DIST

2001-06-07  Havoc Pennington  <hp@redhat.com>

	* pango/Makefile.am: add libpango.la to _DEPENDENCIES for the
	other libs

	* configure.in: use AM_PATH_GLIB_2_0

	* autogen.sh: support AUTOGEN_SUBDIR_MODE

	* Makefile.am: dist the .pc.in files

2001-06-07  Havoc Pennington  <hp@redhat.com>

	* atk/Makefile.am: use @GLIB_GENMARSHAL@ so we can use uninstalled
	glib-genmarshal

	* configure.in: rearrange the library checks to support
	uninstalled linking

	* autogen.sh: add support for AUTOGEN_SUBDIR_MODE

	* atk-uninstalled.pc.in: new file, allows linking to uninstalled
	ATK in giant GTK tarball

2001-06-07  Havoc Pennington  <hp@redhat.com>

	* tests/Makefile.am: add missing -I flag

	* gtk/Makefile.am: use @GLIB_MKENUMS@, @GLIB_GENMARSHAL@, etc.

	* configure.in: use pkg-config to see if GModule is
	supported; fix to properly turn on included loaders
	when GModule isn't supported; don't use AC_CHECK_LIB
	when libs are not installed yet

	* autogen.sh: add support for AUTOGEN_SUBDIR_MODE

	* Makefile.am (SUBDIRS): add m4macros subdir

	* gtk/Makefile.am: $(srcdir)/foo targets must be $(srcdir)/foo in
	dependencies also.
2001-06-07 16:39:54 +00:00
Michael Natterer
8bba5ab5de Added missing .cvsignore file. 2001-05-17 12:19:09 +00:00
Havoc Pennington
348c8f102f m4macros/Makefile
2001-05-15  Havoc Pennington  <hp@redhat.com>

	* configure.in (AC_OUTPUT): m4macros/Makefile

	* m4macros/Makefile.am, m4macros/glib-2.0.m4,
	m4macros/glib-gettext.m4:
	m4 files moved here on server, Makefile.am added

	This is so you can aclocal -I m4macros while avoiding acinclude.m4

	* Makefile.am: add m4macros subdir, remove references to glib-2.0.m4
2001-05-15 22:07:21 +00:00
Owen Taylor
525689823d Remove warnings about conflicts with the stable version.
Mon Apr 16 12:04:52 2001  Owen Taylor  <otaylor@redhat.com>

        * configure.in: Remove warnings about conflicts with the
        stable version.

	 * glib-2.0.m4: Fix some of the error text to be halfway
        up to date.

        * README.in INSTALL.in: Add these to generate README, INSTAL
        (as in the stable branch). Update.

	  * HACKING: Update.
2001-04-17 00:55:34 +00:00
Havoc Pennington
988dd88495 put AC_PATH_PROG(pkg-config) before "Checking for glib" so the output
2001-04-16  Havoc Pennington  <hp@redhat.com>

	* glib-2.0.m4: put AC_PATH_PROG(pkg-config) before "Checking for
	glib" so the output looks right
2001-04-16 15:21:19 +00:00
Alexander Larsson
88c035caa5 Pass pkg-config options before the other args so it works even if
2001-04-11  Alexander Larsson  <alexl@redhat.com>

	* glib-2.0.m4: Pass pkg-config options
	before the other args so it works even if
	POSIXLY_CORRECT is set.
2001-04-11 14:58:29 +00:00
Owen Taylor
c13277dc75 Exit with an error message that you should use pkg-config instead.
Tue Apr  3 12:38:16 2001  Owen Taylor  <otaylor@redhat.com>

	* glib-config-2.0.in: Exit with an error message that you
	should use pkg-config instead.

	* configure.in (PACKAGE): Require pkg-config.

	* tests/Makefile.am (EXTRA_DIST): Add utf8.txt.

	* configure.in (GLIB_MICRO_VERSION): Up MICRO to 3,
	leave interface/binary at 0.
2001-04-03 18:27:59 +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
Owen Taylor
eb023508ad Move glib-config to glib-config-2.0 move glib.m4 to glib-2.0.m4
Fri Jul 14 12:22:49 2000  Owen Taylor  <otaylor@redhat.com>

	* configure.in Makefile.am glib-config.m4 glib.m4: Move
	glib-config to glib-config-2.0 move glib.m4 to
	glib-2.0.m4

	* Makefile.am gobject/Makefile.am gmodule/Makefile.am
	gthread/Makefile.am tests/Makefile.am: Change
	library names to libglib-1.3.la, etc, so that we
	can distinguish glib-1.2 and glib-2.0 on the linkline.

	* Makefile.am gobject/Makefile.am gmodule/Makefile.am:
	Move include files into /usr/include/glib-2.0.

Thu Jul  6 18:54:49 2000  Owen Taylor  <otaylor@redhat.com>

	* docs/Makefile.am (EXTRA_DIST): Remove info files
	from the build.
2000-07-14 19:22:54 +00:00