diff options
| author | Javier Jardón <jjardon@gnome.org> | 2016-01-10 22:44:24 +0000 |
|---|---|---|
| committer | Javier Jardón <jjardon@gnome.org> | 2016-01-10 22:44:24 +0000 |
| commit | 4e78a0a9df45961701d224326fbb9b93dcecf134 (patch) | |
| tree | 12ec5a581c2f8fc10febad94f1a5fdf51815c21f /m4macros | |
| parent | edfb3ead7793dc3e7fdc0f8193126d1a5079be1a (diff) | |
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 e5c752371c7fb1343eff27b5f1d0bcbef4e333b9.
Diffstat (limited to 'm4macros')
| -rw-r--r-- | m4macros/Makefile.am | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/m4macros/Makefile.am b/m4macros/Makefile.am index f80622f74..971871ce7 100644 --- a/m4macros/Makefile.am +++ b/m4macros/Makefile.am @@ -2,16 +2,7 @@ include $(top_srcdir)/glib.mk installed_m4= glib-2.0.m4 glib-gettext.m4 gsettings.m4 -EXTRA_DIST += \ - $(installed_m4) \ - gettext.m4 \ - iconv.m4 \ - lib-ld.m4 \ - lib-link.m4 \ - lib-prefix.m4 \ - nls.m4 \ - po.m4 \ - progtest.m4 +EXTRA_DIST+=$(installed_m4) m4datadir = $(datadir)/aclocal m4data_DATA = $(installed_m4) |