[Darshan-commits] [Git][darshan/darshan][autoperf-mod] Update configure to validate autoperf module is present when autoperf is requested

[Kevin Harms]

Kevin Harms pushed to branch autoperf-mod at darshan / darshan


Commits:
9357d7f9 by Kevin Harms at 2018-03-13T16:17:59+00:00
Update configure to validate autoperf module is present when autoperf is requested

- - - - -


2 changed files:

- darshan-runtime/configure.in
- darshan-util/configure.in


Changes:

=====================================
darshan-runtime/configure.in
=====================================
--- a/darshan-runtime/configure.in
+++ b/darshan-runtime/configure.in
@@ -170,15 +170,15 @@ if test x$enable_lustre_mod != xno; then
 fi
 
 if test x$enable_autoperf_crayxc = xyes; then
+    abssrcdir=$(readlink -f ${srcdir})
     AC_CHECK_HEADER([papi.h],
                     with_papi=-lpapi,
                     [AC_MSG_ERROR([Cannot find required header for papi])],
                     [])
-    AC_REQUIRE_AUX_FILE([modules/autoperf/crayxc/darshan-apxc-log-format.h])
-dnl    AC_CHECK_FILE([modules/autoperf/crayxc/darshan-apxc-log-format.h],
-dnl                  DARSHAN_USE_APXC=1,
-dnl                  [AC_MSG_ERROR([AutoPerf submodule not initialized])])
-    DARSHAN_USE_APXC=1
+    AC_CHECK_HEADER([${abssrcdir}/../modules/autoperf/crayxc/darshan-apxc-log-format.h],
+                    DARSHAN_USE_APXC=1,
+                    [AC_MSG_ERROR([The autoperf module is not present])],
+                    [-]) # this last part tells it to only check for presence
 fi
 
 if test x$GOT_ALIGNMENT != x1; then


=====================================
darshan-util/configure.in
=====================================
--- a/darshan-util/configure.in
+++ b/darshan-util/configure.in
@@ -86,11 +86,11 @@ AC_ARG_ENABLE(
 )
 
 if test x$enable_autoperf_crayxc = xyes; then
-    AC_REQUIRE_AUX_FILE([modules/autoperf/crayxc/darshan-apxc-log-format.h])
-dnl    AC_CHECK_FILE([modules/autoperf/crayxc/darshan-apxc-log-format.h],
-dnl                  DARSHAN_USE_APXC=1,
-dnl                  [AC_MSG_ERROR([AutoPerf submodule not initialized])])
-    DARSHAN_USE_APXC=1
+    abssrcdir=$(readlink -f ${srcdir})
+    AC_CHECK_HEADER([${abssrcdir}/../modules/autoperf/crayxc/darshan-apxc-log-format.h],
+                    DARSHAN_USE_APXC=1,
+                    [AC_MSG_ERROR([The autoperf module is not present])],
+                    [-]) # this last part tells it to only check for presence
 fi
 
 AC_CHECK_FUNCS([strndup])



View it on GitLab: https://xgitlab.cels.anl.gov/darshan/darshan/commit/9357d7f98b263f60a02bdec1dfec0f45bfa2beee

---
View it on GitLab: https://xgitlab.cels.anl.gov/darshan/darshan/commit/9357d7f98b263f60a02bdec1dfec0f45bfa2beee
You're receiving this email because of your account on xgitlab.cels.anl.gov.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/darshan-commits/attachments/20180313/3534f202/attachment-0001.html>