← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/gcalctool/intrepid

« back to all changes in this revision

Viewing changes to m4/intltool.m4

  • Committer: Bazaar Package Importer
  • Author(s): Christophe Sauthier
  • Date: 2008-05-29 14:01:24 UTC
  • mfrom: (1.1.37 upstream)
  • Revision ID: james.westby@ubuntu.com-20080529140124-7jsz1j2kuw0oldbc
Tags: 5.22.2-0ubuntu1
https://launchpad.net/bugs/235741
https://launchpad.net/bugs/189101
https://launchpad.net/bugs/53214
https://launchpad.net/bugs/44756
https://launchpad.net/bugs/215580
* New upstream version (LP: #235741)
  - Correct number presentation, once the "Show Thousands Separator" option
  is activited. (LP: #189101, #53214, #44756)
  - Correctly populate the constant and function menus (LP: #215580)
* Removal of 03_fix_power_interpretation) since it has been incorporated
  uptream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
m4/intltool.m4
87
87
AC_SUBST(INTLTOOL_SERVICE_RULE)
88
88
AC_SUBST(INTLTOOL_POLICY_RULE)
89
89
 
 
90
# Check the gettext tools to make sure they are GNU
 
91
AC_PATH_PROG(XGETTEXT, xgettext)
 
92
AC_PATH_PROG(MSGMERGE, msgmerge)
 
93
AC_PATH_PROG(MSGFMT, msgfmt)
 
94
if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
 
95
    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
 
96
fi
 
97
xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
 
98
mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
 
99
mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
 
100
if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
 
101
    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
 
102
fi
 
103
 
90
104
# Use the tools built into the package, not the ones that are installed.
91
105
AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
92
106
AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge')