walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bug 39763 - autogen.sh should check pkg-config availability 

(and revert change have_icu change I mistakenly pushed out)
This commit is contained in:
Behdad Esfahbod 2011-08-02 11:25:13 -04:00
parent f60271c0c2
commit b301478a69
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
autogen.sh
View File

@ -13,14 +13,20 @@ which ragel || {
exit 1 exit 1
} }
echo -n "checking for pkg-config... "
which pkg-config || {
echo "*** No pkg-config found, please install it ***"
exit 1
}
echo -n "checking for autoreconf... " echo -n "checking for autoreconf... "
which autoreconf || { which autoreconf || {
echo "*** No autoreconf found, please install it ***" echo "*** No autoreconf found, please install it ***"
exit 1 exit 1
} }
echo "running autoreconf" echo "running autoreconf --force --install --verbose"
autoreconf --force --install || exit $? autoreconf --force --install --verbose || exit $?
cd $olddir cd $olddir
echo "running configure $@" echo "running configure $@"

1
configure.ac
View File

@ -104,7 +104,6 @@ dnl ==========================================================================
PKG_CHECK_MODULES(ICU, icu, have_icu=true, [ PKG_CHECK_MODULES(ICU, icu, have_icu=true, [
AC_CHECK_PROG([have_icu], [icu-config], [true], [false]) AC_CHECK_PROG([have_icu], [icu-config], [true], [false])
have_icu=false
if $have_icu; then if $have_icu; then
icu_cflags=`icu-config --cppflags` icu_cflags=`icu-config --cppflags`
icu_libs=`icu-config --ldflags-libsonly` icu_libs=`icu-config --ldflags-libsonly`