diff options
| author | James Henstridge <james@daa.com.au> | 2003-01-30 14:12:17 +0000 |
|---|---|---|
| committer | James Henstridge <jamesh@src.gnome.org> | 2003-01-30 14:12:17 +0000 |
| commit | 336836ca8d356856f0db8ca222e6e20b6c1dc481 (patch) | |
| tree | 3074d79e05abc6773105529762aeaf3cba3611f4 /configure.in | |
| parent | 164198942cd85241bb0ad91625cfa9e243934f8e (diff) | |
| download | pygtk-336836ca8d356856f0db8ca222e6e20b6c1dc481.tar.gz | |
add wrapper that returns a NumPy array.
2003-01-30 James Henstridge <james@daa.com.au>
* gtk/gdk.override (_wrap_gdk_pixbuf__get_pixel_array): add
wrapper that returns a NumPy array.
* gtk/gdk-types.defs (Pixbuf): add a "pixel_array" member to
pixbuf object.
* configure.in (enable_numpy): get rid of code detecting which
directory Numeric's arrayobject.h header is in. No point in
supporting ancient versions ...
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/configure.in b/configure.in index bd14ba94..66522011 100644 --- a/configure.in +++ b/configure.in @@ -86,19 +86,25 @@ export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) dnl glib AM_PATH_GLIB_2_0(glib_required_version,,[AC_MSG_ERROR(maybe you want the gtk-gnome-1-2 branch?)],gobject $extra_mods) -GLIB_LIBS=`echo $GLIB_LIBS | sed -e "s/$export_dynamic//"` +if test -n "$export_dynamic"; then + GLIB_LIBS=`echo $GLIB_LIBS | sed -e "s/$export_dynamic//"` +fi dnl atk PKG_CHECK_MODULES(ATK, atk >= atk_required_version,,[AC_MSG_ERROR(maybe you want the gtk-gnome-1-2 branch?)]) AC_SUBST(ATK_CFLAGS) AC_SUBST(ATK_LIBS) -ATK_LIBS=`echo $ATK_LIBS | sed -e "s/$export_dynamic//"` +if test -n "$export_dynamic"; then + ATK_LIBS=`echo $ATK_LIBS | sed -e "s/$export_dynamic//"` +fi dnl pango PKG_CHECK_MODULES(PANGO, pango >= pango_required_version,,[AC_MSG_ERROR(maybe you want the gtk-gnome-1-2 branch?)]) AC_SUBST(PANGO_CFLAGS) AC_SUBST(PANGO_LIBS) -PANGO_LIBS=`echo $PANGO_LIBS | sed -e "s/$export_dynamic//"` +if test -n "$export_dynamic"; then + PANGO_LIBS=`echo $PANGO_LIBS | sed -e "s/$export_dynamic//"` +fi dnl gtk+ AM_PATH_GTK_2_0(gtk_required_version,,[AC_MSG_ERROR(maybe you want the gtk-gnome-1-2 branch?)],$extra_mods) @@ -112,7 +118,9 @@ PKG_CHECK_MODULES(LIBGLADE, libglade-2.0 >= libglade_required_version, AC_SUBST(LIBGLADE_CFLAGS) AC_SUBST(LIBGLADE_LIBS) AM_CONDITIONAL(BUILD_LIBGLADE, $build_libglade) -LIBGLADE_LIBS=`echo $LIBGLADE_LIBS | sed -e "s/$export_dynamic//"` +if test -n "$export_dynamic"; then + LIBGLADE_LIBS=`echo $LIBGLADE_LIBS | sed -e "s/$export_dynamic//"` +fi dnl gtkgl build_gtkgl=false @@ -122,7 +130,9 @@ PKG_CHECK_MODULES(GTKGL, gtkgl-2.0 >= gtkgl_required_version, AC_SUBST(GTKGL_CFLAGS) AC_SUBST(GTKGL_LIBS) AM_CONDITIONAL(BUILD_GTKGL, $build_gtkgl) -GTKGL_LIBS=`echo $GTKGL_LIBS | sed -e "s/$export_dynamic//"` +if test -n "$export_dynamic"; then + GTKGL_LIBS=`echo $GTKGL_LIBS | sed -e "s/$export_dynamic//"` +fi AC_ARG_ENABLE(numpy, @@ -133,15 +143,8 @@ dnl checks to see if Numeric Python is installed. if test "x$enable_numpy" != xno; then save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES" - AC_CHECK_HEADER(arrayobject.h, - [AC_DEFINE(HAVE_NUMPY) - AC_DEFINE(HAVE_ARRAYOBJECT_H)], - [AC_CHECK_HEADER(Extensions/arrayobject.h, - [AC_DEFINE(HAVE_NUMPY) - AC_DEFINE(HAVE_EXTENSIONS_ARRAYOBJECT_H)], - [AC_CHECK_HEADER(Numeric/arrayobject.h, - [AC_DEFINE(HAVE_NUMPY) - AC_DEFINE(HAVE_NUMERIC_ARRAYOBJECT_H)])])]) + AC_CHECK_HEADER(Numeric/arrayobject.h, + [AC_DEFINE(HAVE_NUMPY,,[whether to include numeric python support])]) CPPFLAGS="$save_CPPFLAGS" fi |