autogen.sh | 10 ++++++++-- configure.ac | 1 - 2 files changed, 8 insertions(+), 3 deletions(-)
New commits: commit b301478a69d961c724a4875b839a81fb458d1153 Author: Behdad Esfahbod <[email protected]> Date: Tue Aug 2 11:25:13 2011 -0400 Bug 39763 - autogen.sh should check pkg-config availability (and revert change have_icu change I mistakenly pushed out) diff --git a/autogen.sh b/autogen.sh index cdebe07..833a621 100755 --- a/autogen.sh +++ b/autogen.sh @@ -13,14 +13,20 @@ which ragel || { 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... " which autoreconf || { echo "*** No autoreconf found, please install it ***" exit 1 } -echo "running autoreconf" -autoreconf --force --install || exit $? +echo "running autoreconf --force --install --verbose" +autoreconf --force --install --verbose || exit $? cd $olddir echo "running configure $@" diff --git a/configure.ac b/configure.ac index 882d218..d2a2331 100644 --- a/configure.ac +++ b/configure.ac @@ -104,7 +104,6 @@ dnl ========================================================================== PKG_CHECK_MODULES(ICU, icu, have_icu=true, [ AC_CHECK_PROG([have_icu], [icu-config], [true], [false]) - have_icu=false if $have_icu; then icu_cflags=`icu-config --cppflags` icu_libs=`icu-config --ldflags-libsonly` _______________________________________________ HarfBuzz mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/harfbuzz
