Don't rely on GNU sed.
* autogen.sh: Don't use GNUisms while calling sed. Problem reported by Sean McBride.
This commit is contained in:
parent
5758688e87
commit
c32637222f
|
@ -1,3 +1,8 @@
|
||||||
|
2009-01-06 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
|
* autogen.sh: Don't use GNUisms while calling sed. Problem reported
|
||||||
|
by Sean McBride.
|
||||||
|
|
||||||
2009-01-06 Werner Lemberg <wl@gnu.org>
|
2009-01-06 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
* src/base/ftbitmap.c (FT_Bitmap_Convert): Handle FT_PIXEL_MODE_LCD
|
* src/base/ftbitmap.c (FT_Bitmap_Convert): Handle FT_PIXEL_MODE_LCD
|
||||||
|
|
18
autogen.sh
18
autogen.sh
|
@ -1,6 +1,6 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
# Copyright 2005, 2006, 2007, 2008 by
|
# Copyright 2005, 2006, 2007, 2008, 2009 by
|
||||||
# David Turner, Robert Wilhelm, and Werner Lemberg.
|
# David Turner, Robert Wilhelm, and Werner Lemberg.
|
||||||
#
|
#
|
||||||
# This file is part of the FreeType project, and may only be used, modified,
|
# This file is part of the FreeType project, and may only be used, modified,
|
||||||
|
@ -22,21 +22,21 @@ run ()
|
||||||
|
|
||||||
get_major_version ()
|
get_major_version ()
|
||||||
{
|
{
|
||||||
echo $1 | sed -e 's/\([0-9]\+\)\..*/\1/g'
|
echo $1 | sed -e 's/\([0-9][0-9]*\)\..*/\1/g'
|
||||||
}
|
}
|
||||||
|
|
||||||
get_minor_version ()
|
get_minor_version ()
|
||||||
{
|
{
|
||||||
echo $1 | sed -e 's/[0-9]\+\.\([0-9]\+\).*/\1/g'
|
echo $1 | sed -e 's/[0-9][0-9]*\.\([0-9][0-9]*\).*/\1/g'
|
||||||
}
|
}
|
||||||
|
|
||||||
get_patch_version ()
|
get_patch_version ()
|
||||||
{
|
{
|
||||||
# tricky: some version numbers don't include a patch
|
# tricky: some version numbers don't include a patch
|
||||||
# separated with a point, but something like 1.4-p6
|
# separated with a point, but something like 1.4-p6
|
||||||
patch=`echo $1 | sed -e 's/[0-9]\+\.[0-9]\+\.\([0-9]\+\).*/\1/g'`
|
patch=`echo $1 | sed -e 's/[0-9][0-9]*\.[0-9][0-9]*\.\([0-9][0-9]*\).*/\1/g'`
|
||||||
if test "$patch" = "$1"; then
|
if test "$patch" = "$1"; then
|
||||||
patch=`echo $1 | sed -e 's/[0-9]\+\.[0-9]\+\-p\([0-9]\+\).*/\1/g'`
|
patch=`echo $1 | sed -e 's/[0-9][0-9]*\.[0-9][0-9]*\-p\([0-9][0-9]*\).*/\1/g'`
|
||||||
# if there isn't any patch number, default to 0
|
# if there isn't any patch number, default to 0
|
||||||
if test "$patch" = "$1"; then
|
if test "$patch" = "$1"; then
|
||||||
patch=0
|
patch=0
|
||||||
|
@ -110,9 +110,9 @@ check_tool_version ()
|
||||||
}
|
}
|
||||||
|
|
||||||
if test ! -f ./builds/unix/configure.raw; then
|
if test ! -f ./builds/unix/configure.raw; then
|
||||||
echo "You must be in the same directory as \`autogen.sh'."
|
echo "You must be in the same directory as \`autogen.sh'."
|
||||||
echo "Bootstrapping doesn't work if srcdir != builddir."
|
echo "Bootstrapping doesn't work if srcdir != builddir."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# On MacOS X, the GNU libtool is named `glibtool'.
|
# On MacOS X, the GNU libtool is named `glibtool'.
|
||||||
|
@ -146,7 +146,7 @@ cd builds/unix
|
||||||
|
|
||||||
echo "generating \`configure.ac'"
|
echo "generating \`configure.ac'"
|
||||||
sed -e "s;@VERSION@;$freetype_major$freetype_minor$freetype_patch;" \
|
sed -e "s;@VERSION@;$freetype_major$freetype_minor$freetype_patch;" \
|
||||||
< configure.raw > configure.ac
|
< configure.raw > configure.ac
|
||||||
|
|
||||||
run aclocal -I . --force
|
run aclocal -I . --force
|
||||||
run $LIBTOOLIZE --force --copy --install
|
run $LIBTOOLIZE --force --copy --install
|
||||||
|
|
Loading…
Reference in New Issue