Commit a6940e63 authored by Sergey Kosukhin's avatar Sergey Kosukhin
Browse files

Account for static-only build.

parent 2d92e247
......@@ -246,6 +246,13 @@ AM_CONDITIONAL([USE_PPM_CORE],[test $enable_ppm = yes])
AM_CONDITIONAL([HAVE_PARALLEL_NC4],[test $HAVE_PARALLEL_NC4 -gt 0])
AC_SUBST([USE_MPI])
AC_SUBST([ENABLE_MPI],[`test x"$enable_mpi" = xyes && echo true || echo false`])
AC_SUBST([LIBRT])
AM_COND_IF([USE_MPI],
[LIBRT=
LIBS_save=$LIBS
AC_SEARCH_LIBS([aio_suspend], [rt],
[test "$ac_res" = "none required" || LIBRT=$ac_res])
LIBS=$LIBS_save])
# ----------------------------------------------------------------------
# Create the Fortran Interface via iso_c_binding module (Fortran 2003 Standard)
#
......
......@@ -16,8 +16,8 @@ endif
collectData_SOURCES=collectData.c
if USE_MPI
LDADD=$(top_builddir)/src/libcdipio.la $(MPI_C_LIB)
collectData2003_LDADD=$(top_builddir)/src/libcdipio.la $(MPI_FC_LIB)
LDADD=$(top_builddir)/src/libcdipio.la $(LIBRT) $(MPI_C_LIB)
collectData2003_LDADD=$(top_builddir)/src/libcdipio.la $(LIBRT) $(MPI_FC_LIB)
else
LDADD=$(top_builddir)/src/libcdi.la
collectData2003_LDADD=$(top_builddir)/src/libcdi.la
......
......@@ -4,7 +4,7 @@ libdir=@libdir@
includedir=@includedir@
cflags=-I@includedir@
fcflags=@FPP_INCOPT@@includedir@ @CDI_F90_INTERFACE_FCFLAGS@
libs=-L@libdir@ -lcdipio @PPM_CORE_LIBS@ @YAXT_LIBS@ -lcdi @GRIB_API_LIBS@ @NETCDF_LIBS@ @SZLIB_LIBS@ @THREADS_LIBS@ @LIBS@
libs=-L@libdir@ -lcdipio @LIBRT@ @PPM_CORE_LIBS@ @YAXT_LIBS@ -lcdi @GRIB_API_LIBS@ @NETCDF_LIBS@ @SZLIB_LIBS@ @THREADS_LIBS@ @LIBS@
threads_libs=@THREADS_LIBS@
threads_cflags=@THREADS_INCLUDE@
szlib_cflags=@SZLIB_INCLUDE@
......@@ -14,7 +14,7 @@ netcdf_cflags=@NETCDF_INCLUDE@
netcdf_libs=@NETCDF_LIBS@
grib_api_cflags=@GRIB_API_INCLUDE@
grib_api_libs=@GRIB_API_LIBS@
aux_libs=@LIBS@
aux_libs=@LIBRT@ @LIBS@
cdipio_build_cc=@CC@
cdipio_build_cflags=@CFLAGS@
cdipio_build_cppflags=@CPPFLAGS@
......
......@@ -47,8 +47,8 @@ test_byteswap_SOURCES = test_byteswap.c
#
AM_CFLAGS = $(PPM_CORE_CFLAGS) $(YAXT_CFLAGS) $(MPI_C_INCLUDE)
if USE_MPI
pio_write_LDADD = ../src/libcdipio.la $(MPI_C_LIB)
pio_write_deco2d_LDADD = ../src/libcdipio.la $(MPI_C_LIB)
pio_write_LDADD = ../src/libcdipio.la $(LIBRT) $(MPI_C_LIB)
pio_write_deco2d_LDADD = ../src/libcdipio.la $(LIBRT) $(MPI_C_LIB)
TESTS += test_resource_copy_mpi_run
check_PROGRAMS += test_resource_copy_mpi
test_resource_copy_mpi_LDADD = ../src/libcdipio.la
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment