diff options
| author | Javier Jardón <jjardon@gnome.org> | 2016-07-12 01:40:59 +0100 |
|---|---|---|
| committer | Ondrej Holy <oholy@redhat.com> | 2016-08-11 08:16:01 +0200 |
| commit | 812f42e6bec9d9adf7c97d83fb55f0f0e4f3e3d6 (patch) | |
| tree | 5d508dfd7b9823ad51c9de84e5a779a61ee815be /configure.ac | |
| parent | c641009dec6873aed9bbc00c74936263148b5d4c (diff) | |
| download | gvfs-812f42e6bec9d9adf7c97d83fb55f0f0e4f3e3d6.tar.gz | |
build: Use upstream gettext instead intltool
See for more info:
https://wiki.gnome.org/MigratingFromIntltoolToGettext
Modified by Ondrej Holy.
https://bugzilla.gnome.org/show_bug.cgi?id=768707
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/configure.ac b/configure.ac index dcb0136b..8ab4fdce 100644 --- a/configure.ac +++ b/configure.ac @@ -87,35 +87,15 @@ if test "x$enable_gcr" != "xno"; then fi dnl **************************** -dnl *** Checks for intltool *** +dnl *** Checks for gettext *** dnl **************************** +AM_GNU_GETTEXT_VERSION([0.19.4]) +AM_GNU_GETTEXT([external]) -IT_PROG_INTLTOOL([0.35.0]) GETTEXT_PACKAGE=gvfs - AC_SUBST([GETTEXT_PACKAGE]) AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[The gettext domain name]) -AM_GLIB_GNU_GETTEXT - -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" -dnl AM_GLIB_DEFINE_LOCALEDIR(GVFS_LOCALEDIR) dnl **************************** dnl *** Checks for ssh stuff *** @@ -152,7 +132,7 @@ AC_ARG_ENABLE([admin], [AS_HELP_STRING([--disable-admin],[build without admin ba msg_admin=no if test "x$enable_admin" != "xno"; then - PKG_CHECK_MODULES([ADMIN], [polkit-gobject-1], [msg_admin=yes]) + PKG_CHECK_MODULES([ADMIN], [polkit-gobject-1 >= 0.114], [msg_admin=yes]) if test "x$msg_admin" = "xyes"; then AC_DEFINE([HAVE_ADMIN], 1, [Define to 1 if admin backend is going to be built]) |