[Darshan-commits] [Git][darshan/darshan][autoperf-mod] toggle apxc support in utils build too

[Philip Carns]

Philip Carns pushed to branch autoperf-mod at darshan / darshan


Commits:
789461a7 by Phil Carns at 2018-02-22T15:52:08-05:00
toggle apxc support in utils build too

- - - - -


2 changed files:

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


Changes:

=====================================
darshan-util/configure
=====================================
--- a/darshan-util/configure
+++ b/darshan-util/configure
@@ -621,6 +621,7 @@ ac_includes_default="\
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+DARSHAN_USE_APXC
 DARSHAN_UTIL_VERSION
 DARSHAN_ENABLE_SHARED
 __DARSHAN_PDFLATEX_HALT_ON_ERROR
@@ -687,6 +688,7 @@ enable_option_checking
 with_zlib
 with_bzlib
 enable_shared
+enable_autoperf_crayxc
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1318,6 +1320,7 @@ Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-shared   enables building of shared darshan-util library
+  --enable-autoperf-crayxc    Enables compilation and use of the AutoPerf Cray XC module
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -4105,6 +4108,25 @@ fi
 fi
 
 
+# Check whether --enable-autoperf-crayxc was given.
+if test "${enable_autoperf_crayxc+set}" = set; then :
+  enableval=$enable_autoperf_crayxc; enable_autoperf_crayxc=yes
+fi
+
+
+if test x$enable_autoperf_crayxc = xyes; then
+    ac_fn_c_check_header_mongrel "$LINENO" "papi.h" "ac_cv_header_papi_h" "$ac_includes_default"
+if test "x$ac_cv_header_papi_h" = xyes; then :
+  with_papi=-lpapi
+else
+  as_fn_error $? "Cannot find required header for papi" "$LINENO" 5
+fi
+
+
+
+    DARSHAN_USE_APXC=1
+fi
+
 for ac_func in strndup
 do :
   ac_fn_c_check_func "$LINENO" "strndup" "ac_cv_func_strndup"
@@ -4124,6 +4146,7 @@ DARSHAN_UTIL_VERSION="3.1.5"
 
 
 
+
 ac_config_files="$ac_config_files Makefile darshan-job-summary/bin/darshan-job-summary.pl maint/darshan-util.pc"
 
 cat >confcache <<\_ACEOF


=====================================
darshan-util/configure.in
=====================================
--- a/darshan-util/configure.in
+++ b/darshan-util/configure.in
@@ -78,6 +78,25 @@ AC_ARG_ENABLE(shared,
 fi]
 ,)
 
+AC_ARG_ENABLE(
+    [autoperf-crayxc],
+    [  --enable-autoperf-crayxc    Enables compilation and use of the AutoPerf Cray XC module],
+    [enable_autoperf_crayxc=yes],
+    []
+)
+
+if test x$enable_autoperf_crayxc = xyes; then
+    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
+fi
+
 AC_CHECK_FUNCS([strndup])
 
 DARSHAN_UTIL_VERSION="AC_PACKAGE_VERSION"
@@ -87,6 +106,7 @@ AC_SUBST(__DARSHAN_ZLIB_INCLUDE_FLAGS)
 AC_SUBST(__DARSHAN_PDFLATEX_HALT_ON_ERROR)
 AC_SUBST(DARSHAN_ENABLE_SHARED)
 AC_SUBST(DARSHAN_UTIL_VERSION)
+AC_SUBST(DARSHAN_USE_APXC)
 AC_OUTPUT(Makefile
 darshan-job-summary/bin/darshan-job-summary.pl
 maint/darshan-util.pc



View it on GitLab: https://xgitlab.cels.anl.gov/darshan/darshan/commit/789461a79d11b24f5dab3b970815667d643f0efc

---
View it on GitLab: https://xgitlab.cels.anl.gov/darshan/darshan/commit/789461a79d11b24f5dab3b970815667d643f0efc
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/20180222/36f2087b/attachment-0001.html>