The requirement for gettext 0.18 was introduced by commit e3e16717
to pass --no-wrap option to msgmerge tool, which I guess improves
the process of updating po files for translators. At the same time,
unfortunately, it makes building from git fail on a RHEL/CentOS 6
system, as it comes with gettext 0.17.
Use the existing hack in autogen.sh to allow building with gettext 0.17,
with an appropriate warning so that the user is aware:
warning: forcing autopoint to use old gettext 0.17
The only negative side effect of this patch I am aware of is
if gettext-0.17 is used, then --no-wrap is not being passed
to msgmerge (although msgmerge 1.17 already supports it), because
Makefile.in.in that comes with gettext 0.17 doesn't have MSGMERGE_OPTIONS.
From my POV, this is way better than to not being able to build.
NOTE if gettext 0.18.3 is installed, it is used and this patch
doesn't change anything; it only allows gettext 1.17 to be used
if this is all we have.
Cc: Benno Schulenberg <bensberg@justemail.net>
Cc: Sami Kerola <kerolasa@iki.fi>
Signed-off-by: Kir Kolyshkin <kir@openvz.org>
The system libtool program has architecture dependent behaviour. It is
therefore unavailable in cross build environments. The only place it was
used in util-linux is autogen.sh to determine the availability of
libtool. All other places correctly use libtoolize or
$(top_builddir)/libtool.
Signed-off-by: Helmut Grohne <helmut@subdivi.de>
We avoid or fix many portability issues.
The first more generic "sort --version-sort" solution was almost
useless anyway because autopoint itself can also only deal with
a few hardcoded versions.
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
We add a little hack for backward compatibility on systems with
older gettext installed
See 0576dbd3 and 81ed13ed.
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
The commit will will use `You must have libtool version...' message
when libtoolize is missing. Earlier the error message less helpful.
./autogen.sh: line 59: test: =: unary operator expected
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
The script is copied as is from gnulib.
[kzak@redhat.com: - generate .tarball-version and .version files in
top level Makefile.am
- delete autom4te.cache in autogen.sh]
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Signed-off-by: Karel Zak <kzak@redhat.com>
Fix to the ./configure warning which has been printed since
autotools version 2.59c (released at April 2006).
WARNING: 'po/Makefile.in.in' seems to ignore the --datarootdir setting
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Signed-off-by: Karel Zak <kzak@redhat.com>
The commit 60a4edd662 temporary disabled
libtool-2 in autogen.sh. It seems that libtool-2 in available in
many distributions now, so we don't have to manage the generated .m4
libtool files in git anymore.
Signed-off-by: Karel Zak <kzak@redhat.com>
Currently gtk-doc is optional. Unfortunately, the ./configure script
still depends on GTK_DOC_CHECK macro and shlibs/blkid/docs/Makefile.am
depends on gtk-doc.make.
It seems that the best solution is to add gtk-doc.[make,m4] files to
the repository.
Signed-off-by: Karel Zak <kzak@redhat.com>
We require libtool-2 (because old 1.5.x is crap). Unfortunately,
libtool-2 is still not available in many Linux distributions -- now I
see it in unstable distributions only. The painless way how to resolve
this problem is to __temporary__ commit generated libtool-2 stuff to
our repository.
Signed-off-by: Karel Zak <kzak@redhat.com>
We need an infrastructure for stared libraries. The latest libtool-2
seems useful and it's definitely better than the old 1.5 crap.
You need to install libtool-2 when you want to run ./autogen.sh script
after checkout from git repository.
Signed-off-by: Karel Zak <kzak@redhat.com>
With this patch, you can define autotool options when you
need to generate build-system. For example:
$ AM_OPTS="--copy" ./autogen.sh
Signed-off-by: Karel Zak <kzak@redhat.com>
"automake" calls "autoconf" internally, to trace the expansion of
configure.ac. So it is more natural to call "autoconf" before
"automake".
Signed-off-by: Stepan Kasal <skasal@redhat.com>
The cal command generates output that depends on time(). For reliable
regression tests we need to use still same time. It seems that LD_PRELOAD is
pretty simple way.
Signed-off-by: Karel Zak <kzak@redhat.com>
The generated autotools stuff shouldn't be maintained by SCM. After check out
from git use ./autogen.sh. For more details see README.devel.
Signed-off-by: Karel Zak <kzak@redhat.com>