Merge branch 'master' into 'master'

simplify libtoolize detection

See merge request medoc92/recoll!8
This commit is contained in:
Jean-Francois Dockes
2021-10-08 15:01:47 +00:00
+9 -6
View File
@@ -4,15 +4,18 @@ set -x
aclocal
if test X"$HOMEBREW_ENV" != X; then
glt=`which glibtoolize`
fi
if test X"$glt" != X; then
$glt --copy
# detect libtoolize on linux or glibtoolize in some systems
if (libtoolize --version) < /dev/null > /dev/null 2>&1; then
LIBTOOLIZE=libtoolize
elif (glibtoolize --version) < /dev/null > /dev/null 2>&1; then
LIBTOOLIZE=glibtoolize
else
libtoolize --copy
echo "libtoolize or glibtoolize was not found! Please install libtool." 1>&2
exit 1
fi
$LIBTOOLIZE --copy
automake --add-missing --force-missing --copy
autoconf
# Our ylwrap gets clobbered by the above.