Commit 4e2c8aac authored by Sergey Kosukhin's avatar Sergey Kosukhin
Browse files

Better handling of librt (fixup a6940e63).

parent 01ab9409
......@@ -261,13 +261,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])
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])
[AC_CHECK_DECL([_SX], [],
[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 $(LIBRT) $(MPI_C_LIB)
collectData2003_LDADD=$(top_builddir)/src/libcdipio.la $(LIBRT) $(MPI_FC_LIB)
LDADD=$(top_builddir)/src/libcdipio.la $(MPI_C_LIB)
collectData2003_LDADD=$(top_builddir)/src/libcdipio.la $(MPI_FC_LIB)
else
LDADD=$(top_builddir)/src/libcdi.la
collectData2003_LDADD=$(top_builddir)/src/libcdi.la
......
......@@ -261,7 +261,7 @@ libcdipio_la_SOURCES += $(libcdipio_la_HAVE_PARALLEL_NC4_extra_sources)
endif
endif
libcdipio_la_LIBADD = libcdi.la $(PPM_CORE_LIBS) $(YAXT_LIBS) $(MPI_C_LIB)
libcdipio_la_LIBADD = libcdi.la $(LIBRT) $(PPM_CORE_LIBS) $(YAXT_LIBS) $(MPI_C_LIB)
#
#cdilib.c:
......
......@@ -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 $(LIBRT) $(MPI_C_LIB)
pio_write_deco2d_LDADD = ../src/libcdipio.la $(LIBRT) $(MPI_C_LIB)
pio_write_LDADD = ../src/libcdipio.la $(MPI_C_LIB)
pio_write_deco2d_LDADD = ../src/libcdipio.la $(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