Commit 6aa2c12e authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Makefile.in update

parents 39db1e05 4623aaf0
......@@ -19,6 +19,7 @@ config/compile -text
config/config.guess -text
config/config.sub -text
config/default -text
config/default-mpi -text
config/depcomp -text
config/install-sh -text
config/interface.rb -text
......@@ -33,17 +34,17 @@ doc/cdi_fman.pdf -text
doc/coding_standards/README -text
doc/coding_standards/footer.c -text
doc/coding_standards/ref-example.c -text
doc/pio/graphics/communicators.pdf -text
doc/pio/graphics/encodeNBuffer.pdf -text
doc/pio/graphics/legend.pdf -text
doc/pio/graphics/pioBuffer.pdf -text
doc/pio/graphics/pio_fpguard.pdf -text
doc/pio/graphics/pio_mpi.pdf -text
doc/pio/graphics/pio_none.pdf -text
doc/pio/graphics/pio_writer.pdf -text
doc/pio/graphics/serial.pdf -text
doc/pio/graphics/timestep.pdf -text
doc/pio/pio_docu.pdf -text
doc/pio/graphics/communicators.pdf -text svneol=unset#unset
doc/pio/graphics/encodeNBuffer.pdf -text svneol=unset#unset
doc/pio/graphics/legend.pdf -text svneol=unset#unset
doc/pio/graphics/pioBuffer.pdf -text svneol=unset#unset
doc/pio/graphics/pio_fpguard.pdf -text svneol=unset#unset
doc/pio/graphics/pio_mpi.pdf -text svneol=unset#unset
doc/pio/graphics/pio_none.pdf -text svneol=unset#unset
doc/pio/graphics/pio_writer.pdf -text svneol=unset#unset
doc/pio/graphics/serial.pdf -text svneol=unset#unset
doc/pio/graphics/timestep.pdf -text svneol=unset#unset
doc/pio/pio_docu.pdf -text svneol=unset#unset
doc/pio/tex/communicators.tex -text
doc/pio/tex/intro.tex -text
doc/pio/tex/makepdf_f -text
......@@ -122,6 +123,7 @@ examples/cdi_write_reset.c -text
examples/compf -text
examples/pio/Makefile.am -text
examples/pio/Makefile.in -text
examples/pio/cdi.inc -text
examples/pio/collectData.c -text
examples/pio/collectData2003.F90 -text
examples/pio/collectDataNStreams.c -text
......@@ -226,7 +228,8 @@ src/namespace.c -text
src/namespace.h -text
src/pio.c -text
src/pio.h -text
src/pio_c_temp.h -text
src/pio_cdf_int.c -text
src/pio_cdf_int.h -text
src/pio_comm.c -text
src/pio_comm.h -text
src/pio_dbuffer.c -text
......@@ -239,8 +242,9 @@ src/pio_posixasynch.c -text
src/pio_posixfpguardsendrecv.c -text
src/pio_posixnonb.c -text
src/pio_record_send.c -text
src/pio_rpc.c -text
src/pio_rpc.h -text
src/pio_serialize.c -text
src/pio_serialize.h -text
src/pio_server.c -text
src/pio_server.h -text
src/pio_util.c -text
......@@ -248,6 +252,10 @@ src/pio_util.h -text
src/pkgconfig/cdi.pc.in -text
src/resource_handle.c -text
src/resource_handle.h -text
src/resource_unpack.c -text
src/resource_unpack.h -text
src/serialize.c -text
src/serialize.h -text
src/service.h -text
src/servicelib.c -text
src/stream.c -text
......@@ -315,9 +323,11 @@ tests/cksum.c -text
tests/cksum.h -text
tests/cksum_read.c -text
tests/cksum_write.c -text
tests/cksum_write_chunk.c -text
tests/ensure_array_size.c -text
tests/ensure_array_size.h -text
tests/pio_cksum_asynch.in -text
tests/pio_cksum_cdf.in -text
tests/pio_cksum_fpguard.in -text
tests/pio_cksum_mpinonb.in -text
tests/pio_cksum_writer.in -text
......@@ -325,6 +335,7 @@ tests/pio_write.c -text
tests/pio_write_run.in -text
tests/stream_cksum.c -text
tests/stream_cksum.h -text
tests/test_chunk_cksum.in -text
tests/test_cksum_extra.in -text
tests/test_cksum_grib.in -text
tests/test_cksum_ieg.in -text
......@@ -334,6 +345,7 @@ tests/test_cksum_nc4.in -text
tests/test_cksum_service.in -text
tests/test_grib.c -text
tests/test_grib.sh -text
tests/test_resource_copy.c -text
tests/var_cksum.c -text
tests/var_cksum.h -text
util/mpi_launch_poe -text
......
......@@ -174,6 +174,9 @@ ENABLE_CGRIBEX = @ENABLE_CGRIBEX@
ENABLE_EXTRA = @ENABLE_EXTRA@
ENABLE_GRIB = @ENABLE_GRIB@
ENABLE_IEG = @ENABLE_IEG@
ENABLE_NC2 = @ENABLE_NC2@
ENABLE_NC4 = @ENABLE_NC4@
ENABLE_NETCDF = @ENABLE_NETCDF@
ENABLE_PYTHON = @ENABLE_PYTHON@
ENABLE_RUBY = @ENABLE_RUBY@
ENABLE_SERVICE = @ENABLE_SERVICE@
......@@ -194,6 +197,7 @@ FPP_INCOPT = @FPP_INCOPT@
GREP = @GREP@
GRIB_API_INCLUDE = @GRIB_API_INCLUDE@
GRIB_API_LIBS = @GRIB_API_LIBS@
HAVE_PARALLEL_NC4 = @HAVE_PARALLEL_NC4@
HDF5_INCLUDE = @HDF5_INCLUDE@
HDF5_LIBS = @HDF5_LIBS@
HDF5_ROOT = @HDF5_ROOT@
......@@ -237,6 +241,11 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PPM_CORE_CFLAGS = @PPM_CORE_CFLAGS@
PPM_CORE_LIBS = @PPM_CORE_LIBS@
PTHREAD_CC = @PTHREAD_CC@
PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
PTHREAD_LIBS = @PTHREAD_LIBS@
......@@ -256,6 +265,8 @@ THREADS_LIBS = @THREADS_LIBS@
USER_NAME = @USER_NAME@
USE_MPI = @USE_MPI@
VERSION = @VERSION@
YAXT_CFLAGS = @YAXT_CFLAGS@
YAXT_LIBS = @YAXT_LIBS@
ZLIB_INCLUDE = @ZLIB_INCLUDE@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
......
......@@ -20,6 +20,164 @@ You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
# serial 1 (pkg-config-0.24)
#
# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
# PKG_PROG_PKG_CONFIG([MIN-VERSION])
# ----------------------------------
AC_DEFUN([PKG_PROG_PKG_CONFIG],
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=m4_default([$1], [0.9.0])
AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
PKG_CONFIG=""
fi
fi[]dnl
])# PKG_PROG_PKG_CONFIG
# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
#
# Check to see whether a particular set of modules exists. Similar
# to PKG_CHECK_MODULES(), but does not set variables or print errors.
#
# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
# only at the first occurence in configure.ac, so if the first place
# it's called might be skipped (such as if it is within an "if", you
# have to call PKG_CHECK_EXISTS manually
# --------------------------------------------------------------
AC_DEFUN([PKG_CHECK_EXISTS],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
if test -n "$PKG_CONFIG" && \
AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
m4_default([$2], [:])
m4_ifvaln([$3], [else
$3])dnl
fi])
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# ---------------------------------------------
m4_define([_PKG_CONFIG],
[if test -n "$$1"; then
pkg_cv_[]$1="$$1"
elif test -n "$PKG_CONFIG"; then
PKG_CHECK_EXISTS([$3],
[pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
[pkg_failed=yes])
else
pkg_failed=untried
fi[]dnl
])# _PKG_CONFIG
# _PKG_SHORT_ERRORS_SUPPORTED
# -----------------------------
AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
else
_pkg_short_errors_supported=no
fi[]dnl
])# _PKG_SHORT_ERRORS_SUPPORTED
# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
# [ACTION-IF-NOT-FOUND])
#
#
# Note that if there is a possibility the first call to
# PKG_CHECK_MODULES might not happen, you should be sure to include an
# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
#
#
# --------------------------------------------------------------
AC_DEFUN([PKG_CHECK_MODULES],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
pkg_failed=no
AC_MSG_CHECKING([for $1])
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
_PKG_CONFIG([$1][_LIBS], [libs], [$2])
m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
and $1[]_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.])
if test $pkg_failed = yes; then
AC_MSG_RESULT([no])
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
else
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
m4_default([$4], [AC_MSG_ERROR(
[Package requirements ($2) were not met:
$$1_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
_PKG_TEXT])[]dnl
])
elif test $pkg_failed = untried; then
AC_MSG_RESULT([no])
m4_default([$4], [AC_MSG_FAILURE(
[The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
_PKG_TEXT
To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
AC_MSG_RESULT([yes])
$3
fi[]dnl
])# PKG_CHECK_MODULES
# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
# Foundation, Inc.
#
......
......@@ -148,6 +148,9 @@ ENABLE_CGRIBEX = @ENABLE_CGRIBEX@
ENABLE_EXTRA = @ENABLE_EXTRA@
ENABLE_GRIB = @ENABLE_GRIB@
ENABLE_IEG = @ENABLE_IEG@
ENABLE_NC2 = @ENABLE_NC2@
ENABLE_NC4 = @ENABLE_NC4@
ENABLE_NETCDF = @ENABLE_NETCDF@
ENABLE_PYTHON = @ENABLE_PYTHON@
ENABLE_RUBY = @ENABLE_RUBY@
ENABLE_SERVICE = @ENABLE_SERVICE@
......@@ -168,6 +171,7 @@ FPP_INCOPT = @FPP_INCOPT@
GREP = @GREP@
GRIB_API_INCLUDE = @GRIB_API_INCLUDE@
GRIB_API_LIBS = @GRIB_API_LIBS@
HAVE_PARALLEL_NC4 = @HAVE_PARALLEL_NC4@
HDF5_INCLUDE = @HDF5_INCLUDE@
HDF5_LIBS = @HDF5_LIBS@
HDF5_ROOT = @HDF5_ROOT@
......@@ -211,6 +215,11 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PPM_CORE_CFLAGS = @PPM_CORE_CFLAGS@
PPM_CORE_LIBS = @PPM_CORE_LIBS@
PTHREAD_CC = @PTHREAD_CC@
PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
PTHREAD_LIBS = @PTHREAD_LIBS@
......@@ -230,6 +239,8 @@ THREADS_LIBS = @THREADS_LIBS@
USER_NAME = @USER_NAME@
USE_MPI = @USE_MPI@
VERSION = @VERSION@
YAXT_CFLAGS = @YAXT_CFLAGS@
YAXT_LIBS = @YAXT_LIBS@
ZLIB_INCLUDE = @ZLIB_INCLUDE@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
......
#! /usr/bin/env bash
#
# default configuration options and compiler flags for different hosts
#
if test -z "$1" ; then
HOSTNAME=`hostname`
else
HOSTNAME=$1
fi
set -x
cwd=`pwd -P`
srcd="$(readlink -f ${0})"
srcd="${srcd%/config/default-mpi}"
if [[ "$cwd" =~ "^${srcd}/.\+" ]]; then
echo "A build directory that is a sub-directory of the source directory is unsupported!" >&2
exit 1
elif [[ "$srcd" = "$cwd" ]]; then
confpath=.
else
confpath="${srcd}"
fi
#
case "${HOSTNAME}" in
# powerpc-ibm-aix6.1.0.0
blizzard*|passat*)
export MP_PROCS=1
export MP_HOSTFILE="${cwd}/hostfile"
hostname >"$MP_HOSTFILE"
export PKG_CONFIG_PATH="/sw/aix61/yaxt-0.1.4-64bit/lib/pkgconfig:/sw/aix61/ppm-1.0.1-64bit-xl-pe-noomp/lib/pkgconfig:${PKG_CONFIG_PATH+:$PKG_CONFIG_PATH}"
OPTFLAGS='-O3 -qarch=pwr6 -qtune=pwr6'
export CONFIG_SHELL=/bin/bash
# add shared library wrappers to PATH
case ":$PATH:" in
*:/sw/aix61/smartmpxlf/bin:*)
;;
*)
PATH="/sw/aix61/smartmpxlf/bin:$PATH"
;;
esac
$CONFIG_SHELL "$confpath/configure" \
--prefix="$HOME/opt/cdi-powerpc-ibm-aix6-netcdf4-pe" \
--with-netcdf=/sw/aix61/netcdf-4.2.1.1-64bit-parallel \
--with-hdf5=/sw/aix61/hdf5-1.8.10-64bit-parallel \
--with-zlib=/sw/aix61/zlib-1.2.6 \
--with-szlib=/sw/aix61/szip-2.1-64bit \
AR='ar -X 64' \
LDFLAGS='-g -q64 -Wl,-brtl' \
CC='smartmpcc_r -qlanglvl=extc99' \
CFLAGS="$OPTFLAGS -q64" \
CPPFLAGS='-Dextname' \
F77=smartmpxlf \
F77FLAGS="$OPTFLAGS -q64 -qsuffix=cpp=f90 -qextname" \
FC=smartmpxlf \
FCFLAGS="$OPTFLAGS -q64 -qsuffix=cpp=f90 -qextname" \
CXX=smartmpCC_r \
LIBS='-L/sw/aix61/parallel-netcdf-1.3.0-64bit/lib -lpnetcdf -L/sw/aix61/curl-7.21.3/lib -lcurl -L/sw/aix61/openssl-1.0.0d/lib -lcrypto -lssl -L/usr/lpp/ppe.poe/lib -lgpfs' \
ac_cv_func_mmap_fixed_mapped=yes \
--host=powerpc-ibm-aix6.1.0.0 \
host_alias=powerpc-ibm-aix6.1.0.0 \
--enable-mpi=yes \
MPI_LAUNCH="${srcd}/util/mpi_launch_poe"
make -j8
make -j8 check
make install
;;
esac
This diff is collapsed.
......@@ -108,12 +108,90 @@ ACX_OPTIONS
AC_ARG_ENABLE(mpi,AS_HELP_STRING([--enable-mpi],[Compile with MPI compiler [default=no]]),enable_mpi=yes,enable_mpi=no)
AS_IF([test x"${enable_mpi}" = x"yes"],
[USE_MPI=yes])
HAVE_PARALLEL_NC4=0
AS_IF([test x"$USE_MPI" = xyes],
[AC_DEFINE([USE_MPI],[1],[parallel I/O requested and available])
AC_CHECK_PROGS([MPI_LAUNCH],[mpirun mpiexec],[])
AS_IF([test x$MPI_LAUNCH = x],[])],
AC_PATH_PROGS([MPI_LAUNCH],[mpirun mpiexec],[true])
AS_IF([test x"$cross_compiling" = xno],
[AC_MSG_CHECKING([if $MPI_LAUNCH works])
saved_CFLAGS=$CFLAGS
saved_LIBS=$LIBS
CFLAGS="$CFLAGS $MPI_C_INCLUDE"
LIBS="$LIBS $MPI_C_LIB"
AC_LINK_IFELSE([AC_LANG_SOURCE([
@%:@include <stdio.h>
@%:@include <stdlib.h>
@%:@include <mpi.h>
@%:@define xmpi(ret) \\
do { \\
if (ret != MPI_SUCCESS) \\
exit(EXIT_FAILURE); \\
} while (0)
int
main(int argc, char **argv)
{
xmpi(MPI_Init(&argc, &argv));
char *numarg = argv@<:@1@:>@;
int cmdnum = atoi(numarg);
int procnum = 1;
xmpi(MPI_Allreduce(MPI_IN_PLACE, &procnum, 1, MPI_INT, MPI_SUM,
MPI_COMM_WORLD));
xmpi(MPI_Finalize());
return (procnum == cmdnum)?EXIT_SUCCESS:EXIT_FAILURE;
}
])],
[AS_IF([$MPI_LAUNCH -n 4 ./conftest$EXEEXT 4],
[AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no])
AC_MSG_FAILURE([mpirun doesn't work])])],
[AC_MSG_FAILURE([Cannot compile simple MPI program])])
CFLAGS=$saved_CFLAGS
LIBS=$saved_LIBS
])
AS_IF([test "x$MPI_LAUNCH" = xtrue],
[AC_MSG_WARN([MPI launch command unavailable])])
PKG_CHECK_MODULES([YAXT],[yaxt],
[AC_DEFINE([HAVE_YAXT],,[yaxt library is available])],
[AC_MSG_FAILURE([Required yaxt library unavailable.])])
AS_IF([test x"$ENABLE_NC4" = xyes],
[AC_CHECK_HEADERS([netcdf_par.h],
[AC_CHECK_DECL([MPI_Bcast],
[HAVE_PARALLEL_NC4=1],
[AC_MSG_WARN([The supplied netCDF library does not support MPI parallel invocations])],
[AC_INCLUDES_DEFAULT
@%:@include <netcdf_par.h>])],
[AC_CHECK_DECL([MPI_Bcast],
[HAVE_PARALLEL_NC4=1],
[AC_MSG_WARN([The supplied netCDF library does not support MPI parallel invocations])],
[AC_INCLUDES_DEFAULT
@%:@include <netcdf.h>])
])
dnl parallel netCDF support still requires ScalES-PPM and YAXT to
dnl re-arrange the data when running with more than one collector
AS_IF([test $HAVE_PARALLEL_NC4 = 1],
[PKG_CHECK_MODULES([PPM_CORE],[scales-ppm-core],
[enable_ppm=yes
AC_DEFINE([HAVE_PPM_CORE],,
[ScalES PPM C core library is available])
],
[enable_ppm=no])
])
dnl if not both scales-ppm and yaxt are available, netcdf can only be
dnl used in serial mode
AS_IF([test x$enable_ppm != xyes],
[HAVE_PARALLEL_NC4=0])
])
],
[MPI_LAUNCH="`pwd`/util/serialrun"
AC_SUBST([MPI_LAUNCH])])
AS_IF([test $HAVE_PARALLEL_NC4 -gt 0],
[AC_DEFINE([HAVE_PARALLEL_NC4],[1],
[netCDF library does support MPI parallel invocations])])
AC_SUBST([HAVE_PARALLEL_NC4])
AM_CONDITIONAL([USE_MPI],[test x"$USE_MPI" = xyes])
AC_SUBST([USE_MPI])
# ----------------------------------------------------------------------
......@@ -170,16 +248,21 @@ AS_IF([test "x$enable_ruby" != "xno"],[AC_SUBST([ENABLE_RUBY],[true])],[AC_SUBST
AC_ARG_ENABLE(python,
[AS_HELP_STRING([--enable-python],[python language bindings [default=no] (EXPERIMENTAL)])],
[AC_CHECK_PROG(PYTHON,python,python)
PYTHON_INCLUDES="-I$($PYTHON -c 'from distutils import sysconfig;print sysconfig.get_python_lib(1,1)' | $SED 's/lib/include/')"
save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
AC_CHECK_HEADER([Python.h],,[enable_python=no
PYTHON=
])
CPPFLAGS=$save_CPPFLAGS
AS_IF([test "x$PYTHON" != "x"],
enable_python=no
for PYTHON_INCLUDES in \
"-I`$PYTHON -c 'from distutils import sysconfig;print sysconfig.get_python_inc()'`" \
"-I`$PYTHON -c 'from distutils import sysconfig;print sysconfig.get_python_lib(1,1)' | $SED 's/lib/include/'`"
do
save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
AC_CHECK_HEADER([Python.h],[enable_python=yes
break])
CPPFLAGS=$save_CPPFLAGS
done
AS_IF([test "x$enable_python" != "xno"],
[AS_IF([test "x$SWIG" = "x"],
[AC_MSG_NOTICE([Python bindings: Swig is disabled, pregenerated files will be used. Use '--enable-swig' for swig usage])])],
[AC_MSG_NOTICE([Python bindings: Swig is disabled, pregenerated files will be used. Use '--enable-swig' for swig usage])],
[PYTHON=])],
[AS_IF([test `$SWIG -help 2>&1 | $GREP -c '\-python *- Generate'` = 0],
[AC_MSG_NOTICE([No (swig does not support -python option)])
enable_python=no
......@@ -207,16 +290,18 @@ AC_CONFIG_FILES([tests/test_cksum_grib \
tests/test_cksum_extra \
tests/test_cksum_service \
tests/test_cksum_ieg \
tests/test_chunk_cksum \
tests/pio_write_run \
tests/pio_cksum_mpinonb \
tests/pio_cksum_fpguard \
tests/pio_cksum_asynch \
tests/pio_cksum_writer \
tests/pio_cksum_cdf \
util/serialrun],[chmod a+x "$ac_file"])
AC_OUTPUT([Makefile src/Makefile interfaces/Makefile app/Makefile \
tests/Makefile examples/Makefile examples/pio/Makefile cdi.settings \
src/pkgconfig/cdi.pc])
tests/Makefile examples/Makefile cdi.settings \
examples/pio/Makefile src/pkgconfig/cdi.pc])
# ----------------------------------------------------------------------
# Show configuration
......
......@@ -364,6 +364,16 @@ Get one value of a Y-axis.
Get all values of a Y-axis.
\section*{\tt \htmlref{pioInit}{pioInit}}
\begin{verbatim}
MPI_Comm pioInit (MPI_Comm commSuper, int nProcsIO, int IOMode,
int *pioNamespace, float partInflate);
\end{verbatim}
initialize I/O server processes and communication.
\section*{\tt \htmlref{streamClose}{streamClose}}
\begin{verbatim}
......
......@@ -364,6 +364,16 @@ Get one value of a Y-axis.
Get all values of a Y-axis.
\section*{\tt \htmlref{pioInit}{pioInit}}
\begin{verbatim}
INTEGER FUNCTION pioInit (INTEGER commSuper, INTEGER nProcsIO, INTEGER IOMode,
INTEGER pioNamespace, REAL partInflate)
\end{verbatim}
initialize I/O server processes and communication.
\section*{\tt \htmlref{streamClose}{streamClose}}
\begin{verbatim}
......
......@@ -186,6 +186,9 @@ ENABLE_CGRIBEX = @ENABLE_CGRIBEX@
ENABLE_EXTRA = @ENABLE_EXTRA@
ENABLE_GRIB = @ENABLE_GRIB@
ENABLE_IEG = @ENABLE_IEG@
ENABLE_NC2 = @ENABLE_NC2@
ENABLE_NC4 = @ENABLE_NC4@
ENABLE_NETCDF = @ENABLE_NETCDF@
ENABLE_PYTHON = @ENABLE_PYTHON@
ENABLE_RUBY = @ENABLE_RUBY@
ENABLE_SERVICE = @ENABLE_SERVICE@
......@@ -206,6 +209,7 @@ FPP_INCOPT = @FPP_INCOPT@
GREP = @GREP@
GRIB_API_INCLUDE = @GRIB_API_INCLUDE@
GRIB_API_LIBS = @GRIB_API_LIBS@
HAVE_PARALLEL_NC4 = @HAVE_PARALLEL_NC4@
HDF5_INCLUDE = @HDF5_INCLUDE@
HDF5_LIBS = @HDF5_LIBS@
HDF5_ROOT = @HDF5_ROOT@
......@@ -249,6 +253,11 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PPM_CORE_CFLAGS = @PPM_CORE_CFLAGS@
PPM_CORE_LIBS = @PPM_CORE_LIBS@
PTHREAD_CC = @PTHREAD_CC@
PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
PTHREAD_LIBS = @PTHREAD_LIBS@
......@@ -268,6 +277,8 @@ THREADS_LIBS = @THREADS_LIBS@
USER_NAME = @USER_NAME@
USE_MPI = @USE_MPI@
VERSION = @VERSION@
YAXT_CFLAGS = @YAXT_CFLAGS@
YAXT_LIBS = @YAXT_LIBS@
ZLIB_INCLUDE = @ZLIB_INCLUDE@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
......
noinst_PROGRAMS=collectData collectDataNStreams
AM_CPPFLAGS = -I$(top_srcdir)/src $(YAXT_CFLAGS)
AM_FCFLAGS = $(FPP_INCOPT)$(top_srcdir)/src
if USE_MPI
noinst_PROGRAMS+=compareResourcesArray
AM_FCFLAGS += $(FPP_DEFOPT)USE_MPI
endif
if USE_FC
noinst_PROGRAMS+=collectData2003
endif
AM_CPPFLAGS = -I$(top_srcdir)/src
AM_FCFLAGS = $(FPP_INCOPT)$(top_srcdir)/src
collectData_SOURCES=collectData.c
collectData_LDADD=$(top_builddir)/src/libcdi.la
......
......@@ -54,7 +54,8 @@ host_triplet = @host@
noinst_PROGRAMS = collectData$(EXEEXT) collectDataNStreams$(EXEEXT) \