blob: a4aaf507ccc9f4fa472b63a07d03aab1f6921a4c (
plain) (
blame)
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
|
--- configure.orig 2009-12-17 15:23:05.000000000 +0100
+++ configure 2009-12-21 14:25:45.000000000 +0100
@@ -107,7 +107,7 @@
GENISOIMAGE="genisoimage"
MKISOFS="mkisofs"
INCCRYPTO=""
-LIBCRYPTO="-lcrypto"
+LIBCRYPTO="-lcrypto -lssl"
LIBPTHREAD="-lpthread"
LIBCAP="-lcap"
GSOAP=""
@@ -125,6 +125,8 @@
if [ "$OS" = "freebsd" ]; then
INCCURL="-I/usr/local/include"
LIBCURL="-L/usr/local/lib -lcurl"
+ INCPULSE="-I/usr/local/include"
+ LIBPULSE="-L/usr/local/lib"
else
INCCURL=""
LIBCURL="-lcurl"
@@ -1181,7 +1183,7 @@
#endif
}
EOF
- if test_compile "-lpulse" pulse pulse; then
+ if test_compile "$INCPULSE $LIBPULSE -lpulse" pulse pulse; then
test_execute
fi
}
@@ -1773,7 +1775,7 @@
cat $ODIR.tmp_src.cc >> $LOG
echo "using the following command line:" >> $LOG
echo "$CXX -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc -I$p/include/$d $p/$b/lib$d.so" >> $LOG
- $CXX -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc -I$p/include/$d $p/$b/lib$d.so >> $LOG 2>&1
+ $CXX -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc -I$p/include/$d $p/$b/lib$d.so -pthread >> $LOG 2>&1
if [ $? -eq 0 ]; then
found=1
break
@@ -2315,6 +2317,15 @@
[ $WITH_QT4 -eq 1 ] && check_qt4
[ $WITH_PYTHON -eq 1 ] && check_python
+# PulseAudio
+if [ "$OS" = "linux" -o "$OS" = "freebsd" ]; then
+ if [ $WITH_PULSE -eq 1 ]; then
+ check_pulse
+ else
+ cnf_append "VBOX_WITH_PULSE" ""
+ fi
+fi
+
# Linux-specific
if [ "$OS" = "linux" ]; then
# don't check for the static libstdc++ in the PUEL version as we build the
@@ -2332,11 +2343,6 @@
else
cnf_append "VBOX_WITH_ALSA" ""
fi
- if [ $WITH_PULSE -eq 1 ]; then
- check_pulse
- else
- cnf_append "VBOX_WITH_PULSE" ""
- fi
if [ $WITH_DBUS -eq 0 ]; then
cnf_append "VBOX_WITH_DBUS" ""
fi
|
