|
Lines 88-93
Link Here
|
| 88 |
WITH_OPENGL=1 |
88 |
WITH_OPENGL=1 |
| 89 |
WITH_HARDENING=1 |
89 |
WITH_HARDENING=1 |
| 90 |
WITH_VDE=0 |
90 |
WITH_VDE=0 |
|
|
91 |
WITH_VNC=0 |
| 91 |
WITH_DOCS=1 |
92 |
WITH_DOCS=1 |
| 92 |
BUILD_LIBXML2= |
93 |
BUILD_LIBXML2= |
| 93 |
BUILD_LIBXSLT= |
94 |
BUILD_LIBXSLT= |
|
Lines 123-128
Link Here
|
| 123 |
MESA="-lGL" |
124 |
MESA="-lGL" |
| 124 |
INCZ="" |
125 |
INCZ="" |
| 125 |
LIBZ="-lz" |
126 |
LIBZ="-lz" |
|
|
127 |
INCVNCSERVER="" |
| 128 |
LIBVNCSERVER="-lvncserver" |
| 126 |
CXX_FLAGS="" |
129 |
CXX_FLAGS="" |
| 127 |
if [ "$OS" = "freebsd" ]; then |
130 |
if [ "$OS" = "freebsd" ]; then |
| 128 |
INCCURL="-I/usr/local/include" |
131 |
INCCURL="-I/usr/local/include" |
|
Lines 955-960
Link Here
|
| 955 |
fi |
958 |
fi |
| 956 |
} |
959 |
} |
| 957 |
|
960 |
|
|
|
961 |
# Check for libvncserver, needed for VNC in OSE |
| 962 |
# |
| 963 |
check_vncserver() |
| 964 |
{ |
| 965 |
test_header libvncserver |
| 966 |
cat > $ODIR.tmp_src.cc <<EOF |
| 967 |
#include <cstdio> |
| 968 |
#include <rfb/rfbconfig.h> |
| 969 |
|
| 970 |
extern "C" int main() |
| 971 |
{ |
| 972 |
const char* v=LIBVNCSERVER_VERSION; |
| 973 |
unsigned int major = 0, minor = 0, micro = 0; |
| 974 |
|
| 975 |
for (; *v !='.' && *v != '\0'; v++) major = major*10 + *v-'0'; |
| 976 |
if (*v == '.') v++; |
| 977 |
for (; *v !='.' && *v != '\0'; v++) minor = minor*10 + *v-'0'; |
| 978 |
if (*v == '.') v++; |
| 979 |
for (; *v !='.' && *v != '\0'; v++) micro = micro*10 + *v-'0'; |
| 980 |
|
| 981 |
printf("found version %s", LIBVNCSERVER_PACKAGE_VERSION); |
| 982 |
if (major*10000 + minor*100 + micro >= 907) |
| 983 |
{ |
| 984 |
printf(", OK.\n"); |
| 985 |
return 0; |
| 986 |
} |
| 987 |
else |
| 988 |
{ |
| 989 |
printf(", expected version 0.9.7 or higher\n"); |
| 990 |
return 1; |
| 991 |
} |
| 992 |
} |
| 993 |
EOF |
| 994 |
if test_compile "$LIBVNCSERVER $INCVNCSERVER" libvncserver libvncserver; then |
| 995 |
if test_execute; then |
| 996 |
cnf_append "VBOX_WITH_VNC" "1" |
| 997 |
fi |
| 998 |
fi |
| 999 |
} |
| 1000 |
|
| 958 |
# |
1001 |
# |
| 959 |
# Check for libcurl, needed by S3 |
1002 |
# Check for libcurl, needed by S3 |
| 960 |
# |
1003 |
# |
|
Lines 2097-2102
Link Here
|
| 2097 |
[ $WITH_KMODS -eq 1 ] && echo " --disable-kmods don't build Linux kernel modules (host and guest)" |
2140 |
[ $WITH_KMODS -eq 1 ] && echo " --disable-kmods don't build Linux kernel modules (host and guest)" |
| 2098 |
[ $WITH_OPENGL -eq 1 ] && echo " --disable-opengl disable OpenGL support (2D & 3D)" |
2141 |
[ $WITH_OPENGL -eq 1 ] && echo " --disable-opengl disable OpenGL support (2D & 3D)" |
| 2099 |
[ $WITH_GSOAP -eq 0 ] && echo " --enable-webservice enable the webservice stuff" |
2142 |
[ $WITH_GSOAP -eq 0 ] && echo " --enable-webservice enable the webservice stuff" |
|
|
2143 |
[ $OSE -eq 1 ] && echo " --enable-vnc enable the VNC server" |
| 2100 |
[ $WITH_DOCS -eq 1 ] && echo " --disable-docs don't build the documentation" |
2144 |
[ $WITH_DOCS -eq 1 ] && echo " --disable-docs don't build the documentation" |
| 2101 |
[ "$OS" = "linux" -o "$OS" = "freebsd" ] && echo " --enable-vde enable VDE networking" |
2145 |
[ "$OS" = "linux" -o "$OS" = "freebsd" ] && echo " --enable-vde enable VDE networking" |
| 2102 |
cat << EOF |
2146 |
cat << EOF |
|
Lines 2262-2267
Link Here
|
| 2262 |
--enable-webservice) |
2306 |
--enable-webservice) |
| 2263 |
[ $WITH_GSOAP -eq 0 ] && WITH_GSOAP=1 |
2307 |
[ $WITH_GSOAP -eq 0 ] && WITH_GSOAP=1 |
| 2264 |
;; |
2308 |
;; |
|
|
2309 |
--enable-vnc) |
| 2310 |
WITH_VNC=1 |
| 2311 |
;; |
| 2265 |
--disable-hardening) |
2312 |
--disable-hardening) |
| 2266 |
WITH_HARDENING=0 |
2313 |
WITH_HARDENING=0 |
| 2267 |
;; |
2314 |
;; |
|
Lines 2533-2538
Link Here
|
| 2533 |
cnf_append "VBOX_WITH_DOCS_PACKING" "" |
2580 |
cnf_append "VBOX_WITH_DOCS_PACKING" "" |
| 2534 |
fi |
2581 |
fi |
| 2535 |
|
2582 |
|
|
|
2583 |
# VNC server support |
| 2584 |
if [ $OSE -ge 1 ]; then |
| 2585 |
if [ $WITH_VNC = 1 ]; then |
| 2586 |
check_vncserver |
| 2587 |
else |
| 2588 |
cnf_append "VBOX_WITH_VNC" "" |
| 2589 |
fi |
| 2590 |
fi |
| 2591 |
|
| 2536 |
# success! |
2592 |
# success! |
| 2537 |
echo |
2593 |
echo |
| 2538 |
echo "Successfully generated '$CNF' and '$ENV'." |
2594 |
echo "Successfully generated '$CNF' and '$ENV'." |
