Don't add -lasound etc to LIBS if ALSA turns out not to be installed.
Original commit message from CVS: Don't add -lasound etc to LIBS if ALSA turns out not to be installed.
This commit is contained in:
parent
17b138b101
commit
de346e1126
43
acinclude.m4
43
acinclude.m4
@ -1,6 +1,7 @@
|
|||||||
dnl Configure Paths for Alsa
|
dnl Configure Paths for Alsa
|
||||||
dnl Christopher Lansdown (lansdoct@cs.alfred.edu)
|
dnl Christopher Lansdown <lansdoct@cs.alfred.edu>
|
||||||
dnl 29/10/1998
|
dnl Jaroslav Kysela <perex@suse.cz>
|
||||||
|
dnl Last modification: 07/12/2000
|
||||||
dnl AM_PATH_ALSA(MINIMUM-VERSION)
|
dnl AM_PATH_ALSA(MINIMUM-VERSION)
|
||||||
dnl Test for libasound, and define ALSA_CFLAGS and ALSA_LIBS as appropriate.
|
dnl Test for libasound, and define ALSA_CFLAGS and ALSA_LIBS as appropriate.
|
||||||
dnl enables arguments --with-alsa-prefix= --with-alsa-enc-prefix= --disable-alsatest
|
dnl enables arguments --with-alsa-prefix= --with-alsa-enc-prefix= --disable-alsatest
|
||||||
@ -19,7 +20,7 @@ dnl Add any special include directories
|
|||||||
AC_MSG_CHECKING(for ALSA CFLAGS)
|
AC_MSG_CHECKING(for ALSA CFLAGS)
|
||||||
if test "$alsa_inc_prefix" != "" ; then
|
if test "$alsa_inc_prefix" != "" ; then
|
||||||
ALSA_CFLAGS="$ALSA_CFLAGS -I$alsa_inc_prefix"
|
ALSA_CFLAGS="$ALSA_CFLAGS -I$alsa_inc_prefix"
|
||||||
CFLAGS="-I$alsa_inc_prefix"
|
CFLAGS="$CFLAGS -I$alsa_inc_prefix"
|
||||||
fi
|
fi
|
||||||
AC_MSG_RESULT($ALSA_CFLAGS)
|
AC_MSG_RESULT($ALSA_CFLAGS)
|
||||||
|
|
||||||
@ -27,33 +28,15 @@ dnl add any special lib dirs
|
|||||||
AC_MSG_CHECKING(for ALSA LDFLAGS)
|
AC_MSG_CHECKING(for ALSA LDFLAGS)
|
||||||
if test "$alsa_prefix" != "" ; then
|
if test "$alsa_prefix" != "" ; then
|
||||||
ALSA_LIBS="$ALSA_LIBS -L$alsa_prefix"
|
ALSA_LIBS="$ALSA_LIBS -L$alsa_prefix"
|
||||||
LIBS="-L$alsa_prefix"
|
LDFLAGS="$LDFLAGS -L$alsa_prefix"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
dnl add the alsa library
|
dnl add the alsa library
|
||||||
ALSA_LIBS="$ALSA_LIBS -lasound"
|
ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl"
|
||||||
LDFLAGS="$ALSA_LIBS -lasound"
|
alsa_save_LIBS="$LIBS"
|
||||||
|
LIBS="$LIBS -lasound -lm -ldl"
|
||||||
AC_MSG_RESULT($ALSA_LIBS)
|
AC_MSG_RESULT($ALSA_LIBS)
|
||||||
|
|
||||||
dnl Check for the presence of the library
|
|
||||||
dnl if test $enable_alsatest = yes; then
|
|
||||||
dnl AC_MSG_CHECKING(for working libasound)
|
|
||||||
dnl AC_TRY_RUN([
|
|
||||||
dnl #include <sys/asoundlib.h>
|
|
||||||
dnl void main(void)
|
|
||||||
dnl {
|
|
||||||
dnl snd_cards();
|
|
||||||
dnl exit(0);
|
|
||||||
dnl }
|
|
||||||
dnl ],
|
|
||||||
dnl [AC_MSG_RESULT("present")],
|
|
||||||
dnl [AC_MSG_RESULT("not found. ")
|
|
||||||
dnl AC_MSG_ERROR(Fatal error: Install alsa-lib package or use --with-alsa-prefix option...)],
|
|
||||||
dnl [AC_MSG_RESULT(unsopported)
|
|
||||||
dnl AC_MSG_ERROR(Cross-compiling isn't supported...)]
|
|
||||||
dnl )
|
|
||||||
dnl fi
|
|
||||||
|
|
||||||
dnl Check for a working version of libasound that is of the right version.
|
dnl Check for a working version of libasound that is of the right version.
|
||||||
min_alsa_version=ifelse([$1], ,0.1.1,$1)
|
min_alsa_version=ifelse([$1], ,0.1.1,$1)
|
||||||
AC_MSG_CHECKING(for libasound headers version >= $min_alsa_version)
|
AC_MSG_CHECKING(for libasound headers version >= $min_alsa_version)
|
||||||
@ -107,13 +90,16 @@ exit(0);
|
|||||||
],
|
],
|
||||||
[AC_MSG_RESULT(found.)],
|
[AC_MSG_RESULT(found.)],
|
||||||
[AC_MSG_RESULT(not present.)
|
[AC_MSG_RESULT(not present.)
|
||||||
AC_MSG_WARN(Sufficiently new version of libasound not found.)]
|
AC_MSG_WARN(Sufficiently new version of libasound not found.)
|
||||||
|
LIBS="$alsa_save_LIBS"
|
||||||
|
]
|
||||||
)
|
)
|
||||||
AC_LANG_RESTORE
|
AC_LANG_RESTORE
|
||||||
|
|
||||||
dnl Now that we know that we have the right version, let's see if we have the library and not just the headers.
|
dnl Now that we know that we have the right version, let's see if we have the library and not just the headers.
|
||||||
AC_CHECK_LIB([asound], [snd_cards],,
|
AC_CHECK_LIB([asound], [snd_defaults_card],,
|
||||||
[AC_MSG_WARN(No linkable libasound was found.)]
|
[AC_MSG_WARN(No linkable libasound was found.)
|
||||||
|
LIBS="$alsa_save_LIBS"]
|
||||||
)
|
)
|
||||||
|
|
||||||
dnl That should be it. Now just export out symbols:
|
dnl That should be it. Now just export out symbols:
|
||||||
@ -121,4 +107,3 @@ AC_SUBST(ALSA_CFLAGS)
|
|||||||
AC_SUBST(ALSA_LIBS)
|
AC_SUBST(ALSA_LIBS)
|
||||||
])
|
])
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user