mirror of
				https://github.com/saitohirga/WSJT-X.git
				synced 2025-10-31 04:50:34 -04:00 
			
		
		
		
	- A little more work on configure.ac, to at least get portaudio right
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@64 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
		
							parent
							
								
									ce7b1a958f
								
							
						
					
					
						commit
						a160f9aca3
					
				
							
								
								
									
										43
									
								
								configure.ac
									
									
									
									
									
								
							
							
						
						
									
										43
									
								
								configure.ac
									
									
									
									
									
								
							| @ -97,7 +97,8 @@ AC_HEADER_STDC | |||||||
| AC_CHECK_HEADERS([inttypes.h stdint.h sys/resource.h sys/param.h errno.h sys/syslog.h stddef.h libgen.h sys/wait.h wait.h ]) | AC_CHECK_HEADERS([inttypes.h stdint.h sys/resource.h sys/param.h errno.h sys/syslog.h stddef.h libgen.h sys/wait.h wait.h ]) | ||||||
| AC_CHECK_HEADER([sys/soundcard.h], [HAS_SOUNDCARD_H=1], [HAS_SOUNDCARD_H=0]) | AC_CHECK_HEADER([sys/soundcard.h], [HAS_SOUNDCARD_H=1], [HAS_SOUNDCARD_H=0]) | ||||||
| AC_CHECK_HEADER([alsa/alsasound.h], [HAS_ALSASOUND_H=1], [HAS_ALSASOUND_H=0]) | AC_CHECK_HEADER([alsa/alsasound.h], [HAS_ALSASOUND_H=1], [HAS_ALSASOUND_H=0]) | ||||||
| AC_CHECK_HEADER([audiofile.h], [HAS_AUDIOFILE_H=1], [HAS_AUDIOFILE_H=0]) | dnl XXX non portable portaudio.h check fix later --db | ||||||
|  | AC_CHECK_HEADER([/usr/local/include/portaudio.h], [HAS_PORTAUDIO_H=1], [HAS_PORTAUDIO_H=0]) | ||||||
| 
 | 
 | ||||||
| dnl See whether we can include both string.h and strings.h. | dnl See whether we can include both string.h and strings.h. | ||||||
| AC_CACHE_CHECK([whether string.h and strings.h may both be included], | AC_CACHE_CHECK([whether string.h and strings.h may both be included], | ||||||
| @ -206,12 +207,12 @@ AC_ARG_ENABLE(oss, | |||||||
| AC_HELP_STRING([--enable-oss],[Force OSS SOUND usage.]), | AC_HELP_STRING([--enable-oss],[Force OSS SOUND usage.]), | ||||||
| [oss=$enableval] , [oss=no]) | [oss=$enableval] , [oss=no]) | ||||||
| 
 | 
 | ||||||
| dnl libaudio soundsupport | dnl portaudio soundsupport | ||||||
| dnl ===================== | dnl ====================== | ||||||
| 
 | 
 | ||||||
| AC_ARG_ENABLE(libaudio, | AC_ARG_ENABLE(portaudio, | ||||||
| AC_HELP_STRING([--enable-libaudio],[Force LIBAUDIO SOUND usage.]), | AC_HELP_STRING([--enable-portaudio],[Force PORTAUDIO SOUND usage.]), | ||||||
| [libaudio=$enableval], [libaudio=no]) | [portaudio=$enableval], [portaudio=no]) | ||||||
| 
 | 
 | ||||||
| if test "$alsa" = yes; then | if test "$alsa" = yes; then | ||||||
| 	AC_DEFINE(USE_ALSA, 1, [Define if you want ALSA used.]) | 	AC_DEFINE(USE_ALSA, 1, [Define if you want ALSA used.]) | ||||||
| @ -221,32 +222,40 @@ if test "$oss" = yes; then | |||||||
| 	AC_DEFINE(USE_OSS, 1, [Define if you want OSS used.]) | 	AC_DEFINE(USE_OSS, 1, [Define if you want OSS used.]) | ||||||
| fi | fi | ||||||
| 
 | 
 | ||||||
| if test "$libaudio" = yes; then | if test "$portaudio" = yes; then | ||||||
| 	AC_DEFINE(USE_LIBAUDIO, 1, [Define if you want LIBAUDIO used.]) | 	AC_DEFINE(USE_PORTAUDIO, 1, [Define if you want PORTAUDIO used.]) | ||||||
|  | fi | ||||||
|  | 
 | ||||||
|  | dnl set conf flags | ||||||
|  | 
 | ||||||
|  | if test $HAS_ALSASOUND_H -eq 1; then | ||||||
|  | 	AC_DEFINE(HAS_ALSASOUND_H, 1, ) | ||||||
|  | fi | ||||||
|  | 
 | ||||||
|  | if test $HAS_SOUNDCARD_H -eq 1; then | ||||||
|  | 	AC_DEFINE(HAS_SOUNDCARD_H, 1, ) | ||||||
|  | fi | ||||||
|  | 
 | ||||||
|  | if test $HAS_PORTAUDIO_H -eq 1; then | ||||||
|  | 	AC_DEFINE(HAS_PORTAUDIO_H, 1, ) | ||||||
| fi | fi | ||||||
| 
 | 
 | ||||||
| dnl sanity tests. | dnl sanity tests. | ||||||
| if test "$alsa" = yes; then | if test "$alsa" = yes; then | ||||||
| 	if test $HAS_ALSASOUND_H -eq 0; then | 	if test $HAS_ALSASOUND_H -eq 0; then | ||||||
| 		AC_MSG_ERROR([You need alsasound.h to use --enable-alsa]) | 		AC_MSG_ERROR([You need alsasound.h to use --enable-alsa]) | ||||||
| 	else |  | ||||||
| 		AC_DEFINE(HAS_ALSASOUND_H, 1, ) |  | ||||||
| 	fi | 	fi | ||||||
| fi | fi | ||||||
| 
 | 
 | ||||||
| if test "$oss" = yes; then | if test "$oss" = yes; then | ||||||
| 	if test $HAS_SOUNDCARD_H -eq 0; then | 	if test $HAS_SOUNDCARD_H -eq 0; then | ||||||
| 		AC_MSG_ERROR([You need soundcard.h to use --enable-oss]) | 		AC_MSG_ERROR([You need soundcard.h to use --enable-oss]) | ||||||
| 	else |  | ||||||
| 		AC_DEFINE(HAS_SOUNDCARD_H, 1, ) |  | ||||||
| 	fi | 	fi | ||||||
| fi | fi | ||||||
| 
 | 
 | ||||||
| if test "$libaudio" = yes; then | if test "$portaudio" = yes; then | ||||||
| 	if test $HAS_AUDIOFILE_H -eq 0; then | 	if test $HAS_PORTAUDIO_H -eq 0; then | ||||||
| 		AC_MSG_ERROR([You need audiofile.h to use --enable-libaudio]) | 		AC_MSG_ERROR([You need portaudio.h to use --enable-portaudio]) | ||||||
| 	else |  | ||||||
| 		AC_DEFINE(HAS_AUDIOFILE_H, 1, ) |  | ||||||
| 	fi | 	fi | ||||||
| fi | fi | ||||||
| 
 | 
 | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user