Changeset 90354 in vbox for trunk/configure

Timestamp:

Jul 27, 2021 11:57:54 AM (4 years ago)

Author:

vboxsync

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

145918

Message:

configure, debian/rules, rpm/rules: Many bug fixes. Clean up the debian building to use purely the out directory (which needs relocating its files to the out directory, too, because the debhelper utilities can't deal with a separate temp directory structure). This un-breaks the debian package building which was caused by the incomplete previous change.

File:

• trunk/configure (modified) (5 diffs)

trunk/configure

@@ -82 +82 @@
 WITH_VMMRAW=1
 WITH_LIBIDL=1
-WITH_GSOAP=0
 WITH_QT5=1
 WITH_SDL=1
@@ -2375 +2374 @@
 [ $WITH_OPENGL  -eq 1 ] && echo "  --disable-opengl         disable OpenGL support (2D & 3D)"
 [ $WITH_QT5     -eq 0 ] && echo "  --enable-qt5             enable Qt5 detection"
-[ $WITH_GSOAP   -eq 0 ] && echo "  --enable-webservice      enable the webservice stuff"
 [ $OSE          -eq 1 ] && echo "  --enable-vnc             enable the VNC server"
 [ $OSE          -eq 0 ] && echo "  --disable-extpack        don't build the extpack"
@@ -2410 +2408 @@
 [ "$OS"    = "linux" ] && echo "  --with-linux=DIR         Linux kernel source directory [$LINUX]"
 [ $WITH_QT5    -eq 1 ] && echo "  --with-qt-dir=DIR        directory for Qt headers/libraries [pkgconfig]"
-[ $WITH_GSOAP  -eq 1 ] && echo "  --with-gsoap-dir=PATH    directory for gSOAP compiler/headers/libraries"
-[ $WITH_GSOAP  -eq 1 ] && echo "                           (soapcpp2 and wsdl2h, soapstd2.h, libgsoap++.a/so)"
-[ $WITH_GSOAP  -eq 1 ] && echo "  --with-gsoap-import=PATH directory for gSOAP import files (stlvector.h)"
 cat << EOF
+  --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)
   --with-openssl-dir=DIR   directory for OpenSSL headers/libraries
   --with-ow-dir=DIR        directory where Open Watcom can be found [$WATCOM]
@@ -2592 +2590 @@
       ;;
     --enable-webservice)
-      [ $WITH_GSOAP -eq 0 ] && WITH_GSOAP=1
       ;;
     --enable-vnc)
@@ -2909 +2906 @@
 [ -n "$SETUP_WINE" ] && setup_wine
 
-if [ $ONLY_ADDITIONS -eq 0 -a $WITH_GSOAP -eq 1 ]; then
+if [ $ONLY_ADDITIONS -eq 0 ]; then
   check_gsoap
 else
-  if [ $OSE -ge 1 ]; then
-    cnf_append "VBOX_WITH_WEBSERVICES" ""
-  fi
+  cnf_append "VBOX_WITH_WEBSERVICES" ""
 fi