mirror of https://github.com/GNOME/gimp.git
Bug 790261 - autogen.sh non-portable use of echo -n.
The reporter notes in particular that the -n option does not work appropriately on recent versions of macOS. From what I know, echo without any option is the most portable. But when options are needed, there are too many variants of the command out there, and printf becomes more reliable and consistent across platforms. It is more recent than echo and therefore non-portable for very very old platforms, but let's assume/hope that it old-enough for not being a problem anymore.
This commit is contained in:
parent
7da24fd97b
commit
d6c72d0f71
12
autogen.sh
12
autogen.sh
|
@ -89,7 +89,7 @@ case $OS in
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
echo -n "checking for libtool >= $LIBTOOL_REQUIRED_VERSION ... "
|
printf "checking for libtool >= $LIBTOOL_REQUIRED_VERSION ... "
|
||||||
if ($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1; then
|
if ($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1; then
|
||||||
LIBTOOLIZE=$LIBTOOLIZE
|
LIBTOOLIZE=$LIBTOOLIZE
|
||||||
elif (glibtoolize --version) < /dev/null > /dev/null 2>&1; then
|
elif (glibtoolize --version) < /dev/null > /dev/null 2>&1; then
|
||||||
|
@ -122,7 +122,7 @@ done
|
||||||
if test x$enable_gtk_doc = xno; then
|
if test x$enable_gtk_doc = xno; then
|
||||||
echo "skipping test for gtkdocize"
|
echo "skipping test for gtkdocize"
|
||||||
else
|
else
|
||||||
echo -n "checking for gtkdocize ... "
|
printf "checking for gtkdocize ... "
|
||||||
if (gtkdocize --version) < /dev/null > /dev/null 2>&1; then
|
if (gtkdocize --version) < /dev/null > /dev/null 2>&1; then
|
||||||
echo "yes"
|
echo "yes"
|
||||||
else
|
else
|
||||||
|
@ -138,7 +138,7 @@ else
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo -n "checking for autoconf >= $AUTOCONF_REQUIRED_VERSION ... "
|
printf "checking for autoconf >= $AUTOCONF_REQUIRED_VERSION ... "
|
||||||
if ($AUTOCONF --version) < /dev/null > /dev/null 2>&1; then
|
if ($AUTOCONF --version) < /dev/null > /dev/null 2>&1; then
|
||||||
VER=`$AUTOCONF --version | head -n 1 \
|
VER=`$AUTOCONF --version | head -n 1 \
|
||||||
| grep -iw autoconf | sed "s/.* \([0-9.]*\)[-a-z0-9]*$/\1/"`
|
| grep -iw autoconf | sed "s/.* \([0-9.]*\)[-a-z0-9]*$/\1/"`
|
||||||
|
@ -153,7 +153,7 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
echo -n "checking for automake >= $AUTOMAKE_REQUIRED_VERSION ... "
|
printf "checking for automake >= $AUTOMAKE_REQUIRED_VERSION ... "
|
||||||
if ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1; then
|
if ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1; then
|
||||||
AUTOMAKE=$AUTOMAKE
|
AUTOMAKE=$AUTOMAKE
|
||||||
ACLOCAL=$ACLOCAL
|
ACLOCAL=$ACLOCAL
|
||||||
|
@ -185,7 +185,7 @@ if test x$AUTOMAKE != x; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
echo -n "checking for intltool >= $INTLTOOL_REQUIRED_VERSION ... "
|
printf "checking for intltool >= $INTLTOOL_REQUIRED_VERSION ... "
|
||||||
if (intltoolize --version) < /dev/null > /dev/null 2>&1; then
|
if (intltoolize --version) < /dev/null > /dev/null 2>&1; then
|
||||||
VER=`intltoolize --version \
|
VER=`intltoolize --version \
|
||||||
| grep intltoolize | sed "s/.* \([0-9.]*\)/\1/"`
|
| grep intltoolize | sed "s/.* \([0-9.]*\)/\1/"`
|
||||||
|
@ -200,7 +200,7 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
echo -n "checking for xsltproc ... "
|
printf "checking for xsltproc ... "
|
||||||
if (xsltproc --version) < /dev/null > /dev/null 2>&1; then
|
if (xsltproc --version) < /dev/null > /dev/null 2>&1; then
|
||||||
echo "yes"
|
echo "yes"
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue