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

[luis at geodynamics.org]

Author: luis
Date: 2008-12-09 18:16:30 -0800 (Tue, 09 Dec 2008)
New Revision: 13630

Modified:
   cs/cigma/trunk/Makefile.am
   cs/cigma/trunk/configure.ac
Log:
Fixes for nonstandard location of numpy include files.

The extension module builds with libtool, we try the fallback
distutils method. Use $(cigma_mod_cppflags) since it will contain
the value of $(NUMPY_INCLUDES)

Modified: cs/cigma/trunk/Makefile.am
===================================================================
--- cs/cigma/trunk/Makefile.am	2008-12-10 02:16:29 UTC (rev 13629)
+++ cs/cigma/trunk/Makefile.am	2008-12-10 02:16:30 UTC (rev 13630)
@@ -388,7 +388,7 @@
 _cigma.so: $(cigma_mod_sources) $(cigma_mod_dependencies)
 	BUILD_DIR=`cd $(top_builddir); pwd`; \
 	(cd $(srcdir); \
-	CFLAGS="-I$(top_srcdir) $(CPPFLAGS) $(libcigma_la_cppflags) $(AM_CXXFLAGS) $(CXXFLAGS)" \
+	CFLAGS="-I$(top_srcdir) $(CPPFLAGS) $(cigma_mod_cppflags) $(AM_CXXFLAGS) $(CXXFLAGS)" \
 	LDFLAGS="$(LDFLAGS) -L$$BUILD_DIR/.libs" \
 	ARCHFLAGS="$(ARCHFLAGS)" PYLIBS="$(PYLIBS)" \
 	$(PYTHON) src/py_cigma_setup.py build --build-lib=$$BUILD_DIR/ --build-temp=$$BUILD_DIR/pybuild -f)

Modified: cs/cigma/trunk/configure.ac
===================================================================
--- cs/cigma/trunk/configure.ac	2008-12-10 02:16:29 UTC (rev 13629)
+++ cs/cigma/trunk/configure.ac	2008-12-10 02:16:30 UTC (rev 13630)
@@ -73,7 +73,7 @@
 
 dnl Check whether to use distutils (XXX: change default to yes)
 AC_ARG_WITH([distutils],
-    [AC_HELP_STRING([--with-distutils], [Use distutils for compiling the cigma python module.@<:@default=no@:>@])],
+    [AC_HELP_STRING([--with-distutils], [Use distutils for compiling the cigma python extension module.@<:@default=no@:>@])],
     [with_distutils="$withval"],
     [with_distutils="no"])
 AM_CONDITIONAL([COND_USE_DISTUTILS], [test "x${with_distutils}" = xyes])