#include <Python.h>
#include <arrayobject.h>	
#include "plplot/plplot.h"	
#include "plplot/plplotP.h"

#if defined(PL_DOUBLE) || defined(DOUBLE)
#define PL_ARGS(a, b) (a)
#define PyArray_PLFLT PyArray_DOUBLE
#else
#define PL_ARGS(a, b) (b)
#define PyArray_PLFLT PyArray_FLOAT
#endif

#define TRY(E) if(! (E)) return NULL

int pl_PyArray_AsFloatArray (PyObject **, PLFLT **, PLINT *);
int pl_PyArray_AsIntArray (PyObject **, PLINT **, PLINT *);
int pl_PyArray_AsFloatMatrix (PyObject **, PLINT*, PLINT*, PLFLT ***);
int pl_PyList_AsStringArray (PyObject *, char ***, int *);
int pl_PyList_SetFromStringArray (PyObject *, char **, int);

PLFLT pyf2eval2( PLINT ix, PLINT iy, PLPointer plf2eval_data );

#include <Python.h>
/* Change this to the recommended
#include <Numeric/arrayobject.h> 
 once we no longer support python1.5 */
#include <arrayobject.h>	
#include "plplot/plplot.h"	
#include "plplot/plplotP.h"

#if defined(PL_DOUBLE) || defined(DOUBLE)
#define PL_ARGS(a, b) (a)
#define PyArray_PLFLT PyArray_DOUBLE
#else
#define PL_ARGS(a, b) (b)
#define PyArray_PLFLT PyArray_FLOAT
#endif

#define TRY(E) if(! (E)) return NULL

int pl_PyArray_AsFloatArray (PyObject **, PLFLT **, PLINT *);
int pl_PyArray_AsIntArray (PyObject **, PLINT **, PLINT *);
int pl_PyArray_AsFloatMatrix (PyObject **, PLINT*, PLINT*, PLFLT ***);
int pl_PyList_AsStringArray (PyObject *, char ***, int *);
int pl_PyList_SetFromStringArray (PyObject *, char **, int);

PLFLT pyf2eval2( PLINT ix, PLINT iy, PLPointer plf2eval_data );

Comment the current arrayobject.h situation. Right now for Numpy packages that are consistent with python-1.5, this file could be a number of places relative to /usr/include/python$version so configure must look specifically for it. However, later Numpy packages consistent with python2.x always put it in a standard location of /usr/include/python$version/Numeric. Thus, the relative location of arrayobject.h to the normal python includes is consistent, and we will no longer have to look specifically for this file once we stop supporting python-1.5.
Comment the current arrayobject.h situation.  Right now for Numpy packages
that are consistent with python-1.5, this file could be a number of places
relative to /usr/include/python$version so configure must look specifically
for it. However, later Numpy packages consistent with python2.x always put
it in a standard location of /usr/include/python$version/Numeric.  Thus, the
relative location of arrayobject.h to the normal python includes is
consistent, and we will no longer have to look specifically for this file
once we stop supporting python-1.5.

svn path=/trunk/; revision=3687
