1 | Index: configure
|
---|
2 | ===================================================================
|
---|
3 | --- configure (revision 34374)
|
---|
4 | +++ configure (working copy)
|
---|
5 | @@ -89,6 +89,7 @@
|
---|
6 | WITH_HARDENING=1
|
---|
7 | WITH_VDE=0
|
---|
8 | WITH_DOCS=1
|
---|
9 | +WITH_GLIB2=
|
---|
10 | BUILD_LIBXML2=
|
---|
11 | BUILD_LIBXSLT=
|
---|
12 | BUILD_LIBCURL=
|
---|
13 | @@ -629,6 +630,84 @@
|
---|
14 | fi
|
---|
15 | }
|
---|
16 |
|
---|
17 | +#
|
---|
18 | +# Check for glib2, needed by xpidl (?)
|
---|
19 | +#
|
---|
20 | +check_glib2()
|
---|
21 | +{
|
---|
22 | + if [ $WITH_GLIB2 -eq 1 ]; then
|
---|
23 | + test_header glib2
|
---|
24 | + if which_wrapper pkg-config > /dev/null; then
|
---|
25 | + glib2_ver=`pkg-config glib-2.0 --modversion 2>> $LOG`
|
---|
26 | + if [ $? -ne 0 ]; then
|
---|
27 | + log_failure "glib2 not found"
|
---|
28 | + fail
|
---|
29 | + else
|
---|
30 | + FLGGLIB2=`pkg-config glib-2.0 --cflags`
|
---|
31 | + INCGLIB2=`strip_I "$FLGGLIB2"`
|
---|
32 | + LIBGLIB2=`pkg-config glib-2.0 --libs`
|
---|
33 | + cat > $ODIR.tmp_src.cc << EOF
|
---|
34 | +#include <cstdio>
|
---|
35 | +#include <glib.h>
|
---|
36 | +extern "C" int main(void)
|
---|
37 | +{
|
---|
38 | + printf("found version %d.%d.%d", glib_major_version, glib_minor_version, glib_micro_version);
|
---|
39 | +#if GLIB_CHECK_VERSION(2, 0, 0)
|
---|
40 | + printf(", OK.\n");
|
---|
41 | + return 0;
|
---|
42 | +#else
|
---|
43 | + printf(", expected version 2.0.0 or higher\n");
|
---|
44 | + return 1;
|
---|
45 | +#endif
|
---|
46 | +}
|
---|
47 | +EOF
|
---|
48 | + [ -n "$INCGLIB2" ] && I_INCGLIB2=`prefix_I "$INCGLIB2"`
|
---|
49 | + if test_compile "$LIBGLIB2 $LIBPTHREAD $I_INCGLIB2" glib2 glib2; then
|
---|
50 | + if test_execute; then
|
---|
51 | + cnf_append "SDK_VBOX_LIBGLIB2_INCS" "$INCGLIB2"
|
---|
52 | + cnf_append "SDK_VBOX_LIBGLIB2_LIBS" "`strip_l "$LIBGLIB2"`"
|
---|
53 | + fi
|
---|
54 | + fi
|
---|
55 | + fi
|
---|
56 | + elif which_wrapper glib2-config; then
|
---|
57 | + glib2_ver=`glib2-config --version`
|
---|
58 | + if [ $? -ne 0 ]; then
|
---|
59 | + log_failure "glib2-config not found"
|
---|
60 | + fail
|
---|
61 | + else
|
---|
62 | + log_success "found version $glib2_ver"
|
---|
63 | + FLGXML2=`glib2-config --cflags`
|
---|
64 | + INCXML2=`strip_I "$FLGXML2"`
|
---|
65 | + LIBXML2=`glib2-config --libs`
|
---|
66 | + cat > $ODIR.tmp_src.cc << EOF
|
---|
67 | +#include <cstdio>
|
---|
68 | +#include <glib.h>
|
---|
69 | +extern "C" int main(void)
|
---|
70 | +{
|
---|
71 | + printf("found version %d.%d.%d", glib_major_version, glib_minor_version, glib_micro_version);
|
---|
72 | +#if GLIB_CHECK_VERSION(2, 0, 0)
|
---|
73 | + printf(", OK.\n");
|
---|
74 | + return 0;
|
---|
75 | +#else
|
---|
76 | + printf(", expected version 2.0.0 or higher\n");
|
---|
77 | + return 1;
|
---|
78 | +#endif
|
---|
79 | +}
|
---|
80 | +EOF
|
---|
81 | + [ -n "$INCGLIB2" ] && I_INCGLIB2=`prefix_I "$INCGLIB2"`
|
---|
82 | + if test_compile "$LIBGLIB2 $LIBPTHREAD $I_INCGLIB2" glib2 glib2; then
|
---|
83 | + if test_execute; then
|
---|
84 | + cnf_append "SDK_VBOX_LIBGLIB2_INCS" "$INCGLIB2"
|
---|
85 | + cnf_append "SDK_VBOX_LIBGLIB2_LIBS" "`strip_l "$LIBGLIB2"`"
|
---|
86 | + fi
|
---|
87 | + fi
|
---|
88 | + fi
|
---|
89 | + else
|
---|
90 | + log_failure "neither pkg-config nor glib2-config found"
|
---|
91 | + fail
|
---|
92 | + fi
|
---|
93 | + fi
|
---|
94 | +}
|
---|
95 |
|
---|
96 | #
|
---|
97 | # Check for libxml2, needed by VBoxSettings and Runtime.
|
---|
98 | @@ -2175,6 +2263,7 @@
|
---|
99 | WITH_PULSE=0
|
---|
100 | WITH_DBUS=0
|
---|
101 | WITH_KMODS=0
|
---|
102 | + WITH_GLIB2=1
|
---|
103 | BUILD_LIBXSLT=1
|
---|
104 | BUILD_LIBXML2=1
|
---|
105 | [ $OSE -eq 1 ] || BUILD_LIBCURL=1
|
---|
106 | @@ -2472,6 +2561,7 @@
|
---|
107 |
|
---|
108 | # the libraries
|
---|
109 | [ "$OS" != "darwin" ] && check_pthread
|
---|
110 | +check_glib2
|
---|
111 | check_libxml2
|
---|
112 | [ $WITH_XPCOM -eq 1 ] && check_libxslt
|
---|
113 | [ $WITH_LIBIDL -eq 1 ] && check_libidl
|
---|