summaryrefslogtreecommitdiff
blob: 92ea389676e80a304a8b1a2bca60ceacea74f9ce (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
--- configure.ac.old	2009-04-22 23:01:49.000000000 -0400
+++ configure.ac	2009-04-24 12:06:10.000000000 -0400
@@ -146,6 +146,15 @@
 
 found_sound=no
 
+AC_ARG_ENABLE(oss,
+      [  --enable-oss    Disable oss support],
+      [case "${enableval}" in
+        yes) oss=true ;;
+        no)  oss=false ;;
+        *) AC_MSG_ERROR(bad value ${enableval} for --disable-oss) ;;
+      esac],[oss=true])
+
+if "$oss" = "true"; then
 AC_CHECK_HEADERS(soundcard.h sys/soundcard.h machine/soundcard.h sys/audio.h)
 if test "${ac_cv_header_sys_soundcard_h}" = "yes" || \
 	test "${ac_cv_header_soundcard_h}" = "yes" || \
@@ -153,6 +162,7 @@
 	test "${ac_cv_header_machine_soundcard_h}" = "yes"; then
 	found_sound=yes
 fi
+fi
 
 AM_CONDITIONAL(BUILD_OSS, test x$found_sound = xyes)
 
@@ -274,6 +284,16 @@
 
 AM_CONDITIONAL(BUILD_MACAQSND, test x$macaqsnd_enabled = xtrue)
 
+AC_ARG_ENABLE(jack,
+      [  --disable-jack    Disable jack support],
+      [case "${enableval}" in
+        yes) jack=true ;;
+        no)  jack=false ;;
+        *) AC_MSG_ERROR(bad value ${enableval} for --disable-jack) ;;
+      esac],[jack=true])
+
+if test x$jack = xtrue; then
+
 dnl Check for samplerate libraries
 dnl Check for jack libraries (sound output plugin)
 PKG_CHECK_MODULES(JACK,jack >= 0.15.0, 
@@ -300,6 +320,8 @@
 AC_SUBST(JACK_CFLAGS)
 AC_SUBST(JACK_LIBS) 
 
+fi
+
 if test "$found_sound" = "no"; then
 	AC_MSG_ERROR([Could not find a support sound driver API])
 fi
@@ -309,6 +331,16 @@
 dnl	check for various codecs libraries
 dnl	*************************************
 
+AC_ARG_ENABLE(speex,
+      [  --disable-speex    Disable speex support],
+      [case "${enableval}" in
+        yes) speex=true ;;
+        no)  speex=false ;;
+        *) AC_MSG_ERROR(bad value ${enableval} for --disable-speex) ;;
+      esac],[speex=true])
+
+if test x$speex = xtrue; then
+
 dnl check for installed version of speex
 PKG_CHECK_MODULES(SPEEX, speex >= 1.1.12,
 	[ AC_DEFINE(HAVE_SPEEX_NOISE,1,[tells whether the noise arg of speex_echo_cancel can be used]) ],
@@ -322,11 +354,26 @@
     [AC_MSG_NOTICE([No speexdsp library found.])
 ]
 )
+else
+SPEEX_CFLAGS="-DDISABLE_SPEEX"
+fi
+
 AC_SUBST(SPEEX_CFLAGS)
 AC_SUBST(SPEEX_LIBS)
+
 AM_CONDITIONAL(BUILD_SPEEX, test x$build_speex = xyes )
 AM_CONDITIONAL(BUILD_RESAMPLE, test x$build_resample = xyes )
 
+AC_ARG_ENABLE(gsm,
+      [  --disable-gsm    Disable gsm support],
+      [case "${enableval}" in
+        yes) gsm=true ;;
+        no)  gsm=false ;;
+        *) AC_MSG_ERROR(bad value ${enableval} for --disable-gsm) ;;
+      esac],[gsm=true])
+
+if test x$gsm = xtrue; then
+
 dnl check for gsm
 build_gsm=no
 AC_ARG_WITH( gsm,
@@ -343,6 +390,9 @@
 else
 	build_gsm=no
 fi
+
+fi
+
 AM_CONDITIONAL(BUILD_GSM, test x$build_gsm = xyes )
 
 MS_CHECK_VIDEO
--- acinclude.m4.old	2009-04-22 22:09:20.000000000 -0400
+++ acinclude.m4	2009-04-23 14:59:39.000000000 -0400
@@ -108,9 +108,30 @@
 			fi
 		fi
 
+		AC_ARG_ENABLE(theora,
+		  [  --disable-theora    Disable theora support],
+		  [case "${enableval}" in
+			yes) theora=true ;;
+			no)  theora=false ;;
+			*) AC_MSG_ERROR(bad value ${enableval} for --disable-theora) ;;
+		  esac],[theora=true])
+
+		if test x$theora = xtrue; then
 		PKG_CHECK_MODULES(THEORA, [theora >= 1.0alpha7 ], [have_theora=yes],
 					[have_theora=no])
+		fi
+
+		AC_ARG_ENABLE(x11,
+		  [  --disable-x11    Disable X11 support],
+		  [case "${enableval}" in
+			yes) enable_x11=true ;;
+			no)  enable_x11=false ;;
+			*) AC_MSG_ERROR(bad value ${enableval} for --disable-x11) ;;
+		  esac],[enable_x11=true])
+
+		if test "$enable_x11" = "true"; then
 		AC_CHECK_HEADERS(X11/Xlib.h)
+		fi
 		
 		VIDEO_CFLAGS=" $FFMPEG_CFLAGS -DVIDEO_ENABLED"
 		VIDEO_LIBS=" $FFMPEG_LIBS $SWSCALE_LIBS"