Changeset 6097 in vbox

Timestamp:

Dec 16, 2007 7:53:09 PM (17 years ago)

Author:

vboxsync

Message:

configure: check for libxml2 >= version 2.6.23 as libxml2 2.6.22 is known to not work

File:

• trunk/configure (modified) (4 diffs)

trunk/configure

@@ -592 +592 @@
   return 0;
 #else
-  printf(", expected version 2.5.0 or higher");
+  printf(", expected version 2.5.0 or higher\n");
   return 1;
 #endif
@@ -615 +615 @@
 #
 # Check for libxml2, needed by xpcom
+# For now we check for libxml2 2.6.23 as 2.6.22 is known to NOT work
 #
 check_libxml2()
@@ -626 +627 @@
       fail
     else
-      log_success "found version $libxml2_ver"
       FLGXML2=`pkg-config libxml-2.0 --cflags`
       INCXML2=`strip_I "$FLGXML2"`
       LIBXML2=`pkg-config libxml-2.0 --libs`
-      cnf_append "SDK_VBOX_LIBXML2_INCS" "$INCXML2"
-      cnf_append "SDK_VBOX_LIBXML2_LIBS" "`strip_l "$LIBXML2"`"
+      cat > .tmp_src.cc << EOF
+#include <cstdio>
+#include <libxml/xmlversion.h>
+extern "C" int main(void)
+{
+  printf("found version %s", LIBXML_DOTTED_VERSION);
+#if LIBXML_VERSION >= 20623
+  printf(", OK.\n");
+  return 0;
+#else
+  printf(", expected version 2.6.23 or higher\n");
+  return 1;
+#endif
+}
+EOF
+      [ -n "$INCXML2" ] && I_INCXML2=`prefix_I "$INCXML2"`
+      if test_compile "$LIBXML2 $LIBPTHREAD $I_INCXML2" xml2 xml2; then
+        if test_execute; then
+          cnf_append "SDK_VBOX_LIBXML2_INCS" "$INCXML2"
+          cnf_append "SDK_VBOX_LIBXML2_LIBS" "`strip_l "$LIBXML2"`"
+        fi
+      fi
     fi
   elif which_wrapper xml2-config; then
@@ -643 +663 @@
       INCXML2=`strip_I "$FLGXML2"`
       LIBXML2=`xml2-config --libs`
-      cnf_append "SDK_VBOX_LIBXML2_INCS" "$INCXML2"
-      cnf_append "SDK_VBOX_LIBXML2_LIBS" "`strip_l "$LIBCXML2"`"
+      cat > .tmp_src.cc << EOF
+#include <cstdio>
+#include <libxml/xmlversion.h>
+extern "C" int main(void)
+{
+  printf("found version %s", LIBXML_DOTTED_VERSION);
+#if LIBXML_VERSION >= 20623
+  printf(", OK.\n");
+  return 0;
+#else
+  printf(", expected version 2.6.23 or higher\n");
+  return 1;
+#endif
+}
+EOF
+      [ -n "$INCXML2" ] && I_INCXML2=`prefix_I "$INCXML2"`
+      if test_compile "$LIBXML2 $LIBPTHREAD $I_INCXML2" xml2 xml2; then
+        if test_execute; then
+          cnf_append "SDK_VBOX_LIBXML2_INCS" "$INCXML2"
+          cnf_append "SDK_VBOX_LIBXML2_LIBS" "`strip_l "$LIBXML2"`"
+        fi
+      fi
     fi
   else