Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2p-next

Conflicts:
	firmware/microblaze/lib/u2_init.c
	host/lib/usrp/usrp2/clock_ctrl.cpp
	host/lib/usrp/usrp2/fw_common.h
	host/lib/usrp/usrp2/mboard_impl.cpp
	host/lib/usrp/usrp2/usrp2_iface.cpp
	host/lib/usrp/usrp2/usrp2_iface.hpp

1 files changed, 17 insertions, 18 deletions

diff --git a/host/config/Python.cmake b/host/config/Python.cmake
index 55ef6acca..95cdb4479 100644
--- a/host/config/Python.cmake
+++ b/host/config/Python.cmake
@@ -18,32 +18,31 @@
 ########################################################################
 # Setup Python
 ########################################################################
-INCLUDE(FindPythonInterp)
+IF(NOT DEFINED PYTHON_EXECUTABLE)
+    INCLUDE(FindPythonInterp)
 
-IF(NOT PYTHONINTERP_FOUND)
-    MESSAGE(FATAL_ERROR "Error: Python interpretor required by the build system.")
-ENDIF(NOT PYTHONINTERP_FOUND)
+    IF(NOT PYTHONINTERP_FOUND)
+        MESSAGE(FATAL_ERROR "Error: Python interpretor required by the build system.")
+    ENDIF(NOT PYTHONINTERP_FOUND)
+ENDIF(NOT DEFINED PYTHON_EXECUTABLE)
 
-MACRO(PYTHON_CHECK_MODULE module have)
-    MESSAGE(STATUS "Checking for python module ${module}")
+MACRO(PYTHON_CHECK_MODULE desc mod cmd have)
+    MESSAGE(STATUS "Python checking for ${desc}")
     EXECUTE_PROCESS(
-        COMMAND ${PYTHON_EXECUTABLE} -c "import ${module}"
+        COMMAND ${PYTHON_EXECUTABLE} -c "
+#########################################
+try: import ${mod}
+except: exit(-1)
+try: assert ${cmd}
+except: exit(-1)
+#########################################"
         RESULT_VARIABLE ${have}
     )
     IF(${have} EQUAL 0)
-        MESSAGE(STATUS "Checking for python module ${module} - found")
+        MESSAGE(STATUS "Python checking for ${desc} - found")
         SET(${have} TRUE)
     ELSE(${have} EQUAL 0)
-        MESSAGE(STATUS "Checking for python module ${module} - not found")
+        MESSAGE(STATUS "Python checking for ${desc} - not found")
         SET(${have} FALSE)
     ENDIF(${have} EQUAL 0)
 ENDMACRO(PYTHON_CHECK_MODULE)
-
-########################################################################
-# Check Modules
-########################################################################
-PYTHON_CHECK_MODULE("Cheetah" HAVE_PYTHON_MODULE_CHEETAH)
-
-IF(NOT HAVE_PYTHON_MODULE_CHEETAH)
-    MESSAGE(FATAL_ERROR "Error: Cheetah Templates required by the build system.")
-ENDIF(NOT HAVE_PYTHON_MODULE_CHEETAH)