[cig-commits] r13603 - in cs/cigma/trunk: . config

[luis at geodynamics.org]

Author: luis
Date: 2008-12-09 18:15:44 -0800 (Tue, 09 Dec 2008)
New Revision: 13603

Modified:
   cs/cigma/trunk/config/cigma_boost.m4
   cs/cigma/trunk/config/cigma_python.m4
   cs/cigma/trunk/configure.ac
Log:
Fix PYTHON_LIBS: the BLDLIBRARY variable is empty on Mac OS X

Modified: cs/cigma/trunk/config/cigma_boost.m4
===================================================================
--- cs/cigma/trunk/config/cigma_boost.m4	2008-12-10 02:15:42 UTC (rev 13602)
+++ cs/cigma/trunk/config/cigma_boost.m4	2008-12-10 02:15:44 UTC (rev 13603)
@@ -40,7 +40,7 @@
                     ax_cv_search_save_LIBS=$LIBS
                     for ax_current_lib in $ax_python_lib; do
                       ax_res=-l$ax_current_lib
-                      LIBS="-l$ax_current_lib $PYTHON_BLDLIBRARY $ax_cv_search_save_LIBS"
+                      LIBS="-l$ax_current_lib $PYTHON_LIBS $ax_cv_search_save_LIBS"
                       AC_LINK_IFELSE([#include <boost/python/module.hpp>
                                       using namespace boost::python;
                                       BOOST_PYTHON_MODULE(test) { throw "Boost::Python test."; }

Modified: cs/cigma/trunk/config/cigma_python.m4
===================================================================
--- cs/cigma/trunk/config/cigma_python.m4	2008-12-10 02:15:42 UTC (rev 13602)
+++ cs/cigma/trunk/config/cigma_python.m4	2008-12-10 02:15:44 UTC (rev 13603)
@@ -9,8 +9,11 @@
 #
 AC_DEFUN([CIGMA_PYTHON],[
     AC_REQUIRE([CIGMA_PYTHON_SYSCONFIG])
+    
     PYTHON_INCLUDES="-I$PYTHON_INCDIR"
+    PYTHON_LIBS="-L$PYTHON_LIBPL -lpython$PYTHON_VERSION $PYTHON_LIBS"
     AC_SUBST([PYTHON_INCLUDES])
+    AC_SUBST([PYTHON_LIBS])
 ])
 
 ##############################################################################

Modified: cs/cigma/trunk/configure.ac
===================================================================
--- cs/cigma/trunk/configure.ac	2008-12-10 02:15:42 UTC (rev 13602)
+++ cs/cigma/trunk/configure.ac	2008-12-10 02:15:44 UTC (rev 13603)
@@ -59,6 +59,7 @@
 
 CIGMA_BOOST_PYTHON
 echo "PYTHON is '$PYTHON'"
+echo "PYTHON_LIBS is '$PYTHON_LIBS'"
 echo "BOOST_PYTHON_LIBS is '$BOOST_PYTHON_LIBS'"
 if test -z "$BOOST_PYTHON_LIBS"; then
     AC_MSG_ERROR([[boost::python could not be found. Please ensure that LDFLAGS is configured properly, or specify --with-boost]])
@@ -108,7 +109,6 @@
 echo "- PYTHON               : $PYTHON"
 echo "- PYTHON_INCLUDES      : $PYTHON_INCLUDES"
 echo "- PYTHON_LIBS          : $PYTHON_LIBS"
-echo "- PYTHON_BLDLIBRARY    : $PYTHON_BLDLIBRARY"
 echo "- PYTHON_NUMPY         : $PYTHON_NUMPY"
 echo "- PYTHON_NUMPY_VERSION : $PYTHON_NUMPY_VERSION"
 echo "- NUMPY_INCLUDES       : $NUMPY_INCLUDES"