Changeset 16994 in vbox for trunk/configure

Timestamp:

Feb 22, 2009 3:57:56 AM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

43186

Message:

configure: Updated/fixed gSOAP detection.

File:

• trunk/configure (modified) (5 diffs)

trunk/configure

@@ -88 +88 @@
 LIBCAP="-lcap"
 GSOAP=""
+GSOAP_IMPORT=""
 LIBX11="-L/usr/X11R6/lib -L/usr/X11R6/lib64 -L/usr/local/lib -lXext -lX11"
 INCX11="/usr/local/include"
@@ -1626 +1627 @@
 
 #
-#
+# Check for gSOAP.
 #
 check_gsoap()
@@ -1632 +1633 @@
   test_header "GSOAP compiler"
   if [ -z "$GSOAP" ]; then
-    GSOAP="/usr/bin"
-  fi
-  if which_wrapper "$GSOAP/soapcpp2" > /dev/null; then
-    if which_wrapper "$GSOAP/wsdl2h" > /dev/null; then
-      cnf_append "VBOX_GSOAP_INSTALLED" "1"
-      cnf_append "VBOX_PATH_GSOAP"      "$GSOAP"
-      log_success "found"
+    GSOAP="/usr"
+  fi
+  if which_wrapper "$GSOAP/bin/soapcpp2" > /dev/null; then
+    if which_wrapper "$GSOAP/bin/wsdl2h" > /dev/null; then
+      if [ -f "$GSOAP/include/stdsoap2.h" ]; then
+        # TODO: Check for libgsoap++.a/so
+
+        if [ -z "$GSOAP_IMPORT" ]; then
+          GSOAP_IMPORT="$GSOAP/share/gsoap/import"
+          if [ ! -d "$GSOAP_IMPORT"  -a  -d "$GSOAP/include/gsoap" ]; then
+            GSOAP_IMPORT="$GSOAP/include/gsoap"
+          fi
+        fi
+        if [ -f "$GSOAP_IMPORT/stlvector.h" ]; then
+          cnf_append "VBOX_GSOAP_INSTALLED"   "1"
+          cnf_append "VBOX_PATH_GSOAP"        "$GSOAP"
+          cnf_append "VBOX_PATH_GSOAP_IMPORT" "$GSOAP_IMPORT"
+          cnf_append "VBOX_GSOAP_CXX_SOURCES" ""
+          cnf_append "VBOX_GSOAP_CXX_LIBS"    "libgsoap++"
+          log_success "found"
+        else
+          log_failure "stlvector.h not found -- disabling webservice"
+          cnf_append "VBOX_WITH_WEBSERVICES" ""
+        fi
+      else
+        log_failure "stdsoap2.h not found -- disabling webservice"
+        cnf_append "VBOX_WITH_WEBSERVICES" ""
+      fi
     else
       log_failure "wsdl2h not found -- disabling webservice"
@@ -1728 +1750 @@
   --with-mkisofs=PATH      location of mkisofs [$MKISOFS]
   --with-qt-dir=DIR        directory for Qt4 headers/libraries [pkgconfig]
-  --with-gsoap-dir=PATH    directory for SOAP compiler (soapcpp2 and wsdl2h)
+  --with-gsoap-dir=PATH    directory for gSOAP compiler/headers/libraries
+                           (soapcpp2 and wsdl2h, soapstd2.h, libgsoap++.a/so)
+  --with-gsoap-import=PATH directory for gSOAP import files (stlvector.h)
   --out-path=PATH          the folder to which configuration and build output
                            should go
@@ -1776 +1800 @@
     --with-gsoap-dir=*)
       GSOAP=`echo $option | cut -d'=' -f2`
+      ;;
+    --with-gsoap-import=*)
+      GSOAP_IMPORT=`echo $option | cut -d'=' -f2`
       ;;
     --with-iasl=*)