From 2088458643e148bd2ad2e1dc1900d0c0bad99450 Mon Sep 17 00:00:00 2001
From: Sergey Kosukhin <sergey.kosukhin@mpimet.mpg.de>
Date: Tue, 2 Jul 2019 11:50:05 +0200
Subject: [PATCH] Account for static-only build.

---
 configure.ac               | 7 +++++++
 examples/pio/Makefile.am   | 4 ++--
 src/pkgconfig/cdipio.pc.in | 4 ++--
 tests/Makefile.am          | 4 ++--
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index ada93378b..8956c14eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -266,6 +266,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)
 #
diff --git a/examples/pio/Makefile.am b/examples/pio/Makefile.am
index ed3a4db66..82f232df7 100644
--- a/examples/pio/Makefile.am
+++ b/examples/pio/Makefile.am
@@ -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
diff --git a/src/pkgconfig/cdipio.pc.in b/src/pkgconfig/cdipio.pc.in
index 7b34f21fc..dd6adc42a 100644
--- a/src/pkgconfig/cdipio.pc.in
+++ b/src/pkgconfig/cdipio.pc.in
@@ -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@
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 42ffb51ec..c04ccf02e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -45,8 +45,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 $(UUID_C_LIB) $(MPI_C_LIB)
-pio_write_deco2d_LDADD = ../src/libcdipio.la $(UUID_C_LIB) $(MPI_C_LIB)
+pio_write_LDADD = ../src/libcdipio.la $(LIBRT) $(UUID_C_LIB) $(MPI_C_LIB)
+pio_write_deco2d_LDADD = ../src/libcdipio.la $(LIBRT) $(UUID_C_LIB) $(MPI_C_LIB)
 TESTS +=  test_resource_copy_mpi_run
 check_PROGRAMS += test_resource_copy_mpi
 test_resource_copy_mpi_LDADD = ../src/libcdipio.la $(UUID_C_LIB)
-- 
GitLab