[MOAB-dev] r3512 - in MOAB/trunk: . tools/iMesh
jvporter at wisc.edu
jvporter at wisc.edu
Fri Jan 29 16:09:01 CST 2010
Author: jvporter
Date: 2010-01-29 16:09:01 -0600 (Fri, 29 Jan 2010)
New Revision: 3512
Removed:
MOAB/trunk/tools/iMesh/python/
Modified:
MOAB/trunk/configure.ac
MOAB/trunk/tools/iMesh/Makefile.am
Log:
Remove PyTAPS from MOAB (huge diff, ahoy!)
Modified: MOAB/trunk/configure.ac
===================================================================
--- MOAB/trunk/configure.ac 2010-01-29 19:46:09 UTC (rev 3511)
+++ MOAB/trunk/configure.ac 2010-01-29 22:09:01 UTC (rev 3512)
@@ -215,134 +215,6 @@
fi
################################################################################
-# Python
-################################################################################
-
-AC_ARG_VAR([PYTHON],[Python interpretper])
-AC_CHECK_PROG([PYTHON],[python],[python])
-
-# Check if python interpreter works
-AC_MSG_CHECKING([if python works])
-py_command="from math import *; aTuple = ('robots', 77, 93, 'try'); \
- sqrt(aTuple[[1]])"
-if ${PYTHON} -c "$py_command" >/dev/null 2>&1; then
- AC_MSG_RESULT([yes])
-else
- AC_MSG_RESULT([NO])
- PYTHON=
-fi
-
-if test "x$PYTHON" != "x"; then
-
- # Allow user to specify location of python includes
- AC_ARG_WITH(python-includes,[AC_HELP_STRING([--with-python-includes=DIR],
- [Specify directory containing Python headers])],
- [PYTHON_DIR="$withval"],[PYTHON_DIR=])
-
- # Get the default Python include dir containing pyconfig.h
- # Note: Python does this automatically via distutils
- AC_MSG_CHECKING([for location of python headers])
- py_command="import sys; print '%s/include/python%d.%d' % (sys.prefix, \
- sys.version_info[[0]],sys.version_info[[1]])"
- if pydir_out=`$PYTHON -c "$py_command"`; then
- PYCONFIG_DIR="$pydir_out"
- AC_MSG_RESULT($PYCONFIG_DIR)
- else
- AC_MSG_ERROR("python interpreter is broken?")
- fi
-
- # If user did not specify an include dir, use the default
- if test "x" = "x$PYTHON_DIR"; then
- PYTHON_DIR=PYCONFIG_DIR
- fi
-
- # Determine location for python libraries
- py_command="import sys; print '$libdir/python%d.%d/site-packages' % (\
- sys.version_info[[0]],sys.version_info[[1]])"
- pylibdir=`$PYTHON -c "$py_command"`
- AC_SUBST(pylibdir)
-
- # Check for expected header in python include dir
- old_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS -I$PYTHON_DIR -I$PYCONFIG_DIR"
- AC_CHECK_HEADER([pyconfig.h],[],[PYTHON_DIR=; AC_MSG_WARN([mis-detected python include dir])],[])
- AC_CHECK_HEADER([Python.h],[],[PYTHON_DIR=; AC_MSG_WARN([mis-detected python include dir])],[])
- CPPFLAGS="$old_CPPFLAGS"
-
- # Check that NumPy module is installed
- HAVE_NUMPY=no
- AC_MSG_CHECKING([for NumPy module])
- if "${PYTHON}" -c "import numpy.core" >/dev/null 2>&1; then
- HAVE_NUMPY=yes
- fi
- AC_MSG_RESULT($HAVE_NUMPY)
-
- if test yes = $HAVE_NUMPY; then
-
- # Allow user to specify location of NumPy includes
- AC_ARG_WITH(numpy,[AC_HELP_STRING([--with-numpy=DIR],
- [Specify directory containing Numpy include directory])],
- [NUMPY_DIR="$withval"],[NUMPY_DIR=])
-
- # If numpy directory was not specified, guess
- if test "x" = "x$NUMPY_DIR"; then
- AC_MSG_CHECKING([for location of NumPy includes])
- if test -d "${PYTHON_DIR}/numpy"; then
- NUMPY_DIR="${PYTHON_DIR}"
- else
- py_command="import numpy.core; print numpy.core.__path__[[0]]"
- NUMPY_DIR=`$PYTHON -c "$py_command"`/include
- fi
- AC_MSG_RESULT([$NUMPY_DIR])
- fi
-
- # Check for expected headers in NUMPY_DIR
-
- old_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS -I$NUMPY_DIR -I$PYTHON_DIR -I$PYCONFIG_DIR"
- AC_CHECK_HEADER([numpy/arrayobject.h],[],[NUMPY_DIR=; AC_MSG_WARN([mis-detected NumPy include dir])],[#include "Python.h"])
- CPPFLAGS="$old_CPPFLAGS"
- fi
-fi
-
-AC_SUBST(PYTHON)
-AC_SUBST(PYTHON_DIR)
-AC_SUBST(NUMPY_DIR)
-
-
-################################################################################
-# PyTAPS
-################################################################################
-AC_ARG_ENABLE([pytaps],[
-AC_HELP_STRING([--enable-pytaps],[Build Python iMesh interface.])
-AC_HELP_STRING([--disable-pytaps],[Don't build Python iMesh interface.])
-],
-[ENABLE_pytaps="$enableval"],
-[ENABLE_pytaps=no]
-)
-
-case "x$ENABLE_pytaps" in
- xyes)
-# if test "x$with_pic" != "xyes"; then
-# AC_MSG_ERROR([Need PIC support for PyTAPS])
-# fi
- test "x" != "x$PYTHON" || AC_MSG_ERROR([Cannot build pytaps w/out python])
- test "x" != "x$PYTHON_DIR" || AC_MSG_ERROR([Pytaps requires python C includes])
- test "xyes" = "x$HAVE_NUMPY" || AC_MSG_ERROR([Pytaps requires NumPy module])
- test "x" != "x$NUMPY_DIR" || AC_MSG_ERROR([Pytaps requires NumPy C includes])
- test "xyes" = "x$ENABLE_imesh" || AC_MSG_ERROR([PyTAPS requires iMesh])
- ;;
- xno)
- ;;
- *)
- AC_MSG_ERROR([Invalid argument to --enable-pytaps : $ENABLE_pytaps])
- ;;
-esac
-AC_MSG_CHECKING([if Python support is to be built])
-AC_MSG_RESULT([$ENABLE_pytaps])
-AM_CONDITIONAL([ENABLE_pytaps],[test "xyes" = "x$ENABLE_pytaps"])
-
-################################################################################
# HDF5 OPTIONS
################################################################################
@@ -1101,7 +973,6 @@
tools/iMesh/SIDL/iMesh-SIDL-Defs.inc
tools/iMesh/SIDL/Makefile
tools/iMesh/SIDL/common.make
- tools/iMesh/python/Makefile
tools/mbperf/Makefile
tools/mbchaco/Makefile
tools/mbcoupler/Makefile
Modified: MOAB/trunk/tools/iMesh/Makefile.am
===================================================================
--- MOAB/trunk/tools/iMesh/Makefile.am 2010-01-29 19:46:09 UTC (rev 3511)
+++ MOAB/trunk/tools/iMesh/Makefile.am 2010-01-29 22:09:01 UTC (rev 3512)
@@ -7,12 +7,6 @@
babel_DIR =
endif
-if ENABLE_pytaps
- pytaps_DIR = python
-else
- pytaps_DIR =
-endif
-
SUBDIRS = . $(babel_DIR) $(pytaps_DIR)
INCLUDES = -I$(top_srcdir) -I$(top_builddir) -I.
More information about the moab-dev
mailing list