mirror of
				https://github.com/alsa-project/alsa-lib.git
				synced 2025-10-29 05:40:25 -04:00 
			
		
		
		
	- fixed for the recent autoconf/automake.
- implemented --enable-alsatest feature.
This commit is contained in:
		
							parent
							
								
									0fc787b69e
								
							
						
					
					
						commit
						bc2f075269
					
				
					 1 changed files with 6 additions and 4 deletions
				
			
		|  | @ -2,17 +2,17 @@ dnl Configure Paths for Alsa | ||||||
| dnl Some modifications by Richard Boulton <richard-alsa@tartarus.org> | dnl Some modifications by Richard Boulton <richard-alsa@tartarus.org> | ||||||
| dnl Christopher Lansdown <lansdoct@cs.alfred.edu> | dnl Christopher Lansdown <lansdoct@cs.alfred.edu> | ||||||
| dnl Jaroslav Kysela <perex@suse.cz> | dnl Jaroslav Kysela <perex@suse.cz> | ||||||
| dnl Last modification: $Id: alsa.m4,v 1.22 2002/05/27 11:14:20 tiwai Exp $ | dnl Last modification: $Id: alsa.m4,v 1.23 2004/01/16 18:14:22 tiwai Exp $ | ||||||
| dnl AM_PATH_ALSA([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) | dnl AM_PATH_ALSA([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) | ||||||
| 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= | dnl enables arguments --with-alsa-prefix= | ||||||
| dnl                   --with-alsa-enc-prefix= | dnl                   --with-alsa-enc-prefix= | ||||||
| dnl                   --disable-alsatest  (this has no effect, as yet) | dnl                   --disable-alsatest | ||||||
| dnl | dnl | ||||||
| dnl For backwards compatibility, if ACTION_IF_NOT_FOUND is not specified, | dnl For backwards compatibility, if ACTION_IF_NOT_FOUND is not specified, | ||||||
| dnl and the alsa libraries are not found, a fatal AC_MSG_ERROR() will result. | dnl and the alsa libraries are not found, a fatal AC_MSG_ERROR() will result. | ||||||
| dnl | dnl | ||||||
| AC_DEFUN(AM_PATH_ALSA, | AC_DEFUN([AM_PATH_ALSA], | ||||||
| [dnl Save the original CFLAGS, LDFLAGS, and LIBS | [dnl Save the original CFLAGS, LDFLAGS, and LIBS | ||||||
| alsa_save_CFLAGS="$CFLAGS" | alsa_save_CFLAGS="$CFLAGS" | ||||||
| alsa_save_LDFLAGS="$LDFLAGS" | alsa_save_LDFLAGS="$LDFLAGS" | ||||||
|  | @ -33,7 +33,7 @@ AC_ARG_WITH(alsa-inc-prefix, | ||||||
| dnl FIXME: this is not yet implemented | dnl FIXME: this is not yet implemented | ||||||
| AC_ARG_ENABLE(alsatest, | AC_ARG_ENABLE(alsatest, | ||||||
| [  --disable-alsatest      Do not try to compile and run a test Alsa program], | [  --disable-alsatest      Do not try to compile and run a test Alsa program], | ||||||
| [enable_alsatest=no], | [enable_alsatest="$enableval"], | ||||||
| [enable_alsatest=yes]) | [enable_alsatest=yes]) | ||||||
| 
 | 
 | ||||||
| dnl Add any special include directories | dnl Add any special include directories | ||||||
|  | @ -116,10 +116,12 @@ exit(0); | ||||||
| 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. | ||||||
|  | if test "x$enable_alsatest" = "xyes"; then | ||||||
| AC_CHECK_LIB([asound], [snd_ctl_open],, | AC_CHECK_LIB([asound], [snd_ctl_open],, | ||||||
| 	[ifelse([$3], , [AC_MSG_ERROR(No linkable libasound was found.)]) | 	[ifelse([$3], , [AC_MSG_ERROR(No linkable libasound was found.)]) | ||||||
| 	 alsa_found=no] | 	 alsa_found=no] | ||||||
| ) | ) | ||||||
|  | fi | ||||||
| 
 | 
 | ||||||
| if test "x$alsa_found" = "xyes" ; then | if test "x$alsa_found" = "xyes" ; then | ||||||
|    ifelse([$2], , :, [$2]) |    ifelse([$2], , :, [$2]) | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Takashi Iwai
						Takashi Iwai