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 956-961
Link Here
|
956 |
} |
959 |
} |
957 |
|
960 |
|
958 |
# |
961 |
# |
|
|
962 |
# Check for libvncserver, needed for VNC in OSE |
963 |
# |
964 |
check_vncserver() |
965 |
{ |
966 |
test_header libvncserver |
967 |
cat > $ODIR.tmp_src.cc <<EOF |
968 |
#include <cstdio> |
969 |
#include <rfb/rfbconfig.h> |
970 |
|
971 |
extern "C" int main() |
972 |
{ |
973 |
const char* v=LIBVNCSERVER_VERSION; |
974 |
unsigned int major = 0, minor = 0, micro = 0; |
975 |
|
976 |
for (; *v !='.' && *v != '\0'; v++) major = major*10 + *v-'0'; |
977 |
if (*v == '.') v++; |
978 |
for (; *v !='.' && *v != '\0'; v++) minor = minor*10 + *v-'0'; |
979 |
if (*v == '.') v++; |
980 |
for (; *v !='.' && *v != '\0'; v++) micro = micro*10 + *v-'0'; |
981 |
|
982 |
printf("found version %s", LIBVNCSERVER_PACKAGE_VERSION); |
983 |
if (major*10000 + minor*100 + micro >= 907) |
984 |
{ |
985 |
printf(", OK.\n"); |
986 |
return 0; |
987 |
} |
988 |
else |
989 |
{ |
990 |
printf(", expected version 0.9.7 or higher\n"); |
991 |
return 1; |
992 |
} |
993 |
} |
994 |
EOF |
995 |
if test_compile "$LIBVNCSERVER $INCVNCSERVER" libvncserver libvncserver; then |
996 |
if test_execute; then |
997 |
cnf_append "VBOX_WITH_VNC" "1" |
998 |
fi |
999 |
fi |
1000 |
} |
1001 |
|
1002 |
# |
959 |
# Check for libcurl, needed by S3 |
1003 |
# Check for libcurl, needed by S3 |
960 |
# |
1004 |
# |
961 |
check_curl() |
1005 |
check_curl() |
Lines 2115-2120
Link Here
|
2115 |
[ $WITH_KMODS -eq 1 ] && echo " --disable-kmods don't build Linux kernel modules (host and guest)" |
2159 |
[ $WITH_KMODS -eq 1 ] && echo " --disable-kmods don't build Linux kernel modules (host and guest)" |
2116 |
[ $WITH_OPENGL -eq 1 ] && echo " --disable-opengl disable OpenGL support (2D & 3D)" |
2160 |
[ $WITH_OPENGL -eq 1 ] && echo " --disable-opengl disable OpenGL support (2D & 3D)" |
2117 |
[ $WITH_GSOAP -eq 0 ] && echo " --enable-webservice enable the webservice stuff" |
2161 |
[ $WITH_GSOAP -eq 0 ] && echo " --enable-webservice enable the webservice stuff" |
|
|
2162 |
[ $OSE -eq 1 ] && echo " --enable-vnc enable the VNC server" |
2118 |
[ $WITH_DOCS -eq 1 ] && echo " --disable-docs don't build the documentation" |
2163 |
[ $WITH_DOCS -eq 1 ] && echo " --disable-docs don't build the documentation" |
2119 |
[ "$OS" = "linux" -o "$OS" = "freebsd" ] && echo " --enable-vde enable VDE networking" |
2164 |
[ "$OS" = "linux" -o "$OS" = "freebsd" ] && echo " --enable-vde enable VDE networking" |
2120 |
cat << EOF |
2165 |
cat << EOF |
Lines 2280-2285
Link Here
|
2280 |
--enable-webservice) |
2325 |
--enable-webservice) |
2281 |
[ $WITH_GSOAP -eq 0 ] && WITH_GSOAP=1 |
2326 |
[ $WITH_GSOAP -eq 0 ] && WITH_GSOAP=1 |
2282 |
;; |
2327 |
;; |
|
|
2328 |
--enable-vnc) |
2329 |
WITH_VNC=1 |
2330 |
;; |
2283 |
--disable-hardening) |
2331 |
--disable-hardening) |
2284 |
WITH_HARDENING=0 |
2332 |
WITH_HARDENING=0 |
2285 |
;; |
2333 |
;; |
Lines 2553-2558
Link Here
|
2553 |
cnf_append "VBOX_WITH_DOCS_PACKING" "" |
2601 |
cnf_append "VBOX_WITH_DOCS_PACKING" "" |
2554 |
fi |
2602 |
fi |
2555 |
|
2603 |
|
|
|
2604 |
# VNC server support |
2605 |
if [ $OSE -ge 1 ]; then |
2606 |
if [ $WITH_VNC = 1 ]; then |
2607 |
check_vncserver |
2608 |
else |
2609 |
cnf_append "VBOX_WITH_VNC" "" |
2610 |
fi |
2611 |
fi |
2612 |
|
2556 |
# success! |
2613 |
# success! |
2557 |
echo |
2614 |
echo |
2558 |
echo "Successfully generated '$CNF' and '$ENV'." |
2615 |
echo "Successfully generated '$CNF' and '$ENV'." |