From daf466a697f8cb93b895b4da0f2905689dc6ab38 Mon Sep 17 00:00:00 2001
From: Stefan Seefeld <stefan@seefeld.name>
Date: Mon, 30 May 2011 01:18:16 +0000
Subject: [PATCH] Work on numpy configuration

---
 numpy.jam | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/numpy.jam b/numpy.jam
index e18a0b5d..79b53169 100644
--- a/numpy.jam
+++ b/numpy.jam
@@ -1,18 +1,23 @@
 import testing ;
 import python ;
 
+rule init ( )
+{
+  project.push-current $(.project) ;
+  debug-message Configuring numpy... ;
+
+  local full-cmd =
+    $(python.interpreter)" -c \"from numpy.distutils import misc_util; print misc_util.get_numpy_include_dirs()" ;
+
+  local output = [ shell-cmd $(full-cmd) ] ;
+  includes = $(output) ;
+
+  project.pop-current ;
+}
+
 rule numpy-test ( name : sources * : requirements * )
 {
     sources ?= $(name).py $(name)_mod.cpp ;
     return [ testing.make-test run-pyd : $(sources) /boost/numpy//boost_numpy
         : $(requirements) : $(name) ] ;
 }
-
-rule probe ( python-cmd )
-{
-  local full-cmd =
-      $(python-cmd)" -c \"from numpy.distutils import misc_util; print misc_util.get_numpy_include_dirs()" ;
-
-  local output = [ shell-cmd $(full-cmd) ] ;
-  return $(output) ;
-}