[cig-commits] [commit] devel: build: Remove Pyre checks. (6c6003f)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Thu May 1 00:50:34 PDT 2014
Repository : ssh://geoshell/specfem3d
On branch : devel
Link : https://github.com/geodynamics/specfem3d/compare/cb32c88d6155d7974561a6f72fc17aea596e2c4d...50aa953c1db3f565d76415f5305410a529996b75
>---------------------------------------------------------------
commit 6c6003f24080bde80eb2151c2ff63d1202fdf363
Author: Elliott Sales de Andrade <esalesde at physics.utoronto.ca>
Date: Sat Jan 11 19:43:34 2014 -0500
build: Remove Pyre checks.
The Pyrized version was removed in 2009, so these checks are not useful.
>---------------------------------------------------------------
6c6003f24080bde80eb2151c2ff63d1202fdf363
configure | 804 ++++--------------------------------------------------
configure.ac | 64 -----
setup/config.h.in | 4 -
3 files changed, 50 insertions(+), 822 deletions(-)
diff --git a/configure b/configure
index 4ffdb17..8addc43 100755
--- a/configure
+++ b/configure
@@ -2,6 +2,8 @@
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for Specfem3D 2.1.0.
#
+# Report bugs to <see the wiki>.
+#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
#
@@ -264,11 +266,10 @@ fi
$as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
$as_echo "$0: be upgraded to zsh 4.3.4 or later."
else
- $as_echo "$0: Please tell bug-autoconf at gnu.org
-$0: about your system, including any error
-$0: possibly output before this message. Then install a
-$0: modern shell, or manually run the script under such a
-$0: shell if you do have one."
+ $as_echo "$0: Please tell bug-autoconf at gnu.org and see the wiki about
+$0: your system, including any error possibly output before
+$0: this message. Then install a modern shell, or manually
+$0: run the script under such a shell if you do have one."
fi
exit 1
fi
@@ -643,10 +644,6 @@ FC_MODOUT
ac_empty
FC_MODINC
FC_MODEXT
-PYTHON_EGG_LDFLAGS
-PYTHON_EGG_CPPFLAGS
-PYTHON_EGG_CFLAGS
-PYTHONPATH
LOCAL_PATH_IS_ALSO_GLOBAL
OPENMP_LIB
FLAGS_CHECK
@@ -683,28 +680,6 @@ ac_ct_FC
LDFLAGS
FCFLAGS
FC
-PYTHON_LA_LDFLAGS
-PYTHON_SYSLIBS
-PYTHON_MODLIBS
-PYTHON_LINKFORSHARED
-PYTHON_LIBS
-PYTHON_LIBPL
-PYTHON_LIBP
-PYTHON_LIBDIR
-PYTHON_LDLIBRARY
-PYTHON_LDLAST
-PYTHON_LDFLAGS
-PYTHON_BLDLIBRARY
-PYTHON_INCDIR
-pkgpyexecdir
-pyexecdir
-pkgpythondir
-pythondir
-PYTHON_PLATFORM
-PYTHON_EXEC_PREFIX
-PYTHON_PREFIX
-PYTHON_VERSION
-PYTHON
COND_OPENMP_FALSE
COND_OPENMP_TRUE
COND_ADIOS_FALSE
@@ -717,8 +692,6 @@ CUSTOM_MPI_TYPE
CUSTOM_REAL
COND_MPI_FALSE
COND_MPI_TRUE
-COND_PYRE_FALSE
-COND_PYRE_TRUE
host_os
host_vendor
host_cpu
@@ -768,7 +741,6 @@ SHELL'
ac_subst_files=''
ac_user_opts='
enable_option_checking
-with_pyre
with_mpi
enable_double_precision
with_cuda
@@ -781,7 +753,6 @@ with_scotch_libdir
ac_precious_vars='build_alias
host_alias
target_alias
-PYTHON
FC
FCFLAGS
LDFLAGS
@@ -802,7 +773,6 @@ MPICC
FLAGS_CHECK
OPENMP_LIB
LOCAL_PATH_IS_ALSO_GLOBAL
-PYTHONPATH
MPI_INC
CXX
CXXFLAGS
@@ -1431,7 +1401,6 @@ Optional Features:
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --with-pyre build Pyrized version [default=no]
--with-mpi build parallel version [default=yes]
--with-cuda build CUDA GPU enabled version [default=no]
--with-adios build ADIOS enabled version [default=no]
@@ -1445,7 +1414,6 @@ Optional Packages:
/opt/scotch/lib)
Some influential environment variables:
- PYTHON the Python interpreter
FC Fortran compiler command
FCFLAGS Fortran compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
@@ -1477,7 +1445,6 @@ Some influential environment variables:
LOCAL_PATH_IS_ALSO_GLOBAL
files on a local path on each node are also seen as global with
same path [default=true]
- PYTHONPATH Python module search path
MPI_INC Location of MPI include mpi.h, needed by CUDA/VTK (default:
auto-detect)
CXX C++ compiler command
@@ -1492,6 +1459,8 @@ Some influential environment variables:
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
+
+Report bugs to <see the wiki>.
_ACEOF
ac_status=$?
fi
@@ -1797,8 +1766,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## -------------------------------------- ##
-## -------------------------------------- ##"
+( $as_echo "## --------------------------- ##
+## Report this to see the wiki ##
+## --------------------------- ##"
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -2081,8 +2051,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## -------------------------------------- ##
-## -------------------------------------- ##"
+( $as_echo "## --------------------------- ##
+## Report this to see the wiki ##
+## --------------------------- ##"
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -2747,23 +2718,6 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
# 'configure' options
-
-# Check whether --with-pyre was given.
-if test "${with_pyre+set}" = set; then :
- withval=$with_pyre; want_pyre="$withval"
-else
- want_pyre=no
-fi
-
- if test "$want_pyre" = yes; then
- COND_PYRE_TRUE=
- COND_PYRE_FALSE='#'
-else
- COND_PYRE_TRUE='#'
- COND_PYRE_FALSE=
-fi
-
-
###
### MPI
###
@@ -2882,390 +2836,6 @@ fi
# Checks for programs.
-if test "$want_pyre" = yes; then
-
-
-
-
-
-
- if test -n "$PYTHON"; then
- # If the user set $PYTHON, use it and don't search something else.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 2.3" >&5
-$as_echo_n "checking whether $PYTHON version is >= 2.3... " >&6; }
- prog="import sys
-# split strings by '.' and convert to numeric. Append some zeros
-# because we need at least 4 digits for the hex conversion.
-# map returns an iterator in Python 3.0 and a list in 2.x
-minver = list(map(int, '2.3'.split('.'))) + [0, 0, 0]
-minverhex = 0
-# xrange is not present in Python 3.0 and range returns an iterator
-for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
-sys.exit(sys.hexversion < minverhex)"
- if { echo "$as_me:$LINENO: $PYTHON -c "$prog"" >&5
- ($PYTHON -c "$prog") >&5 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- as_fn_error $? "Python interpreter is too old" "$LINENO" 5
-fi
- am_display_PYTHON=$PYTHON
- else
- # Otherwise, try each interpreter until we find one that satisfies
- # VERSION.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 2.3" >&5
-$as_echo_n "checking for a Python interpreter with version >= 2.3... " >&6; }
-if ${am_cv_pathless_PYTHON+:} false; then :
- $as_echo_n "(cached) " >&6
-else
-
- for am_cv_pathless_PYTHON in python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
- test "$am_cv_pathless_PYTHON" = none && break
- prog="import sys
-# split strings by '.' and convert to numeric. Append some zeros
-# because we need at least 4 digits for the hex conversion.
-# map returns an iterator in Python 3.0 and a list in 2.x
-minver = list(map(int, '2.3'.split('.'))) + [0, 0, 0]
-minverhex = 0
-# xrange is not present in Python 3.0 and range returns an iterator
-for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
-sys.exit(sys.hexversion < minverhex)"
- if { echo "$as_me:$LINENO: $am_cv_pathless_PYTHON -c "$prog"" >&5
- ($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then :
- break
-fi
- done
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5
-$as_echo "$am_cv_pathless_PYTHON" >&6; }
- # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
- if test "$am_cv_pathless_PYTHON" = none; then
- PYTHON=:
- else
- # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args.
-set dummy $am_cv_pathless_PYTHON; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PYTHON+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $PYTHON in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-PYTHON=$ac_cv_path_PYTHON
-if test -n "$PYTHON"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
-$as_echo "$PYTHON" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- fi
- am_display_PYTHON=$am_cv_pathless_PYTHON
- fi
-
-
- if test "$PYTHON" = :; then
- as_fn_error $? "no suitable Python interpreter found" "$LINENO" 5
- else
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5
-$as_echo_n "checking for $am_display_PYTHON version... " >&6; }
-if ${am_cv_python_version+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
-$as_echo "$am_cv_python_version" >&6; }
- PYTHON_VERSION=$am_cv_python_version
-
-
-
- PYTHON_PREFIX='${prefix}'
-
- PYTHON_EXEC_PREFIX='${exec_prefix}'
-
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5
-$as_echo_n "checking for $am_display_PYTHON platform... " >&6; }
-if ${am_cv_python_platform+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5
-$as_echo "$am_cv_python_platform" >&6; }
- PYTHON_PLATFORM=$am_cv_python_platform
-
-
- # Just factor out some code duplication.
- am_python_setup_sysconfig="\
-import sys
-# Prefer sysconfig over distutils.sysconfig, for better compatibility
-# with python 3.x. See automake bug#10227.
-try:
- import sysconfig
-except ImportError:
- can_use_sysconfig = 0
-else:
- can_use_sysconfig = 1
-# Can't use sysconfig in CPython 2.7, since it's broken in virtualenvs:
-# <https://github.com/pypa/virtualenv/issues/118>
-try:
- from platform import python_implementation
- if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
- can_use_sysconfig = 0
-except ImportError:
- pass"
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5
-$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; }
-if ${am_cv_python_pythondir+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test "x$prefix" = xNONE
- then
- am_py_prefix=$ac_default_prefix
- else
- am_py_prefix=$prefix
- fi
- am_cv_python_pythondir=`$PYTHON -c "
-$am_python_setup_sysconfig
-if can_use_sysconfig:
- sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'})
-else:
- from distutils import sysconfig
- sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix')
-sys.stdout.write(sitedir)"`
- case $am_cv_python_pythondir in
- $am_py_prefix*)
- am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
- am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
- ;;
- *)
- case $am_py_prefix in
- /usr|/System*) ;;
- *)
- am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
- ;;
- esac
- ;;
- esac
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5
-$as_echo "$am_cv_python_pythondir" >&6; }
- pythondir=$am_cv_python_pythondir
-
-
-
- pkgpythondir=\${pythondir}/$PACKAGE
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5
-$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; }
-if ${am_cv_python_pyexecdir+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test "x$exec_prefix" = xNONE
- then
- am_py_exec_prefix=$am_py_prefix
- else
- am_py_exec_prefix=$exec_prefix
- fi
- am_cv_python_pyexecdir=`$PYTHON -c "
-$am_python_setup_sysconfig
-if can_use_sysconfig:
- sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'})
-else:
- from distutils import sysconfig
- sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix')
-sys.stdout.write(sitedir)"`
- case $am_cv_python_pyexecdir in
- $am_py_exec_prefix*)
- am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
- am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
- ;;
- *)
- case $am_py_exec_prefix in
- /usr|/System*) ;;
- *)
- am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
- ;;
- esac
- ;;
- esac
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5
-$as_echo "$am_cv_python_pyexecdir" >&6; }
- pyexecdir=$am_cv_python_pyexecdir
-
-
-
- pkgpyexecdir=\${pyexecdir}/$PACKAGE
-
-
-
- fi
-
-
-
-# $Id$
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $am_display_PYTHON sysconfig" >&5
-$as_echo_n "checking $am_display_PYTHON sysconfig... " >&6; }
-cat >sysconfig.py <<END_OF_PYTHON
-import os, sys
-from distutils import sysconfig
-def cygpath(wpath):
- s = os.popen('cygpath -u "%s"' % wpath)
- path = s.read().strip()
- s.close()
- return path
-incdir = sysconfig.get_python_inc()
-keys = (
- 'BLDLIBRARY',
- 'LDFLAGS',
- 'LDLAST',
- 'LDLIBRARY',
- 'LIBDIR',
- 'LIBP',
- 'LIBPL',
- 'LIBS',
- 'LINKFORSHARED',
- 'MODLIBS',
- 'SYSLIBS',
- 'LA_LDFLAGS',
-)
-if os.name == "nt":
- # We are running under Python for Windows (the real one...
- # not Cygwin Python, under which 'os.name' is 'posix').
- # We assume that we are still in the Cygwin POSIX environment,
- # however (this is 'configure', after all); so we convert
- # all Windows pathnames to POSIX pathnames using 'cygpath'.
- incdir = cygpath(incdir)
- vars = {}
- libs = os.path.join(sys.prefix, "libs")
- libs = cygpath(libs)
- version = sysconfig.get_python_version()
- version = version.replace('.', '')
- vars['BLDLIBRARY'] = "-L%s -lpython%s" % (libs, version)
-else:
- vars = sysconfig.get_config_vars()
- # transform AIX's python.exp
- vars['LINKFORSHARED'] = vars['LINKFORSHARED'].replace('Modules',vars['LIBPL'])
- if vars['LDLIBRARY'] == vars['LIBRARY']:
- # "On systems without shared libraries, LDLIBRARY is the same as LIBRARY"
- vars['BLDLIBRARY'] = "-L%(LIBPL)s -lpython%(VERSION)s" % vars
- elif vars['BLDLIBRARY']:
- # The 'mpicc' wrapper for LAM/MPI isn't very smart about "-L"
- # options. Adding "-L/usr/lib" can cause "-lmpi" to be found in /usr/lib
- # instead of LAM's 'lib' directory. Of course, avoiding "-L/usr/lib"
- # doesn't really fix the problem, but it does make it much less likely;
- # and "-L/usr/lib" is redundant and potentially problematic anyway.
- # Python 2.4 and later puts a symlink to libpython.so in LIBPL
- # (/usr/lib/python2.x/config), which makes adding "-L$LIBDIR"
- # (in addition to "-L$LIBPL") completely redundant.
- # But we still support Python 2.3, and we prefer shared to static,
- # so we still add "-L$LIBDIR" when Python is installed in a non-standard
- # location. Note that the linker will still prefer shared over static
- # with only "-L/usr/lib/python2.3/config" on the link line.
- libdir = ""
- if vars['LIBDIR'] != "/usr/lib":
- libdir = "-L%(LIBDIR)s "
- # Important: on Cygwin, the import library for libpython.dll is
- # nested inside Python's 'config' directory (see Issue39). This means
- # that the linker always needs help finding "-lpython2.x" (in the form
- # of "-L$LIBPL"), even for the "system" Python installed under /usr.
- vars['BLDLIBRARY'] = (libdir + "-L%(LIBPL)s -lpython%(VERSION)s") % vars
- else:
- # "On Mac OS X frameworks, BLDLIBRARY is blank"
- # See also Issue39.
- framework = "%(PYTHONFRAMEWORKDIR)s/Versions/%(VERSION)s/%(PYTHONFRAMEWORK)s" % vars
- PYTHONFRAMEWORK = vars.get('PYTHONFRAMEWORK', 'Python')
- vars['LINKFORSHARED'] = vars['LINKFORSHARED'].replace(framework, "-framework " + PYTHONFRAMEWORK)
- vars['LA_LDFLAGS'] = "-Wl,-framework,%s" % PYTHONFRAMEWORK
-vars['LDFLAGS'] = '' # only causes trouble (e.g., "-arch i386 -arch ppc" on Mac) -- see issue97
-print 'PYTHON_INCDIR="%s"' % incdir
-for key in keys:
- print 'PYTHON_%s="%s"' % (key, vars.get(key, ''))
-
-END_OF_PYTHON
-eval `$PYTHON sysconfig.py 2>/dev/null`
-if test -n "$PYTHON_INCDIR"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-else
- as_fn_error $? "\"failed
-
-Run '$PYTHON sysconfig.py' to see what went wrong.
-\"" "$LINENO" 5
-fi
-rm -f sysconfig.py sysconfig.pyc
-PYTHON_INCDIR=$PYTHON_INCDIR
-
-PYTHON_BLDLIBRARY=$PYTHON_BLDLIBRARY
-
-PYTHON_LDFLAGS=$PYTHON_LDFLAGS
-
-PYTHON_LDLAST=$PYTHON_LDLAST
-
-PYTHON_LDLIBRARY=$PYTHON_LDLIBRARY
-
-PYTHON_LIBDIR=$PYTHON_LIBDIR
-
-PYTHON_LIBP=$PYTHON_LIBP
-
-PYTHON_LIBPL=$PYTHON_LIBPL
-
-PYTHON_LIBS=$PYTHON_LIBS
-
-PYTHON_LINKFORSHARED=$PYTHON_LINKFORSHARED
-
-PYTHON_MODLIBS=$PYTHON_MODLIBS
-
-PYTHON_SYSLIBS=$PYTHON_SYSLIBS
-
-PYTHON_LA_LDFLAGS=$PYTHON_LA_LDFLAGS
-
-
-fi
-
# a courtesy to the installed base of users
if test x"$FC" = x && test x"$F90" != x; then
FC="$F90"
@@ -6862,187 +6432,6 @@ if test x"$LOCAL_PATH_IS_ALSO_GLOBAL" = x; then :
fi
-# python and pyre, this is probably unused...
-
-
-
-
-# Checks for Python modules and packages.
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-if test "$want_pyre" = yes; then
- builddir=`pwd`
- save_PYTHONPATH="$PYTHONPATH"
- PYTHONPATH="$builddir/python:$PYTHONPATH"; export PYTHONPATH
- # Cheap work-around for the inability of merlin/setuptools to control #! line.
- rm -f pyspecfem3D
- $as_ln_s $PYTHON pyspecfem3D
- pyspecfem3D="$builddir/pyspecfem3D"
- cd $srcdir
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: downloading missing Python dependencies" >&5
-$as_echo "$as_me: downloading missing Python dependencies" >&6;}
- if { ac_try='$pyspecfem3D setup.py install_deps -zmxd $builddir/deps >&5 2>&5'
- { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; }; then :
-
-else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot download missing Python dependencies
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: building Python dependencies" >&5
-$as_echo "$as_me: building Python dependencies" >&6;}
- if { ac_try='$pyspecfem3D setup.py develop -H None -f $builddir/deps -s $builddir -d $builddir/python >&5 2>&5'
- { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; }; then :
-
-else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "building Python dependencies
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egg-related flags" >&5
-$as_echo_n "checking for egg-related flags... " >&6; }
- if { ac_try='$pyspecfem3D setup.py egg_flags >&5 2>&5'
- { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; }; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
- . egg-flags.sh
- rm -f egg-flags.sh
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-$as_echo "failed" >&6; }
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot scan Python eggs for flags
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-
- cd $builddir
- rm -f pyspecfem3D
- PYTHONPATH="$save_PYTHONPATH"
- PYTHONPATH="${pythondir}:${pyexecdir}${save_PYTHONPATH:+:${save_PYTHONPATH}}"
-
-
-
-
-
-fi
-
-if test "$want_pyre" = yes; then
- ac_ext=${ac_fc_srcext-f}
-ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
-ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_fc_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alternate main to link with Fortran libraries" >&5
-$as_echo_n "checking for alternate main to link with Fortran libraries... " >&6; }
-if ${ac_cv_fc_main+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_fc_m_save_LIBS=$LIBS
- LIBS="cfortran_test.$ac_objext $LIBS"
- ac_fortran_dm_var=FC_DUMMY_MAIN
- ac_cv_fortran_main="main" # default entry point name
- for ac_func in MAIN__ MAIN_ __main MAIN _MAIN __MAIN main_ main__ _main; do
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#ifdef FC_DUMMY_MAIN_EQ_F77
-# undef F77_DUMMY_MAIN
-# undef FC_DUMMY_MAIN
-#else
-# undef $ac_fortran_dm_var
-#endif
-#define main $ac_func
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-# ifdef __cplusplus
- extern "C"
-# endif
- int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- mv conftest.$ac_objext cfortran_test.$ac_objext
-else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compile a simple C program
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_ext=${ac_fc_srcext-f}
-ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
-ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_fc_compiler_gnu
-
- cat > conftest.$ac_ext <<_ACEOF
- subroutine foobar()
- return
- end
-_ACEOF
-if ac_fn_fc_try_link "$LINENO"; then :
- ac_cv_fortran_main=$ac_func; break
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- rm -f cfortran_test* conftest*
- done
- ac_cv_fc_main=$ac_cv_fortran_main
- rm -f cfortran_test* conftest*
- LIBS=$ac_fc_m_save_LIBS
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fc_main" >&5
-$as_echo "$ac_cv_fc_main" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define FC_MAIN $ac_cv_fc_main
-_ACEOF
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-fi
-
# Checks for typedefs, structures, and compiler characteristics.
# check fortran modules flag
@@ -7082,11 +6471,10 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
cd ..
rm -rf conftest.dir
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_ext=${ac_fc_srcext-f}
+ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
+ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_fc_compiler_gnu
fi
@@ -7148,11 +6536,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
rm -rf conftest.dir
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_ext=${ac_fc_srcext-f}
+ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
+ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_fc_compiler_gnu
fi
@@ -7222,11 +6609,10 @@ done
FCFLAGS=$ac_fc_module_output_flag_FCFLAGS_save
cd ..
rm -rf conftest.dir
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_ext=${ac_fc_srcext-f}
+ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
+ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_fc_compiler_gnu
fi
@@ -7262,90 +6648,9 @@ if test "$want_mpi" = yes; then
$as_echo "## --- ##
## MPI ##
## --- ##"
-
-# Use 'mpi' module or 'mpif.h', as appropriate. UNFINISHED.
-# The default actions are to create FILENAME that either uses the
-# appropriate module or includes the existing mpif.h.
-# This strategy doesn't play well with "implicit none": whether the
-# generated header must be included before or after "implicit none"
-# depends upon the result of the test! It might be possible to make
-# "use mpi" always work: simply generate an 'mpi' module if the MPI
-# library doesn't provide one. The generated module would simply
-# "include 'mpif.h'".
-ac_ext=${ac_fc_srcext-f}
-ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
-ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_fc_compiler_gnu
-
-
-ofile=mpif.h
-cfgfile="${ofile}T"
-trap "rm \"$cfgfile\"; exit 1" 1 2 15
-rm -f "$cfgfile"
-
-cit_fc_header=none
-cit_fc_save_fc=$FC
-cit_fc_save_fcflags=$FCFLAGS
-FC=$MPIFC
-FCFLAGS="$FCFLAGS $FLAGS_CHECK"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \"use mpi\" works" >&5
-$as_echo_n "checking whether \"use mpi\" works... " >&6; }
-cat > conftest.$ac_ext <<_ACEOF
-
- program main
-
- use mpi
- integer ier
- call MPI_INIT(ier)
- call MPI_FINALIZE(ier)
-
- end
-
-_ACEOF
-if ac_fn_fc_try_compile "$LINENO"; then :
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- :
-
-else
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-# { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-# $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-# as_fn_error $? "cannot compile a trivial MPI program using $MPIFC
-# See \`config.log' for more details" "$LINENO" 5; }
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test "$cit_fc_header" != "none"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ofile" >&5
-$as_echo "$as_me: creating $ofile" >&6;}
- cat >"$cfgfile" <<END_OF_HEADER
-! $ofile. Generated by configure.
-
- $cit_fc_header
-
-END_OF_HEADER
- mv -f "$cfgfile" "$ofile" || \
- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-fi
-
-
-FC=$cit_fc_save_fc
-FCFLAGS=$cit_fc_save_fcflags
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
+# CIT_FC_MPI_MODULE([mpif.h], [$MPIFC], [$FLAGS_CHECK], [:], [
+# AC_MSG_FAILURE([cannot compile a trivial MPI program using $MPIFC])
+# ])
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -7803,11 +7108,10 @@ fi
CPPFLAGS="$CPPFLAGS_save"
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_ext=${ac_fc_srcext-f}
+ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
+ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_fc_compiler_gnu
@@ -7940,11 +7244,10 @@ rm -f core conftest.err conftest.$ac_objext \
FC="$FC_save"
FCFLAGS="$FCFLAGS_save"
LIBS="$LIBS_save"
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_ext=${ac_fc_srcext-f}
+ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
+ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_fc_compiler_gnu
@@ -8079,11 +7382,10 @@ rm -f core conftest.err conftest.$ac_objext \
CPPFLAGS="$CPPFLAGS_save"
LDFLAGS="$LDFLAGS_save"
LIBS="$LIBS_save"
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_ext=${ac_fc_srcext-f}
+ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
+ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_fc_compiler_gnu
@@ -8123,11 +7425,10 @@ fi
CPPFLAGS="$CPPFLAGS_save"
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_ext=${ac_fc_srcext-f}
+ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
+ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_fc_compiler_gnu
@@ -8204,11 +7505,10 @@ FC=$cit_fc_save_fc
FCFLAGS=$cit_fc_save_fcflags
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_ext=${ac_fc_srcext-f}
+ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
+ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_fc_compiler_gnu
fi
@@ -8357,10 +7657,6 @@ LIBOBJS=$ac_libobjs
LTLIBOBJS=$ac_ltlibobjs
-if test -z "${COND_PYRE_TRUE}" && test -z "${COND_PYRE_FALSE}"; then
- as_fn_error $? "conditional \"COND_PYRE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${COND_MPI_TRUE}" && test -z "${COND_MPI_FALSE}"; then
as_fn_error $? "conditional \"COND_MPI\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -8844,7 +8140,7 @@ $config_headers
Configuration commands:
$config_commands
-."
+Report bugs to <see the wiki>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
diff --git a/configure.ac b/configure.ac
index 9adcad4..3bef95d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,13 +24,6 @@ AC_CANONICAL_HOST
# 'configure' options
-AC_ARG_WITH([pyre],
- [AS_HELP_STRING([--with-pyre],
- [build Pyrized version @<:@default=no@:>@])],
- [want_pyre="$withval"],
- [want_pyre=no])
-AM_CONDITIONAL([COND_PYRE], [test "$want_pyre" = yes])
-
###
### MPI
###
@@ -100,11 +93,6 @@ AM_CONDITIONAL([COND_OPENMP], [test "$want_openmp" = yes])
# Checks for programs.
-if test "$want_pyre" = yes; then
- AM_PATH_PYTHON([2.3])
- CIT_PYTHON_SYSCONFIG
-fi
-
# a courtesy to the installed base of users
if test x"$FC" = x && test x"$F90" != x; then
FC="$F90"
@@ -273,58 +261,6 @@ AS_IF([test x"$LOCAL_PATH_IS_ALSO_GLOBAL" = x],[
LOCAL_PATH_IS_ALSO_GLOBAL=true
])
-# python and pyre, this is probably unused...
-
-AC_ARG_VAR(PYTHON, [Python interpreter])
-AC_ARG_VAR(PYTHONPATH, [Python module search path])
-
-# Checks for Python modules and packages.
-
-AC_LANG(C)
-if test "$want_pyre" = yes; then
- builddir=`pwd`
- save_PYTHONPATH="$PYTHONPATH"
- PYTHONPATH="$builddir/python:$PYTHONPATH"; export PYTHONPATH
- # Cheap work-around for the inability of merlin/setuptools to control #! line.
- rm -f pyspecfem3D
- $as_ln_s $PYTHON pyspecfem3D
- pyspecfem3D="$builddir/pyspecfem3D"
- cd $srcdir
-
- AC_MSG_NOTICE([downloading missing Python dependencies])
- AS_IF([AC_TRY_COMMAND([$pyspecfem3D setup.py install_deps -zmxd $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([$pyspecfem3D setup.py develop -H None -f $builddir/deps -s $builddir -d $builddir/python >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD])],
- [],
- [AC_MSG_FAILURE([building Python dependencies])])
-
- AC_MSG_CHECKING([for egg-related flags])
- AS_IF([AC_TRY_COMMAND([$pyspecfem3D setup.py egg_flags >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD])],
- [AC_MSG_RESULT(ok)
- . egg-flags.sh
- rm -f egg-flags.sh
- ],
- [AC_MSG_RESULT(failed)
- AC_MSG_FAILURE([cannot scan Python eggs for flags])])
-
- cd $builddir
- rm -f pyspecfem3D
- PYTHONPATH="$save_PYTHONPATH"
- PYTHONPATH="${pythondir}:${pyexecdir}${save_PYTHONPATH:+:${save_PYTHONPATH}}"
-
- AC_SUBST(PYTHONPATH)
- AC_SUBST(PYTHON_EGG_CFLAGS)
- AC_SUBST(PYTHON_EGG_CPPFLAGS)
- AC_SUBST(PYTHON_EGG_LDFLAGS)
-fi
-
-if test "$want_pyre" = yes; then
- CIT_FC_MAIN
-fi
-
# Checks for typedefs, structures, and compiler characteristics.
# check fortran modules flag
diff --git a/setup/config.h.in b/setup/config.h.in
index fb306f9..952b9d5 100644
--- a/setup/config.h.in
+++ b/setup/config.h.in
@@ -17,10 +17,6 @@
/* As FC_FUNC, but for C identifiers containing underscores. */
#undef FC_FUNC_
-/* Define to alternate name for `main' routine that is called from a `main' in
- the Fortran libraries. */
-#undef FC_MAIN
-
/* Define if emmintrin.h */
#undef HAVE_EMMINTRIN
More information about the CIG-COMMITS
mailing list