diff options
| author | lana <none@none> | 2014-03-24 13:16:50 -0700 |
|---|---|---|
| committer | lana <none@none> | 2014-03-24 13:16:50 -0700 |
| commit | 56a314b523f11e4a76115cce73c1781148302f27 (patch) | |
| tree | 09eac76db1917f9001231de2c7ba2387c71a0bf6 | |
| parent | 79580bdcff74fc656030af48ff01749265ea57e2 (diff) | |
| parent | e8742a9ee856dccfcc137954fa3cfe37cc16602b (diff) | |
Mergejdk8u20-b07
| -rw-r--r-- | .hgtags | 3 | ||||
| -rw-r--r-- | common/autoconf/generated-configure.sh | 6 | ||||
| -rw-r--r-- | common/autoconf/libraries.m4 | 4 |
3 files changed, 8 insertions, 5 deletions
@@ -257,4 +257,7 @@ cc868070f1959b849c8c3b867771fbdb07b9ba05 jdk8u20-b02 6a3d3b7feab4d4a8252c63b4ce7d0fab106cf2f7 jdk8u20-b03 7e1b01df280fb065c5953c48f54ac9d619ecbf1c jdk8u20-b04 69e0af208dad70fdef65a89ab2c4c468ed9e24b8 jdk8u20-b05 +839546caab1285c7699a9c2aa1467f57c9ea7f30 jdk8-b130 +0c38dfecab2ad9f9b5b5edf54b991602147cd040 jdk8-b131 +2a8f4c022aa03e7916223f3291517dbcc38e07cd jdk8-b132 ae6a3aec6aa29509a0fd5f53709889b99b1e27da jdk8u20-b06 diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index cf6b1bf..f3df11b 100644 --- a/common/autoconf/generated-configure.sh +++ b/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=1389186094 +DATE_WHEN_GENERATED=1394787296 ############################################################################### # @@ -34371,7 +34371,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 @@ -34380,7 +34380,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 diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4 index c2cc379..fc2ce47 100644 --- a/common/autoconf/libraries.m4 +++ b/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 |