Changeset 152163 in webkit

Timestamp:

Jun 28, 2013 6:31:47 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[Autotools] Properly quote harfbuzz-icu pkg-config check
​https://bugs.webkit.org/show_bug.cgi?id=118186

Patch by Sean Bright <​sean@malleable.com> on 2013-06-28
Reviewed by Carlos Garcia Campos.

A secondary test was added in r150963 to check for harfbuzz-icu
when it was split into two packages, but the test is not properly
quoted. If the test fails you get an error about missing
version "./configure.9.8" instead of the expected "0.9.8."

• Source/autotools/FindDependencies.m4:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/autotools/FindDependencies.m4 (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2013-06-28  Sean Bright  <sean@malleable.com>
+
+        [Autotools] Properly quote harfbuzz-icu pkg-config check
+        https://bugs.webkit.org/show_bug.cgi?id=118186
+
+        Reviewed by Carlos Garcia Campos.
+
+        A secondary test was added in r150963 to check for harfbuzz-icu
+        when it was split into two packages, but the test is not properly
+        quoted.  If the test fails you get an error about missing
+        version "./configure.9.8" instead of the expected "0.9.8."
+
+        * Source/autotools/FindDependencies.m4:
+
 2013-06-27  Christophe Dumez  <ch.dumez@sisa.samsung.com>
 

trunk/Source/autotools/FindDependencies.m4

@@ -379 +379 @@
 # Since we support earlier HarfBuzz versions we keep this conditional for now.
 if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz; then
-    PKG_CHECK_MODULES(HARFBUZZ_ICU, harfbuzz-icu >= $harfbuzz_required_version)
+    PKG_CHECK_MODULES([HARFBUZZ_ICU], [harfbuzz-icu >= harfbuzz_required_version])
     FREETYPE_CFLAGS="$FREETYPE_CFLAGS $HARFBUZZ_ICU_CFLAGS"
     FREETYPE_LIBS="$FREETYPE_LIBS $HARFBUZZ_ICU_LIBS"