Changeset 2549 in vbox

Timestamp:

May 9, 2007 8:54:59 AM (18 years ago)

Author:

vboxsync

Message:

configure: we are not using precompiled objects anymore; added --build-xalan to force building xalan & xerces from shipped sources; use this new option to fix the rhel4 build

File:

• trunk/configure (modified) (7 diffs)

trunk/configure

@@ -253 +253 @@
         fail really
       elif (($cc_maj>3)); then
-        if [ "$MACHINE" = "x86" ]; then
-          log_success "found version $cc_ver, using precompiled objects for recompiler"
-          cnf_append "VBOX_USING_GCC4" "1"
-        else
-          log_success "found version $cc_ver"
-        fi
+        log_success "found version $cc_ver"
       elif (($cc_maj<3 || $cc_min<2)); then
         log_failure "gcc version $cc_ver found, expected at least gcc version 3.2"
@@ -426 +421 @@
 function check_xalan()
 {
-  test_header xalan
-  echo '
+  if [ -n "$LIBXALAN" ]; then
+    test_header xalan
+    echo '
 #include <cstdio>
 #include <xalanc/Include/XalanVersion.hpp>
@@ -443 +439 @@
 }
 ' > .tmp_src.cc
-  if test_compile "$LIBXALAN ${INCXALAN:+-I$INCXALAN}" xalan xalanc; then
-    if test_execute; then
-      cnf_append "SDK_VBOX_XALAN_LIBS" `echo $LIBXALAN|sed 's+-l++'`
-      cnf_append "SDK_VBOX_XALAN_INCS" "$INCXALAN"
-    fi
+    if test_compile "$LIBXALAN ${INCXALAN:+-I$INCXALAN}" xalan xalanc; then
+      if test_execute; then
+        cnf_append "SDK_VBOX_XALAN_LIBS" `echo $LIBXALAN|sed 's+-l++'`
+        cnf_append "SDK_VBOX_XALAN_INCS" "$INCXALAN"
+      fi
+    fi
+  else
+    echo "Building xalan from shipped sources."
+    echo -e "Building xalan from shipped sources.\n\n" >> $LOG
   fi
 }
@@ -456 +456 @@
 function check_xerces()
 {
-  test_header xerces
-  echo '
+  if [ -n "$LIBXERCES" ]; then
+    test_header xerces
+    echo '
 #include <cstdio>
 #include <xercesc/util/XercesVersion.hpp>
@@ -473 +474 @@
 }
 ' > .tmp_src.cc
-  if test_compile "$LIBXERCES ${INCXERCES:+-I$INCXERCES}" xerces xercesc; then
-    if test_execute; then
-      cnf_append "SDK_VBOX_XERCES_LIBS" `echo $LIBXERCES|sed 's+-l++'`
-      cnf_append "SDK_VBOX_XERCES_INCS" "$INCXERCES"
-    fi
+    if test_compile "$LIBXERCES ${INCXERCES:+-I$INCXERCES}" xerces xercesc; then
+      if test_execute; then
+        cnf_append "SDK_VBOX_XERCES_LIBS" `echo $LIBXERCES|sed 's+-l++'`
+        cnf_append "SDK_VBOX_XERCES_INCS" "$INCXERCES"
+      fi
+    fi
+  else
+    echo "Building xerces from shipped sources."
+    echo -e "Building xerces from shipped sources.\n\n" >> $LOG
   fi
 }
@@ -1001 +1006 @@
   --disable-xpcom         disable XPCOM and related stuff
   --disable-sdl-ttf       disable SDL_ttf detection
+  --build-xalan           build xalan & xerces from shipped sources
 
 Paths:
@@ -1075 +1081 @@
     --build-debug|-d)
       BUILD_TYPE=debug
+      ;;
+    --build-xalan)
+      LIBXERCES=``
+      LIBXALAN=``
       ;;
     --ose)