[cig-commits] r12956 - cs/cigma/trunk

[luis at geodynamics.org]

Author: luis
Date: 2008-09-24 04:10:46 -0700 (Wed, 24 Sep 2008)
New Revision: 12956

Modified:
   cs/cigma/trunk/configure.ac
Log:
Switch configure.ac to use ax_boost* macros

Modified: cs/cigma/trunk/configure.ac
===================================================================
--- cs/cigma/trunk/configure.ac	2008-09-24 11:10:45 UTC (rev 12955)
+++ cs/cigma/trunk/configure.ac	2008-09-24 11:10:46 UTC (rev 12956)
@@ -19,10 +19,21 @@
 AC_LANG(C++)
 
 dnl Configure Boost (XXX: move this step to cigma.m4)
-BOOST_REQUIRE([1.33])
-BOOST_SMART_PTR()
-BOOST_FILESYSTEM()
-BOOST_PROGRAM_OPTIONS()
+#BOOST_REQUIRE([1.33])
+#BOOST_SMART_PTR()
+#BOOST_FILESYSTEM()
+#BOOST_PROGRAM_OPTIONS()
+AX_BOOST_BASE([1.33])
+AX_BOOST_FILESYSTEM
+AX_BOOST_PROGRAM_OPTIONS
+#AX_BOOST_PYTHON
+#MPX_AX_BOOST_PYTHON
+DEB_AX_BOOST_PYTHON
+# see http://github.com/jwiegley/ledger/tree/master/configure.ac
+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]])
+fi
 
 dnl Configure CppUnit (XXX: move this step to cigma.m4)
 AM_PATH_CPPUNIT([1.12.0],
@@ -57,19 +68,25 @@
 echo "- C compiler   : $CC"
 echo "- C++ compiler : $CXX"
 
+echo "- Python binary      : $PYTHON_BIN"
+echo "- Python header path : $PYTHON_INCLUDE_DIR"
+echo "- Python library     : -l$PYTHON_LIB"
+
 # if using cigma_boost.m4
-echo "- BOOST_CPPFLAGS                : $BOOST_CPPFLAGS"
-echo "- BOOST_FILESYSTEM_LDFLAGS      : $BOOST_FILESYSTEM_LDFLAGS"
-echo "- BOOST_FILESYSTEM_LIBS         : $BOOST_FILESYSTEM_LIBS"
-echo "- BOOST_PROGRAM_OPTIONS_LDFLAGS : $BOOST_PROGRAM_OPTIONS_LDFLAGS"
-echo "- BOOST_PROGRAM_OPTIONS_LIBS    : $BOOST_PROGRAM_OPTIONS_LIBS"
+#echo "- BOOST_CPPFLAGS                : $BOOST_CPPFLAGS"
+#echo "- BOOST_FILESYSTEM_LDFLAGS      : $BOOST_FILESYSTEM_LDFLAGS"
+#echo "- BOOST_FILESYSTEM_LIBS         : $BOOST_FILESYSTEM_LIBS"
+#echo "- BOOST_PROGRAM_OPTIONS_LDFLAGS : $BOOST_PROGRAM_OPTIONS_LDFLAGS"
+#echo "- BOOST_PROGRAM_OPTIONS_LIBS    : $BOOST_PROGRAM_OPTIONS_LIBS"
 
 # if using ax_boost_*.m4
-#echo "- BOOST_CPPFLAGS            : $BOOST_CPPFLAGS"
-#echo "- BOOST_LDFLAGS             : $BOOST_LDFLAGS"
-#echo "- BOOST_FILESYSTEM_LIB      : $BOOST_FILESYSTEM_LIB"
-#echo "- BOOST_PROGRAM_OPTIONS_LIB : $BOOST_PROGRAM_OPTIONS_LIB"
+echo "- BOOST_CPPFLAGS            : $BOOST_CPPFLAGS"
+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"
 
+# CppUnit flags
 echo "- CPPUNIT_CFLAGS : $CPPUNIT_CFLAGS"
 echo "- CPPUNIT_LIBS   : $CPPUNIT_LIBS"