changeset 1048:49d1cab5edd9

Merge
author asaha
date Fri, 28 Mar 2014 16:25:07 -0700
parents 6d866bb92d25 a14345c657e4
children 065b9ded4bf2
files .hgtags
diffstat 3 files changed, 10 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Mar 20 10:33:39 2014 -0700
+++ b/.hgtags	Fri Mar 28 16:25:07 2014 -0700
@@ -253,6 +253,10 @@
 2e2ffb9e4b690c63b32142861177390e0f2c40e9 jdk8-b127
 101e42de46869e6604fbf095e1666fbf07fcb93c jdk8-b128
 1e5fe865491300cd0c63261ecf8d34e621e1345c jdk8-b129
+cc868070f1959b849c8c3b867771fbdb07b9ba05 jdk8u20-b02
+6a3d3b7feab4d4a8252c63b4ce7d0fab106cf2f7 jdk8u20-b03
+7e1b01df280fb065c5953c48f54ac9d619ecbf1c jdk8u20-b04
+69e0af208dad70fdef65a89ab2c4c468ed9e24b8 jdk8u20-b05
 839546caab1285c7699a9c2aa1467f57c9ea7f30 jdk8-b130
 0c38dfecab2ad9f9b5b5edf54b991602147cd040 jdk8-b131
 2a8f4c022aa03e7916223f3291517dbcc38e07cd jdk8-b132
@@ -269,6 +273,7 @@
 dd3bd272ceedbd69fabafc531b6b1e056659f733 jdk8u5-b11
 3e05b6ae0a1e2bd7352462e9bf8e7262246fb77f jdk8u5-b12
 d81e301cae70f1f95f4bb976ec053c915dee503a jdk8u5-b13
+ae6a3aec6aa29509a0fd5f53709889b99b1e27da jdk8u20-b06
 cc868070f1959b849c8c3b867771fbdb07b9ba05 jdk8u20-b02
 6a3d3b7feab4d4a8252c63b4ce7d0fab106cf2f7 jdk8u20-b03
 7e1b01df280fb065c5953c48f54ac9d619ecbf1c jdk8u20-b04
--- a/common/autoconf/generated-configure.sh	Thu Mar 20 10:33:39 2014 -0700
+++ b/common/autoconf/generated-configure.sh	Fri Mar 28 16:25:07 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=1390334534
+DATE_WHEN_GENERATED=1396039024
 
 ###############################################################################
 #
@@ -34377,7 +34377,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
@@ -34386,7 +34386,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	Thu Mar 20 10:33:39 2014 -0700
+++ b/common/autoconf/libraries.m4	Fri Mar 28 16:25:07 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