explicit setting --with-ldms automaticall sets --enable-ldms-mod

Author: wkliao

darshan-runtime/configure.ac

@@ -603,13 +603,38 @@ if test "x$enable_darshan_runtime" = xyes ; then
          [], [AC_MSG_ERROR([mdhim requested but headers cannot be found])])
    fi
 
+   # inform about LDMS installs not found in default locations
+   AC_ARG_WITH([ldms],
+      [AS_HELP_STRING([--with-ldms@<:@=DIR@:>@],
+                      [Installation directory for LDMS.])]
+   )
+
    # LDMS support (disabled by default)
    AC_ARG_ENABLE([ldms-mod],
       [AS_HELP_STRING([--enable-ldms-mod],
-                      [Include LDMS for runtime I/O monitoring])],
-      [], [enable_ldms_mod=no]
+                      [Include LDMS for runtime I/O monitoring])]
    )
+
+   # When --with-ldms is set, we automatically enable enable_ldms_mod
+   if test "x$enable_ldms_mod" = x ; then
+      if test "x$with_ldms" != x ; then
+         enable_ldms_mod=yes
+      else
+         enable_ldms_mod=no
+      fi
+   fi
+
    if test "x$enable_ldms_mod" = xyes ; then
+      if test -d "$with_ldms"; then
+         LDMS_HOME="$with_ldms"
+         LDFLAGS="$LDFLAGS -L${LDMS_HOME}/lib -Wl,-rpath=${LDMS_HOME}/lib"
+         CPPFLAGS="$CPPFLAGS -I${LDMS_HOME}/include"
+         __DARSHAN_LDMS_LINK_FLAGS="-L${LDMS_HOME}/lib"
+         __DARSHAN_LDMS_INCLUDE_FLAGS="-I${LDMS_HOME}/include"
+      else
+         AC_MSG_ERROR([LDMS installation path, $with_ldms, is not found])
+      fi
+
       CHECK_LDMS
    fi
 

darshan-runtime/doc/darshan-runtime.rst

@@ -209,8 +209,10 @@ Compilation
   installation directory for LDMS
 
   .. note::
-     * Users must use the configuration flags ``--enable-ldms-mod`` and
-       ``--with-ldms=DIR`` to enable runtime data collection via LDMS.
+     * When ``--with-ldms=DIR`` is set, building LDMS module is automatically
+       enabled.
+     * When ``--enable-ldms-mod`` is set but not ``--with-ldms=DIR``, Darshan
+       will search for the LDMS installation location available on the system.
      * To collect runtime I/O information from Darshan, you will need to
        configure, initialize, and connect to an LDMS streams daemon. For
        detailed instructions please visit

maint/config/check_ldms.m4

@@ -1,18 +1,5 @@
 AC_DEFUN([CHECK_LDMS],
 [
-AC_ARG_WITH([ldms],
-[  --with-ldms=DIR         Root directory path of LDMS installation (defaults to
-                          to /usr/local or /usr if not found in /usr/local)],
-[if test -d "$withval"; then
-        LDMS_HOME="$withval"
-        LDFLAGS="$LDFLAGS -L${LDMS_HOME}/lib -Wl,-rpath=${LDMS_HOME}/lib"
-        CPPFLAGS="$CPPFLAGS -I${LDMS_HOME}/include"
-        __DARSHAN_LDMS_LINK_FLAGS="-L${LDMS_HOME}/lib"
-        __DARSHAN_LDMS_INCLUDE_FLAGS="-I${LDMS_HOME}/include"
-    else
-        AC_MSG_ERROR([LDMS installation path is required])
-fi])
-
 AC_CHECK_HEADERS([ldms/ldms.h ldms/ldmsd_stream.h ovis_json/ovis_json.h ovis_util/util.h],
         [ldms_found_stream_headers=yes],
         [AC_MSG_ERROR([One or more LDMS headers not found. Please check installation path or LDMS version > 4.3.4])])