From 93d029854a78cb7843a0f7287ebccd9b71862b40 Mon Sep 17 00:00:00 2001 From: Ed Hartnett Date: Tue, 9 Apr 2019 06:53:18 -0600 Subject: [PATCH] more progress on pioperformance --- configure.ac | 10 +++++++++- tests/performance/Makefile.am | 13 +++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index a83b53f817b..28f25298508 100644 --- a/configure.ac +++ b/configure.ac @@ -163,7 +163,15 @@ fi # If we want the timing library, we must find it. if test "x$enable_timing" = xyes; then AC_CHECK_HEADERS([gptl.h]) - AC_CHECK_LIB([gptl], [GPTLinitialize], [], [AC_MSG_ERROR([Can't find or link to the GPTL library.])]) + AC_CHECK_LIB([gptl], [GPTLinitialize], [], + [AC_MSG_ERROR([Can't find or link to the GPTL library.])]) + if test "x$enable_fortran" = xyes; then + AC_LANG_PUSH([Fortran]) +# AC_CHECK_HEADERS([gptl.inc]) + AC_CHECK_LIB([gptlf], [gptlstart], [], + [AC_MSG_ERROR([Can't find or link to the GPTL Fortran library.])]) + AC_LANG_POP([Fortran]) + fi fi AC_CONFIG_FILES(src/flib/piodarray.F90:src/flib/piodarray.F90.in2) diff --git a/tests/performance/Makefile.am b/tests/performance/Makefile.am index c02e9dad8a0..119dbdccfc5 100644 --- a/tests/performance/Makefile.am +++ b/tests/performance/Makefile.am @@ -9,12 +9,21 @@ # Put together AM_CPPFLAGS and AM_LDFLAGS. include $(top_srcdir)/set_flags.am -LDADD = libpio_tutil.la \ +# Link to test util library and PIO Fortran and C libs. +LDADD = $(top_builddir)/src/gptl/libperf_mod.la \ +$(top_builddir)/src/gptl/libperf_utils.la \ +${top_builddir}/tests/general/libpio_tutil.la \ ${top_builddir}/src/flib/libpiof.la \ ${top_builddir}/src/clib/libpio.la +# Find perf_mod and perf_util. +AM_CPPFLAGS += -I$(top_builddir)/src/gptl + +# Find pio_tutil.mod +AM_CPPFLAGS += -I$(top_builddir)/tests/general + # Build the test for make check. -bin_PROGRAMS = pioperformance +check_PROGRAMS = pioperformance pioperformance_SOURCES = pioperformance.F90