Merge

.hgtags

@@ -253,6 +253,10 @@ c330fa67c4daffdc86527f1a24941aa5a3500098 jdk8u20-b00
 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 @@ fae51c73a06d71304c9dbff22984ee501812b972 jdk8u5-b10
 dd3bd272ceedbd69fabafc531b6b1e056659f733 jdk8u5-b11
 3e05b6ae0a1e2bd7352462e9bf8e7262246fb77f jdk8u5-b12
 d81e301cae70f1f95f4bb976ec053c915dee503a jdk8u5-b13
+ae6a3aec6aa29509a0fd5f53709889b99b1e27da jdk8u20-b06
 cc868070f1959b849c8c3b867771fbdb07b9ba05 jdk8u20-b02
 6a3d3b7feab4d4a8252c63b4ce7d0fab106cf2f7 jdk8u20-b03
 7e1b01df280fb065c5953c48f54ac9d619ecbf1c jdk8u20-b04

common/autoconf/generated-configure.sh

@@ -3865,7 +3865,7 @@ fi
 #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 @@ $as_echo "$as_me: WARNING: alsa not used, so --with-alsa is ignored" >&2;}
     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 @@ $as_echo "$as_me: WARNING: alsa not used, so --with-alsa is ignored" >&2;}
       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

common/autoconf/libraries.m4

@@ -554,7 +554,7 @@ AC_DEFUN_ONCE([LIB_SETUP_ALSA],
     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 @@ AC_DEFUN_ONCE([LIB_SETUP_ALSA],
       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