[cig-commits] [commit] master, python-removal, rajesh-petsc-schur: removed Python, Pyre and Exchanger related code from configure.ac (f0d7acd)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Nov 5 19:03:03 PST 2014
Repository : https://github.com/geodynamics/citcoms
On branches: master,python-removal,rajesh-petsc-schur
Link : https://github.com/geodynamics/citcoms/compare/464e1b32299b15819f93efd98d969cddb84dfe51...f97ae655a50bdbd6dac1923a3471ee4dae178fbd
>---------------------------------------------------------------
commit f0d7acd532efd83bc77a72fad3775f09d72528f7
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date: Wed Aug 20 15:55:46 2014 -0700
removed Python,Pyre and Exchanger related code from configure.ac
>---------------------------------------------------------------
f0d7acd532efd83bc77a72fad3775f09d72528f7
configure.ac | 116 -----------------------------------------------------------
1 file changed, 116 deletions(-)
diff --git a/configure.ac b/configure.ac
index 4193fb5..6a1284e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,26 +33,7 @@ AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([foreign])
# 'configure' options
-AC_ARG_VAR(PYTHON, [Python interpreter])
-AC_ARG_VAR(PYTHONPATH, [Python module search path])
-AC_ARG_WITH([pyre],
- [AC_HELP_STRING([--with-pyre],
- [build Pyre modules @<:@default=no@:>@])],
- [want_pyre="$withval"],
- [want_pyre=no])
-AM_CONDITIONAL([COND_PYRE], [test "$want_pyre" = yes])
-AC_ARG_ENABLE([embedding],
- [AC_HELP_STRING([--enable-embedding],
- [embed Python with CitcomS in a single executable @<:@default=yes@:>@])],
- [want_embedding="$enableval"],
- [want_embedding=yes])
-AM_CONDITIONAL([COND_EMBEDDING], [test "$want_embedding" = yes])
CIT_ARG_HDF5([auto])
-AC_ARG_WITH([exchanger],
- [AC_HELP_STRING([--with-exchanger],
- [use Exchanger @<:@default=auto@:>@])],
- [want_exchanger="$withval"],
- [want_exchanger=auto])
AC_ARG_VAR(HC_HOME, [home path to HC program, used by --with-ggrd])
AC_ARG_WITH([ggrd],
[AC_HELP_STRING([--with-ggrd],
@@ -74,49 +55,6 @@ AC_PROG_CXX([mpicxx mpic++ mpiCC hcp mpCC mpxlC mpxlC_r cmpic++ g++ c++ gpp aCC
# Checking a system header here so that CPP is always defined
AC_CHECK_HEADERS([malloc.h])
-if test "$want_pyre" = yes; then
- # Check for Python.
- AM_PATH_PYTHON([2.3])
- CIT_PYTHON_SYSCONFIG
-
- CIT_CHECK_PYTHON_HEADER
-
- # Check for Python modules and packages.
- export want_exchanger
-
- # merlin is incompatible with python 2.7
- if test "$PYTHON_VERSION" = 2.7; then
- echo -e "Pyre support is incompatible with python 2.7."
- echo -e "Please either disable pyre or use python 2.4-python2.6."
- AC_MSG_ERROR([Python 2.7 not supported])
- else
- cit_builddir=`pwd`
- AC_MSG_NOTICE([downloading missing Python dependencies])
- AS_IF([AC_TRY_COMMAND([$PYTHON setup.py install_deps -f $cit_builddir/deps -zmxd $cit_builddir/deps >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD])],
- [],
- [AC_MSG_FAILURE([cannot download missing Python dependencies])])
-
- AC_MSG_NOTICE([building Python dependencies])
- AS_IF([AC_TRY_COMMAND([$PYTHON setup.py develop -H None -f $cit_builddir/deps -x -d $cit_builddir/python >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD])],
- [],
- [AC_MSG_FAILURE([building Python dependencies])])
-
- CIT_PYTHON_EGG_SETUP
- fi
-
-
- CIT_PROG_PYCONFIG
- AC_SUBST([pkgsysconfdir], [\${sysconfdir}/$PACKAGE])
- # Compile C as C++.
- dnl CC="$CXX"
- dnl CFLAGS="$CXXFLAGS"
-else
- if test "$want_exchanger" = yes; then
- AC_MSG_ERROR([Exchanger requires Pyre])
- fi
- want_exchanger=no
-fi
-
# We don't need Fortran.
AC_PROVIDE([AC_PROG_F77])
AC_PROG_LIBTOOL
@@ -128,47 +66,10 @@ AC_SEARCH_LIBS([MPI_Init], [mpi mpich], [], [AC_MSG_ERROR([MPI library not found
CIT_CHECK_LIB_HDF5
CIT_CHECK_LIB_HDF5_PARALLEL
-if test "$want_exchanger" != no; then
- save_CC="$CC"
- save_CFLAGS="$CFLAGS"
- save_LIBS="$LIBS"
- CC="$CXX"
- CFLAGS="$CXXFLAGS"
- LIBS="$PYTHON_EGG_LDFLAGS $PYTHON_BLDLIBRARY $PYTHON_LIBS $PYTHON_MODLIBS $PYTHON_SYSLIBS $LIBS"
- AC_CHECK_FUNC([PyExchanger_exchangeBoundedBox], [], [
- if test "$want_exchanger" = auto; then
- want_exchanger=no
- AC_MSG_WARN([Exchanger library not found; disabling Exchanger support])
- else
- AC_MSG_ERROR([Exchanger library not found])
- fi
- ])
- CC="$save_CC"
- CFLAGS="$save_CFLAGS"
- LIBS="$save_LIBS"
-fi
-
# Checks for header files.
AC_CHECK_HEADER([mpi.h], [], [AC_MSG_ERROR([header 'mpi.h' not found])])
CIT_CHECK_HEADER_HDF5
-if test "$want_exchanger" != no; then
- AC_LANG_PUSH(C++)
- CIT_HEADER_MPI
- save_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$PYTHON_EGG_CPPFLAGS $CPPFLAGS"
- AC_CHECK_HEADERS([Exchanger/DIM.h], [], [
- if test "$want_exchanger" = auto; then
- want_exchanger=no
- AC_MSG_WARN([header 'Exchanger/DIM.h' not found; disabling Exchanger support])
- else
- AC_MSG_ERROR([header 'Exchanger/DIM.h' not found])
- fi
- ])
- CPPFLAGS="$save_CPPFLAGS"
- AC_LANG_POP()
-fi
-
# Checks for typedefs, structures, and compiler characteristics.
# Checks for library functions.
@@ -176,11 +77,7 @@ fi
if test "$want_hdf5" != no; then
want_hdf5=yes
fi
-if test "$want_exchanger" != no; then
- want_exchanger=yes
-fi
AM_CONDITIONAL([COND_HDF5], [test "$want_hdf5" = yes])
-AM_CONDITIONAL([COND_EXCHANGER], [test "$want_exchanger" = yes])
AC_SEARCH_LIBS([gzopen], [z], [
CPPFLAGS="-DUSE_GZDIR $CPPFLAGS"
], [
@@ -238,12 +135,9 @@ AC_SEARCH_LIBS([sqrt], [m])
AC_CONFIG_FILES([Makefile
bin/Makefile
- CitcomS/Makefile
etc/Makefile
examples/Makefile
lib/Makefile
- module/Makefile
- module/Exchanger/Makefile
tests/Makefile
visual/Makefile
visual/OpenDXMacro/Makefile])
@@ -253,21 +147,11 @@ AC_OUTPUT
# report configuration summary
echo -e "\n\n"
echo "================ Configuration Summary ================"
-if test "$want_pyre" = yes; then
- echo -e "\t PYTHON: " $PYTHON
- echo -e "\t PYTHONPATH: " $PYTHONPATH
-fi
echo -e "\t CC: " $CC
echo -e "\t CFLAGS: " $CFLAGS
echo -e "\t CPPFLAGS: " $CPPFLAGS
-if test "$want_exchanger" != no; then
- echo -e "\t CXX: " $CXX
- echo -e "\t CXXFLAGS: " $CXXFLAGS
-fi
echo -e "\t LDFLAGS: " $LDFLAGS
echo -e "\t LIBS: " $LIBS
-echo -e "\t with-pyre: " $want_pyre
-echo -e "\t with-exchanger: " $want_exchanger
echo -e "\t with-hdf5: " $want_hdf5
echo -e "\t with-ggrd: " $want_ggrd
echo
More information about the CIG-COMMITS
mailing list