Changeset 6098 in vbox

Timestamp:

Dec 16, 2007 8:11:31 PM (17 years ago)

Author:

vboxsync

Message:

configure: added --build-libxml2

File:

• trunk/configure (modified) (6 diffs)

trunk/configure

@@ -57 +57 @@
 LIBXERCES="-lxerces-c"
 LIBXERCES_DIR="/usr/local/lib"
+BUILD_LIBXML2=
 LIBCRYPTO="-lcrypto"
 LIBPTHREAD="-lpthread"
@@ -619 +620 @@
 check_libxml2()
 {
-  test_header libxml2
-
-  if which_wrapper pkg-config > /dev/null; then
-    libxml2_ver=`pkg-config libxml-2.0 --modversion 2>> $LOG`
-    if [ $? -ne 0 ]; then
-      log_failure "not found"
-      fail
-    else
-      FLGXML2=`pkg-config libxml-2.0 --cflags`
-      INCXML2=`strip_I "$FLGXML2"`
-      LIBXML2=`pkg-config libxml-2.0 --libs`
-      cat > .tmp_src.cc << EOF
+  if [ -z "$BUILD_LIBXML2" ]; then
+    test_header libxml2
+    if which_wrapper pkg-config > /dev/null; then
+      libxml2_ver=`pkg-config libxml-2.0 --modversion 2>> $LOG`
+      if [ $? -ne 0 ]; then
+        log_failure "not found"
+        fail
+      else
+        FLGXML2=`pkg-config libxml-2.0 --cflags`
+        INCXML2=`strip_I "$FLGXML2"`
+        LIBXML2=`pkg-config libxml-2.0 --libs`
+        cat > .tmp_src.cc << EOF
 #include <cstdio>
 #include <libxml/xmlversion.h>
@@ -645 +646 @@
 }
 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"`"
+        [ -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
-    fi
-  elif which_wrapper xml2-config; then
-    libxml2_ver=`xml2-config --version`
-    if [ $? -ne 0 ]; then
-      log_failure "not found"
-      fail
-    else
-      log_success "found version $libxml2_ver"
-      FLGXML2=`xml2-config --cflags`
-      INCXML2=`strip_I "$FLGXML2"`
-      LIBXML2=`xml2-config --libs`
-      cat > .tmp_src.cc << EOF
+    elif which_wrapper xml2-config; then
+      libxml2_ver=`xml2-config --version`
+      if [ $? -ne 0 ]; then
+        log_failure "not found"
+        fail
+      else
+        log_success "found version $libxml2_ver"
+        FLGXML2=`xml2-config --cflags`
+        INCXML2=`strip_I "$FLGXML2"`
+        LIBXML2=`xml2-config --libs`
+        cat > .tmp_src.cc << EOF
 #include <cstdio>
 #include <libxml/xmlversion.h>
@@ -678 +679 @@
 }
 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"`"
+        [ -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
-    fi
-  else
-    log_failure "neither pkg-config nor xml2-config found"
-    fail
+    else
+      log_failure "neither pkg-config nor xml2-config found"
+      fail
+    fi
   fi
 }
@@ -1343 +1345 @@
   --disable-xpcom          disable XPCOM and related stuff
   --disable-sdl-ttf        disable SDL_ttf detection
-  --build-xalan            build xalan & xerces from shipped sources
+  --build-xalan            build xalan & xerces from sources (not OSE!)
+  --build-libxml2          build libxml2 from sources (not OSE!)
   --setup-wine             setup a Wine directory and register the hhc hack
 
@@ -1442 +1445 @@
       LIBXALAN=
       LIBXALAN_DIR=
+      ;;
+    --build-libxml2)
+      BUILD_LIBXML2=1
       ;;
     --build-headless)