Mercurial > hg > openjdk > jdk8u
changeset 961:6403ef94cb0d jdk8u20-b07
Merge
author | lana |
---|---|
date | Mon, 24 Mar 2014 13:16:50 -0700 |
parents | f0e2f657d0f5 (current diff) 19638a13026c (diff) |
children | ab3b7065648f d6db2aec371e f0abd4607ac4 |
files | .hgtags |
diffstat | 3 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Wed Mar 19 15:18:49 2014 -0700 +++ b/.hgtags Mon Mar 24 13:16:50 2014 -0700 @@ -257,4 +257,7 @@ 6a3d3b7feab4d4a8252c63b4ce7d0fab106cf2f7 jdk8u20-b03 7e1b01df280fb065c5953c48f54ac9d619ecbf1c jdk8u20-b04 69e0af208dad70fdef65a89ab2c4c468ed9e24b8 jdk8u20-b05 +839546caab1285c7699a9c2aa1467f57c9ea7f30 jdk8-b130 +0c38dfecab2ad9f9b5b5edf54b991602147cd040 jdk8-b131 +2a8f4c022aa03e7916223f3291517dbcc38e07cd jdk8-b132 ae6a3aec6aa29509a0fd5f53709889b99b1e27da jdk8u20-b06
--- a/common/autoconf/generated-configure.sh Wed Mar 19 15:18:49 2014 -0700 +++ b/common/autoconf/generated-configure.sh Mon Mar 24 13:16:50 2014 -0700 @@ -3865,7 +3865,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1389186094 +DATE_WHEN_GENERATED=1394787296 ############################################################################### # @@ -34371,7 +34371,7 @@ fi if test "x${with_alsa}" != x; then - ALSA_LIBS="-L${with_alsa}/lib -lalsa" + ALSA_LIBS="-L${with_alsa}/lib -lasound" ALSA_CFLAGS="-I${with_alsa}/include" ALSA_FOUND=yes fi @@ -34380,7 +34380,7 @@ ALSA_FOUND=yes fi if test "x${with_alsa_lib}" != x; then - ALSA_LIBS="-L${with_alsa_lib} -lalsa" + ALSA_LIBS="-L${with_alsa_lib} -lasound" ALSA_FOUND=yes fi if test "x$ALSA_FOUND" = xno; then
--- a/common/autoconf/libraries.m4 Wed Mar 19 15:18:49 2014 -0700 +++ b/common/autoconf/libraries.m4 Mon Mar 24 13:16:50 2014 -0700 @@ -554,7 +554,7 @@ fi if test "x${with_alsa}" != x; then - ALSA_LIBS="-L${with_alsa}/lib -lalsa" + ALSA_LIBS="-L${with_alsa}/lib -lasound" ALSA_CFLAGS="-I${with_alsa}/include" ALSA_FOUND=yes fi @@ -563,7 +563,7 @@ ALSA_FOUND=yes fi if test "x${with_alsa_lib}" != x; then - ALSA_LIBS="-L${with_alsa_lib} -lalsa" + ALSA_LIBS="-L${with_alsa_lib} -lasound" ALSA_FOUND=yes fi if test "x$ALSA_FOUND" = xno; then