Changeset 11578 in vbox

Timestamp:

Aug 22, 2008 3:47:17 PM (17 years ago)

Author:

vboxsync

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

35186

Message:

enabled python builds if headers found

File:

• trunk/src/libs/xpcom18a4/Makefile.kmk (modified) (2 diffs)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -39 +39 @@
 
 
-ifdef VBOX_WITH_PYTHON
+# Temporary disable Python on Solaris, as there's header conflict
+ifneq ($(KBUILD_TARGET),solaris)
+# Find most appropriate Python headers
+PYTHON_INCS=$(lastword $(sort $(wildcard /usr/include/python2.*/)))
+endif
+
+# build Python<->XPCOM bridge only if Python headers found
+ifneq ($(PYTHON_INCS),)
 # bridge for Python to invoke XPCOM
 XPCOM_PYMOD = VBox-xpcom-pymod
-# VBox-xpcom-helper
-# bridge between host application and VirtualBox library, for embedded case
-XPCOM_VBOX_HELPER = VBox-xpcom-helper
-# XXX: to be defined in configure
-PYTHON_INCS=/usr/include/python2.5
 endif
 
@@ -278 +280 @@
         VBoxXPCOM               \
         VBoxXPCOMIPCC           \
-        $(XPCOM_PYMOD)          \
-        $(XPCOM_VBOX_HELPER)
+        $(XPCOM_PYMOD)          
+
+# we put it here, as template it uses depends on VBoxRT, 
+# which may not be built yet
+OTHERS +=                       \
+        $(TARGET_VBox-xpcom-helper)
+
 
 ifdef VBOX_WITH_TESTCASES