← Back to branch summary

~ubuntu-branches/ubuntu/maverick/gnome-nettool/maverick-proposed

« back to all changes in this revision

Viewing changes to m4/intltool.m4

  • Committer: Bazaar Package Importer
  • Author(s): Baptiste Mille-Mathias
  • Date: 2009-01-08 21:11:25 UTC
  • mfrom: (1.1.18 upstream)
  • Revision ID: james.westby@ubuntu.com-20090108211125-otfcdol4y3irrwi9
Tags: 2.25.3-0ubuntu1
https://launchpad.net/bugs/315566
* New upstream version (LP: #315566)
* debian/control.in:
  - add libgtop2-dev in Build-Depends
* debian/patches/02_lpi.patch:
  - updated
* debian/patches/03_autoconf.patch:
  - updated

Show diffs side-by-side

added added

removed removed

Lines of Context:
m4/intltool.m4
24
24
 
25
25
dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
26
26
# serial 40 IT_PROG_INTLTOOL
27
 
AC_DEFUN([IT_PROG_INTLTOOL],
28
 
[AC_PREREQ([2.50])dnl
 
27
AC_DEFUN([IT_PROG_INTLTOOL], [
 
28
AC_PREREQ([2.50])dnl
 
29
AC_REQUIRE([AM_NLS])dnl
29
30
 
30
31
case "$am__api_version" in
31
32
    1.[01234])
98
99
AC_PATH_PROG(XGETTEXT, xgettext)
99
100
AC_PATH_PROG(MSGMERGE, msgmerge)
100
101
AC_PATH_PROG(MSGFMT, msgfmt)
 
102
AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
101
103
if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
102
104
    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
103
105
fi
169
171
dnl of config.status.
170
172
AC_CONFIG_COMMANDS_PRE([
171
173
  AC_CONFIG_COMMANDS([$1/stamp-it], [
 
174
    if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" ]; then
 
175
       AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
 
176
    fi
172
177
    rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
173
178
    >"$1/stamp-it.tmp"
174
179
    [sed '/^#/d
177
182
        '"s|^|  $ac_top_srcdir/|" \
178
183
      "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
179
184
    ]
180
 
    if test ! -f "$1/Makefile"; then
181
 
      AC_MSG_ERROR([$1/Makefile is not ready.])
182
 
    fi
183
 
    mv "$1/Makefile" "$1/Makefile.tmp"
184
185
    [sed '/^POTFILES =/,/[^\\]$/ {
185
186
                /^POTFILES =/!d
186
187
                r $1/POTFILES
187
188
          }
188
 
         ' "$1/Makefile.tmp" >"$1/Makefile"]
 
189
         ' "$1/Makefile.in" >"$1/Makefile"]
189
190
    rm -f "$1/Makefile.tmp"
190
191
    mv "$1/stamp-it.tmp" "$1/stamp-it"
191
192
  ])
192
193
])dnl
193
194
])
194
195
 
195
 
 
196
196
# deprecated macros
197
197
AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
198
198
# A hint is needed for aclocal from Automake <= 1.9.4: