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

[luis at geodynamics.org]

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

Modified:
   cs/cigma/trunk/config/cigma_boost.m4
   cs/cigma/trunk/configure.ac
Log:
Updates to Boost.Python detection

 - Fixed use of LIBS in CIGMA_BOOST_PYTHON macro
 - Renamed variable to BOOST_PYTHON_LIB (for consistency with
   the LIB variables in the ax_boost*.m4 macros)

Modified: cs/cigma/trunk/config/cigma_boost.m4
===================================================================
--- cs/cigma/trunk/config/cigma_boost.m4	2008-12-10 02:15:55 UTC (rev 13608)
+++ cs/cigma/trunk/config/cigma_boost.m4	2008-12-10 02:15:57 UTC (rev 13609)
@@ -38,10 +38,9 @@
                     ax_cv_search_save_CXXFLAGS=$CXXFLAGS
                     CXXFLAGS="$PYTHON_INCLUDES $BOOST_CPPFLAGS $CXXFLAGS"
                     ax_cv_search_save_LIBS=$LIBS
-                    LIBS="$BOOST_LDFLAGS $PYTHON_LIBS $LIBS"
                     for ax_current_lib in $ax_python_lib; do
                       ax_res=-l$ax_current_lib
-                      LIBS="-l$ax_current_lib -l$PYTHON_LIB $ax_cv_search_save_LIBS"
+                      LIBS="$BOOST_LDFLAGS -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."; }
@@ -57,8 +56,8 @@
 
     ax_res=AS_VAR_GET([ax_Search])
     AS_IF([test "$ax_res" != "no"],
-          [BOOST_PYTHON_LIBS="$ax_res"
-           AC_SUBST(BOOST_PYTHON_LIBS)
+          [BOOST_PYTHON_LIB="$ax_res"
+           AC_SUBST(BOOST_PYTHON_LIB)
            AC_DEFINE([HAVE_BOOST_PYTHON],,[define if the Boost::Python library is available])],
           [AS_WARN([No suitable Boost::Python library found])])dnl
     AS_VAR_POPDEF([ax_Search])dnl

Modified: cs/cigma/trunk/configure.ac
===================================================================
--- cs/cigma/trunk/configure.ac	2008-12-10 02:15:55 UTC (rev 13608)
+++ cs/cigma/trunk/configure.ac	2008-12-10 02:15:57 UTC (rev 13609)
@@ -54,7 +54,7 @@
 CIGMA_BOOST_PYTHON
 echo "PYTHON is '$PYTHON'"
 echo "PYTHON_LIBS is '$PYTHON_LIBS'"
-echo "BOOST_PYTHON_LIBS is '$BOOST_PYTHON_LIBS'"
+echo "BOOST_PYTHON_LIB is '$BOOST_PYTHON_LIB'"
 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]])
 fi
@@ -98,6 +98,8 @@
 echo "- OS : $UNAME"
 echo "- C compiler   : $CC"
 echo "- C++ compiler : $CXX"
+echo "- C flags      : $CFLAGS"
+echo "- C++ flags    : $CXXFLAGS"
 
 # Boost flags (from ax_boost_*.m4)
 echo "-"
@@ -105,7 +107,7 @@
 echo "- BOOST_LDFLAGS             : $BOOST_LDFLAGS"
 echo "- BOOST_FILESYSTEM_LIB      : $BOOST_FILESYSTEM_LIB"
 echo "- BOOST_PROGRAM_OPTIONS_LIB : $BOOST_PROGRAM_OPTIONS_LIB"
-echo "- BOOST_PYTHON_LIBS         : $BOOST_PYTHON_LIBS"
+echo "- BOOST_PYTHON_LIB          : $BOOST_PYTHON_LIB"
 
 # Python flags
 echo "-"