Merge jdk8u20-b07

Mon, 24 Mar 2014 13:16:50 -0700

author
lana
date
Mon, 24 Mar 2014 13:16:50 -0700
changeset 963
6403ef94cb0d
parent 956
f0e2f657d0f5
parent 962
19638a13026c
child 964
ab3b7065648f
child 980
d6db2aec371e
child 1024
f0abd4607ac4

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Wed Mar 19 15:18:49 2014 -0700
     1.2 +++ b/.hgtags	Mon Mar 24 13:16:50 2014 -0700
     1.3 @@ -257,4 +257,7 @@
     1.4  6a3d3b7feab4d4a8252c63b4ce7d0fab106cf2f7 jdk8u20-b03
     1.5  7e1b01df280fb065c5953c48f54ac9d619ecbf1c jdk8u20-b04
     1.6  69e0af208dad70fdef65a89ab2c4c468ed9e24b8 jdk8u20-b05
     1.7 +839546caab1285c7699a9c2aa1467f57c9ea7f30 jdk8-b130
     1.8 +0c38dfecab2ad9f9b5b5edf54b991602147cd040 jdk8-b131
     1.9 +2a8f4c022aa03e7916223f3291517dbcc38e07cd jdk8-b132
    1.10  ae6a3aec6aa29509a0fd5f53709889b99b1e27da jdk8u20-b06
     2.1 --- a/common/autoconf/generated-configure.sh	Wed Mar 19 15:18:49 2014 -0700
     2.2 +++ b/common/autoconf/generated-configure.sh	Mon Mar 24 13:16:50 2014 -0700
     2.3 @@ -3865,7 +3865,7 @@
     2.4  #CUSTOM_AUTOCONF_INCLUDE
     2.5  
     2.6  # Do not change or remove the following line, it is needed for consistency checks:
     2.7 -DATE_WHEN_GENERATED=1389186094
     2.8 +DATE_WHEN_GENERATED=1394787296
     2.9  
    2.10  ###############################################################################
    2.11  #
    2.12 @@ -34371,7 +34371,7 @@
    2.13      fi
    2.14  
    2.15      if test "x${with_alsa}" != x; then
    2.16 -      ALSA_LIBS="-L${with_alsa}/lib -lalsa"
    2.17 +      ALSA_LIBS="-L${with_alsa}/lib -lasound"
    2.18        ALSA_CFLAGS="-I${with_alsa}/include"
    2.19        ALSA_FOUND=yes
    2.20      fi
    2.21 @@ -34380,7 +34380,7 @@
    2.22        ALSA_FOUND=yes
    2.23      fi
    2.24      if test "x${with_alsa_lib}" != x; then
    2.25 -      ALSA_LIBS="-L${with_alsa_lib} -lalsa"
    2.26 +      ALSA_LIBS="-L${with_alsa_lib} -lasound"
    2.27        ALSA_FOUND=yes
    2.28      fi
    2.29      if test "x$ALSA_FOUND" = xno; then
     3.1 --- a/common/autoconf/libraries.m4	Wed Mar 19 15:18:49 2014 -0700
     3.2 +++ b/common/autoconf/libraries.m4	Mon Mar 24 13:16:50 2014 -0700
     3.3 @@ -554,7 +554,7 @@
     3.4      fi
     3.5  
     3.6      if test "x${with_alsa}" != x; then
     3.7 -      ALSA_LIBS="-L${with_alsa}/lib -lalsa"
     3.8 +      ALSA_LIBS="-L${with_alsa}/lib -lasound"
     3.9        ALSA_CFLAGS="-I${with_alsa}/include"
    3.10        ALSA_FOUND=yes
    3.11      fi
    3.12 @@ -563,7 +563,7 @@
    3.13        ALSA_FOUND=yes
    3.14      fi
    3.15      if test "x${with_alsa_lib}" != x; then
    3.16 -      ALSA_LIBS="-L${with_alsa_lib} -lalsa"
    3.17 +      ALSA_LIBS="-L${with_alsa_lib} -lasound"
    3.18        ALSA_FOUND=yes
    3.19      fi
    3.20      if test "x$ALSA_FOUND" = xno; then

mercurial