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

[luis at geodynamics.org]

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

Modified:
   cs/cigma/trunk/config/cigma_boost.m4
   cs/cigma/trunk/config/cigma_python.m4
   cs/cigma/trunk/configure.ac
Log:
Restore C++ flags in CIGMA_BOOST_PYTHON macro

Modified: cs/cigma/trunk/config/cigma_boost.m4
===================================================================
--- cs/cigma/trunk/config/cigma_boost.m4	2008-12-10 02:15:46 UTC (rev 13604)
+++ cs/cigma/trunk/config/cigma_boost.m4	2008-12-10 02:15:48 UTC (rev 13605)
@@ -16,7 +16,7 @@
     AS_VAR_PUSHDEF([ax_BoostPython], [ax_cv_boost_python])dnl
     AC_LANG_PUSH([C++])
     ax_cv_boost_python_save_CPPFLAGS=$CPPFLAGS
-    CPPFLAGS="-I$PYTHON_INCDIR $CPPFLAGS"
+    CPPFLAGS="$PYTHON_INCLUDES $BOOST_CPPFLAGS $CPPFLAGS"
     AC_CHECK_HEADER([boost/python.hpp],
                     [AC_DEFINE([HAVE_BOOST_PYTHON],,[define if the Boost::Python library is available])])
     CPPFLAGS=$ax_cv_boost_python_save_CPPFLAGS
@@ -36,11 +36,11 @@
     AC_CACHE_CHECK([for Usable Boost::Python library], [ax_Search],
                    [AC_LANG_PUSH([C++])
                     ax_cv_search_save_CXXFLAGS=$CXXFLAGS
-                    CXXFLAGS="-I$PYTHON_INCDIR $CXXFLAGS"
+                    CXXFLAGS="$PYTHON_INCLUDES $BOOST_CPPFLAGS $CXXFLAGS"
                     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_LIBS $ax_cv_search_save_LIBS"
+                      LIBS="-l$ax_current_lib -l$PYTHON_LIB $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."; }
@@ -50,6 +50,7 @@
                     done
                     AS_VAR_SET_IF([ax_Search], , [AS_VAR_SET([ax_Search], [no])])
                     LIBS=$ax_cv_search_save_LIBS
+                    CXXFLAGS=$ax_cv_search_save_CXXFLAGS
                     AC_LANG_POP([C++])]
     )
 

Modified: cs/cigma/trunk/config/cigma_python.m4
===================================================================
--- cs/cigma/trunk/config/cigma_python.m4	2008-12-10 02:15:46 UTC (rev 13604)
+++ cs/cigma/trunk/config/cigma_python.m4	2008-12-10 02:15:48 UTC (rev 13605)
@@ -9,10 +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"
+    PYTHON_LIB="python$PYTHON_VERSION"
+    PYTHON_LIBS="-L$PYTHON_LIBPL -l$PYTHON_LIB $PYTHON_LIBS"
     AC_SUBST([PYTHON_INCLUDES])
+    AC_SUBST([PYTHON_LIB])
     AC_SUBST([PYTHON_LIBS])
 ])
 

Modified: cs/cigma/trunk/configure.ac
===================================================================
--- cs/cigma/trunk/configure.ac	2008-12-10 02:15:46 UTC (rev 13604)
+++ cs/cigma/trunk/configure.ac	2008-12-10 02:15:48 UTC (rev 13605)
@@ -50,6 +50,7 @@
 AX_BOOST_FILESYSTEM
 AX_BOOST_PROGRAM_OPTIONS
 
+dnl Configure Boost.Python
 CIGMA_BOOST_PYTHON
 echo "PYTHON is '$PYTHON'"
 echo "PYTHON_LIBS is '$PYTHON_LIBS'"