Ensure we don't link python to main xbmc binary.

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@25353 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

diff --git a/configure.in b/configure.in
index 85b7db2..b720c27 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -622,15 +622,18 @@ fi
 
 # External Python
 if test "$use_external_libraries" = "yes" || test "$use_external_python" = "yes"; then
-  AC_CHECK_LIB([python2.6], [main],,
-  [AC_CHECK_LIB([python2.5], [main],,
-  [AC_CHECK_LIB([python2.4], [main],,
-  [AC_MSG_ERROR($missing_library)] )] )] )
-
-  # Test again, but this time just set some variables we need in Makefiles
-  AC_CHECK_LIB([python2.6], [main],[USE_PYTHON2_6=1],
-  [AC_CHECK_LIB([python2.5], [main],[USE_PYTHON2_5=1],
-  [AC_CHECK_LIB([python2.4], [main],[USE_PYTHON2_4=1],
+  AC_CHECK_LIB([python2.6], [main],
+    [AC_DEFINE([HAVE_LIBPYTHON2_6], [1],
+    [Define to 1 if you have the `python2.6' library.])
+    USE_PYTHON2_6=1],
+  [AC_CHECK_LIB([python2.5], [main],
+    [AC_DEFINE([HAVE_LIBPYTHON2_5], [1],
+    [Define to 1 if you have the `python2.5' library.])
+    USE_PYTHON2_5=1],
+  [AC_CHECK_LIB([python2.4], [main],
+    [AC_DEFINE([HAVE_LIBPYTHON2_4], [1],
+    [Define to 1 if you have the `python2.4' library.])
+    USE_PYTHON2_4=1],
   [AC_MSG_ERROR($missing_library)] )] )] )
 
   AC_MSG_NOTICE($external_python_enabled)

diff --git a/xbmc/lib/libPython/XBPythonDll.cpp b/xbmc/lib/libPython/XBPythonDll.cpp
index 3a6d3cd..7f8b618 100644 (file)
--- a/xbmc/lib/libPython/XBPythonDll.cpp
+++ b/xbmc/lib/libPython/XBPythonDll.cpp
@@ -41,6 +41,8 @@ extern "C"
   FUNCTION(PyEval_AcquireLock)
   FUNCTION(PyThreadState_Get)
   FUNCTION(PyRun_SimpleString)
+  FUNCTION(PyRun_SimpleStringFlags)
+  FUNCTION(PyRun_SimpleFileExFlags)
   FUNCTION(PyEval_InitThreads)
   FUNCTION(Py_Initialize)
   FUNCTION(Py_IsInitialized)
@@ -143,6 +145,8 @@ extern "C"
       dll.ResolveExport(DLL_FUNCTION(PyEval_AcquireLock)) &&
       dll.ResolveExport(DLL_FUNCTION(PyThreadState_Get)) &&
       dll.ResolveExport(DLL_FUNCTION(PyRun_SimpleString)) &&
+      dll.ResolveExport(DLL_FUNCTION(PyRun_SimpleStringFlags)) &&
+      dll.ResolveExport(DLL_FUNCTION(PyRun_SimpleFileExFlags)) &&
       dll.ResolveExport(DLL_FUNCTION(PyEval_InitThreads)) &&
       dll.ResolveExport(DLL_FUNCTION(Py_Initialize)) &&
       dll.ResolveExport(DLL_FUNCTION(Py_IsInitialized)) &&

diff --git a/xbmc/lib/libPython/XBPythonDllFuncs.S b/xbmc/lib/libPython/XBPythonDllFuncs.S
index 707b1d9..0c42ee1 100644 (file)
--- a/xbmc/lib/libPython/XBPythonDllFuncs.S
+++ b/xbmc/lib/libPython/XBPythonDllFuncs.S
@@ -40,6 +40,8 @@
   FUNCTION(PyEval_AcquireLock)
   FUNCTION(PyThreadState_Get)
   FUNCTION(PyRun_SimpleString)
+  FUNCTION(PyRun_SimpleStringFlags)
+  FUNCTION(PyRun_SimpleFileExFlags)
   FUNCTION(PyEval_InitThreads)
   FUNCTION(Py_Initialize)
   FUNCTION(Py_IsInitialized)