Title: [152163] trunk
Revision
152163
Author
[email protected]
Date
2013-06-28 06:31:47 -0700 (Fri, 28 Jun 2013)

Log Message

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

Patch by Sean Bright <[email protected]> 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:

Modified Paths

Diff

Modified: trunk/ChangeLog (152162 => 152163)


--- trunk/ChangeLog	2013-06-28 12:28:00 UTC (rev 152162)
+++ trunk/ChangeLog	2013-06-28 13:31:47 UTC (rev 152163)
@@ -1,3 +1,17 @@
+2013-06-28  Sean Bright  <[email protected]>
+
+        [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  <[email protected]>
 
         Remove [NoInterfaceObject] from WorkerGlobalScope

Modified: trunk/Source/autotools/FindDependencies.m4 (152162 => 152163)


--- trunk/Source/autotools/FindDependencies.m4	2013-06-28 12:28:00 UTC (rev 152162)
+++ trunk/Source/autotools/FindDependencies.m4	2013-06-28 13:31:47 UTC (rev 152163)
@@ -378,7 +378,7 @@
 # HarfBuzz 0.9.18 splits harbuzz-icu into a separate library.
 # 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"
 fi
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to