OpenJDK / jdk9 / jdk9
changeset 964:260f2ef12254
8033921: Build fails if --with-alsa option is used due to incorrect ALSA link parameter in autoconf script.
Reviewed-by: ihse, erikj
Contributed-by: Jessica Man <jessica.man@gs.com>
| author | ihse |
|---|---|
| date | Fri, 07 Feb 2014 13:31:16 +0100 |
| parents | e9e5bd372a4e |
| children | c99adfb5c4c1 |
| files | common/autoconf/generated-configure.sh common/autoconf/libraries.m4 |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh Thu Feb 06 14:57:02 2014 +0000 +++ b/common/autoconf/generated-configure.sh Fri Feb 07 13:31:16 2014 +0100 @@ -4092,7 +4092,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1391175012 +DATE_WHEN_GENERATED=1391775920 ############################################################################### # @@ -46779,7 +46779,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 @@ -46788,7 +46788,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 Feb 06 14:57:02 2014 +0000 +++ b/common/autoconf/libraries.m4 Fri Feb 07 13:31:16 2014 +0100 @@ -562,7 +562,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 @@ -571,7 +571,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