diff options
| author | Josselin Mouette <joss@debian.org> | 2009-04-06 22:52:39 +0000 |
|---|---|---|
| committer | Gian Mario Tagliaretti <gianmt@src.gnome.org> | 2009-04-06 22:52:39 +0000 |
| commit | fc8b740b9d7aa4e8f3d9819deab7d931b46683f3 (patch) | |
| tree | a07c130adbec0059ba5dde00560f808c4c5263bf /configure.ac | |
| parent | a8a65bcb1bbec4ea7ba5c6febfedbe50a4ab79a6 (diff) | |
| download | pygtk-fc8b740b9d7aa4e8f3d9819deab7d931b46683f3.tar.gz | |
Bug 397544 – Numeric is no longer maintained
2009-04-06 Josselin Mouette <joss@debian.org>
Bug 397544 – Numeric is no longer maintained
* gtk/gdk.override:
* configure.ac:
* setup.py:
* README: Update pygtk to use numpy instead of Numeric.
svn path=/trunk/; revision=3122
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index be168bce..91f0d068 100644 --- a/configure.ac +++ b/configure.ac @@ -367,18 +367,27 @@ case $gdk_target in esac -dnl checks to see if Numeric Python is installed. +dnl checks to see if numpy is installed. AC_ARG_ENABLE(numpy, AC_HELP_STRING([--disable-numpy], [Disable numeric python features]),, enable_numpy=yes) if test "x$enable_numpy" != xno; then save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES" - AC_CHECK_HEADER([Numeric/arrayobject.h], - [AC_DEFINE(HAVE_NUMPY,,[whether to include numeric python support])],, - [#include <Python.h>]) - CPPFLAGS="$save_CPPFLAGS" + numpy_INCLUDES=`$PYTHON -c "import numpy; print numpy.get_include()" 2> /dev/null` + if test "x$numpy_INCLUDES" = "x"; then + AC_MSG_WARN([Could not find a valid numpy installation, disabling.]) + enable_numpy=no + else + CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES -I$numpy_INCLUDES" + AC_CHECK_HEADER([numpy/arrayobject.h], + [AC_DEFINE(HAVE_NUMPY,,[whether to include numeric python support])], + [enable_numpy=no], + [#include <Python.h>]) + if test "x$enable_numpy" != "xno"; then + CPPFLAGS="$save_CPPFLAGS -I$numpy_INCLUDES" + fi + fi fi @@ -419,11 +428,11 @@ $have_pangocairo && echo pangocairo $have_gtk && echo gtk with $gtk_version API $have_libglade && echo gtk.glade $have_gtkunixprint && echo gtk.unixprint -echo if test ! $have_atk || ! $have_pango || \ ! $have_gtk || ! $have_libglade || \ ! $have_pangocairo || ! $have_gtkunixprint; then + echo echo "The following modules will NOT be built:" echo $have_atk || echo atk @@ -433,3 +442,7 @@ if test ! $have_atk || ! $have_pango || \ $have_libglade || echo gtk.glade $have_gtkunixprint || echo gtk.unixprint fi + +echo +echo "Numpy support: $enable_numpy" +echo |