Title: [151902] releases/WebKitGTK/webkit-2.0
- Revision
- 151902
- Author
- [email protected]
- Date
- 2013-06-24 02:04:32 -0700 (Mon, 24 Jun 2013)
Log Message
Merge r151791 - [GTK] remove bashism from configure
https://bugs.webkit.org/show_bug.cgi?id=117796
Reviewed by Gustavo Noronha Silva.
* Source/autotools/FindDependencies.m4: Perform string appending by redeclaring the base string to the value
of the base string followed by the string that's being appended. This replaces the use of the '+=' operator
that works under bash but is not supported by other shells.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.0/ChangeLog (151901 => 151902)
--- releases/WebKitGTK/webkit-2.0/ChangeLog 2013-06-24 08:44:12 UTC (rev 151901)
+++ releases/WebKitGTK/webkit-2.0/ChangeLog 2013-06-24 09:04:32 UTC (rev 151902)
@@ -1,3 +1,14 @@
+2013-06-20 Zan Dobersek <[email protected]>
+
+ [GTK] remove bashism from configure
+ https://bugs.webkit.org/show_bug.cgi?id=117796
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * Source/autotools/FindDependencies.m4: Perform string appending by redeclaring the base string to the value
+ of the base string followed by the string that's being appended. This replaces the use of the '+=' operator
+ that works under bash but is not supported by other shells.
+
2013-06-11 Carlos Garcia Campos <[email protected]>
Unreviewed. Update NEWS and Versions.m4 for 2.0.3 release.
Modified: releases/WebKitGTK/webkit-2.0/Source/autotools/FindDependencies.m4 (151901 => 151902)
--- releases/WebKitGTK/webkit-2.0/Source/autotools/FindDependencies.m4 2013-06-24 08:44:12 UTC (rev 151901)
+++ releases/WebKitGTK/webkit-2.0/Source/autotools/FindDependencies.m4 2013-06-24 09:04:32 UTC (rev 151902)
@@ -377,8 +377,8 @@
# 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)
- FREETYPE_CFLAGS+=" $HARFBUZZ_ICU_CFLAGS"
- FREETYPE_LIBS+=" $HARFBUZZ_ICU_LIBS"
+ FREETYPE_CFLAGS="$FREETYPE_CFLAGS $HARFBUZZ_ICU_CFLAGS"
+ FREETYPE_LIBS="$FREETYPE_LIBS $HARFBUZZ_ICU_LIBS"
fi
AC_SUBST([FREETYPE_CFLAGS])
AC_SUBST([FREETYPE_LIBS])
@@ -450,18 +450,18 @@
if test "$with_acceleration_backend" = "opengl"; then
if test "$enable_gles2" = "yes"; then
- acceleration_backend_description+= "(gles2"
+ acceleration_backend_description="$acceleration_backend_description (gles2"
OPENGL_LIBS="-lGLESv2"
else
- acceleration_backend_description+="(gl"
+ acceleration_backend_description="$acceleration_backend_description (gl"
OPENGL_LIBS="-lGL"
fi
if test "$enable_egl" = "yes"; then
- acceleration_backend_description+=", egl"
- OPENGL_LIBS+=" -lEGL"
+ acceleration_backend_description="$acceleration_backend_description, egl"
+ OPENGL_LIBS="$OPENGL_LIBS -lEGL"
fi
if test "$enable_glx" = "yes"; then
- acceleration_backend_description+=", glx"
+ acceleration_backend_description="$acceleration_backend_description, glx"
fi
# Check whether dlopen() is in the core libc like on FreeBSD, or in a separate
@@ -469,8 +469,8 @@
AC_CHECK_FUNC([dlopen], [], [AC_CHECK_LIB([dl], [dlopen], [DLOPEN_LIBS="-ldl"])])
AC_SUBST([DLOPEN_LIBS])
- OPENGL_LIBS+=" $DLOPEN_LIBS"
- acceleration_backend_description+=")"
+ OPENGL_LIBS="$OPENGL_LIBS $DLOPEN_LIBS"
+ acceleration_backend_description="$acceleration_backend_description)"
fi
AC_SUBST([OPENGL_LIBS])
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
