Commit 9357d7f9 authored by Kevin Harms's avatar Kevin Harms
Browse files

Update configure to validate autoperf module is present when autoperf is requested

parent 457a18fc
...@@ -170,15 +170,15 @@ if test x$enable_lustre_mod != xno; then ...@@ -170,15 +170,15 @@ if test x$enable_lustre_mod != xno; then
fi fi
if test x$enable_autoperf_crayxc = xyes; then if test x$enable_autoperf_crayxc = xyes; then
abssrcdir=$(readlink -f ${srcdir})
AC_CHECK_HEADER([papi.h], AC_CHECK_HEADER([papi.h],
with_papi=-lpapi, with_papi=-lpapi,
[AC_MSG_ERROR([Cannot find required header for papi])], [AC_MSG_ERROR([Cannot find required header for papi])],
[]) [])
AC_REQUIRE_AUX_FILE([modules/autoperf/crayxc/darshan-apxc-log-format.h]) AC_CHECK_HEADER([${abssrcdir}/../modules/autoperf/crayxc/darshan-apxc-log-format.h],
dnl AC_CHECK_FILE([modules/autoperf/crayxc/darshan-apxc-log-format.h], DARSHAN_USE_APXC=1,
dnl DARSHAN_USE_APXC=1, [AC_MSG_ERROR([The autoperf module is not present])],
dnl [AC_MSG_ERROR([AutoPerf submodule not initialized])]) [-]) # this last part tells it to only check for presence
DARSHAN_USE_APXC=1
fi fi
if test x$GOT_ALIGNMENT != x1; then if test x$GOT_ALIGNMENT != x1; then
......
...@@ -86,11 +86,11 @@ AC_ARG_ENABLE( ...@@ -86,11 +86,11 @@ AC_ARG_ENABLE(
) )
if test x$enable_autoperf_crayxc = xyes; then if test x$enable_autoperf_crayxc = xyes; then
AC_REQUIRE_AUX_FILE([modules/autoperf/crayxc/darshan-apxc-log-format.h]) abssrcdir=$(readlink -f ${srcdir})
dnl AC_CHECK_FILE([modules/autoperf/crayxc/darshan-apxc-log-format.h], AC_CHECK_HEADER([${abssrcdir}/../modules/autoperf/crayxc/darshan-apxc-log-format.h],
dnl DARSHAN_USE_APXC=1, DARSHAN_USE_APXC=1,
dnl [AC_MSG_ERROR([AutoPerf submodule not initialized])]) [AC_MSG_ERROR([The autoperf module is not present])],
DARSHAN_USE_APXC=1 [-]) # this last part tells it to only check for presence
fi fi
AC_CHECK_FUNCS([strndup]) AC_CHECK_FUNCS([strndup])
......
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