8033921: Build fails if --with-alsa option is used due to incorrect ALSA link parameter in autoconf script.

Fri, 14 Mar 2014 13:02:44 +0100

author
ihse
date
Fri, 14 Mar 2014 13:02:44 +0100
changeset 961
fd6b64f87155
parent 960
276fbda5cfbe
child 962
19638a13026c

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>

common/autoconf/generated-configure.sh file | annotate | diff | comparison | revisions
common/autoconf/libraries.m4 file | annotate | diff | comparison | revisions
     1.1 --- a/common/autoconf/generated-configure.sh	Wed Mar 12 21:43:12 2014 +0000
     1.2 +++ b/common/autoconf/generated-configure.sh	Fri Mar 14 13:02:44 2014 +0100
     1.3 @@ -3865,7 +3865,7 @@
     1.4  #CUSTOM_AUTOCONF_INCLUDE
     1.5  
     1.6  # Do not change or remove the following line, it is needed for consistency checks:
     1.7 -DATE_WHEN_GENERATED=1389186094
     1.8 +DATE_WHEN_GENERATED=1394787296
     1.9  
    1.10  ###############################################################################
    1.11  #
    1.12 @@ -34371,7 +34371,7 @@
    1.13      fi
    1.14  
    1.15      if test "x${with_alsa}" != x; then
    1.16 -      ALSA_LIBS="-L${with_alsa}/lib -lalsa"
    1.17 +      ALSA_LIBS="-L${with_alsa}/lib -lasound"
    1.18        ALSA_CFLAGS="-I${with_alsa}/include"
    1.19        ALSA_FOUND=yes
    1.20      fi
    1.21 @@ -34380,7 +34380,7 @@
    1.22        ALSA_FOUND=yes
    1.23      fi
    1.24      if test "x${with_alsa_lib}" != x; then
    1.25 -      ALSA_LIBS="-L${with_alsa_lib} -lalsa"
    1.26 +      ALSA_LIBS="-L${with_alsa_lib} -lasound"
    1.27        ALSA_FOUND=yes
    1.28      fi
    1.29      if test "x$ALSA_FOUND" = xno; then
     2.1 --- a/common/autoconf/libraries.m4	Wed Mar 12 21:43:12 2014 +0000
     2.2 +++ b/common/autoconf/libraries.m4	Fri Mar 14 13:02:44 2014 +0100
     2.3 @@ -554,7 +554,7 @@
     2.4      fi
     2.5  
     2.6      if test "x${with_alsa}" != x; then
     2.7 -      ALSA_LIBS="-L${with_alsa}/lib -lalsa"
     2.8 +      ALSA_LIBS="-L${with_alsa}/lib -lasound"
     2.9        ALSA_CFLAGS="-I${with_alsa}/include"
    2.10        ALSA_FOUND=yes
    2.11      fi
    2.12 @@ -563,7 +563,7 @@
    2.13        ALSA_FOUND=yes
    2.14      fi
    2.15      if test "x${with_alsa_lib}" != x; then
    2.16 -      ALSA_LIBS="-L${with_alsa_lib} -lalsa"
    2.17 +      ALSA_LIBS="-L${with_alsa_lib} -lasound"
    2.18        ALSA_FOUND=yes
    2.19      fi
    2.20      if test "x$ALSA_FOUND" = xno; then

mercurial