Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes to configure tests and add disable options #1362

Closed
wants to merge 1 commit into from
Closed

Fixes to configure tests and add disable options #1362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,6 +414,7 @@ AS_IF([test "x$enable_papi" != xno],[
])
AM_CONDITIONAL([HAVE_LIBPAPI], [test "x$HAVE_LIBPAPI" = xyes])
AM_CONDITIONAL([HAVE_LIBPFM], [test "x$HAVE_LIBPFM" = xyes])
AM_CONDITIONAL([ENABLE_PAPI], [test "x$enable_papi" != no -a "x$HAVE_LIBPAPI" = xyes -a "x$HAVE_LIBPFM" = xyes])

AC_LIB_HAVE_LINKFLAGS([ibmad], [], [#include <infiniband/mad.h>])
AM_CONDITIONAL([HAVE_LIBIBMAD], [test "x$HAVE_LIBIBMAD" = xyes])
Expand Down Expand Up @@ -451,8 +452,7 @@ AC_ARG_ENABLE([ibnet],
[],
[enable_ibnet="check"])
AM_CONDITIONAL([ENABLE_IBNET], [test "x$enable_ibnet" != xno])
AS_IF([test "$enable_ibnet" = xyes],[
AC_MSG_NOTICE([Disable ibnet module NOT requested])
AS_IF([test "x$enable_ibnet" = xyes],[
AS_IF([test "x$HAVE_LIBIBMAD" = xno],
[AC_MSG_ERROR([ibnet required libibmad or <infiniband/mad.h> not found])])
AS_IF([test "x$HAVE_LIBIBUMAD" = xno],
Expand Down Expand Up @@ -635,7 +635,7 @@ AC_ARG_WITH([slurm],
[with_slurm=check])
have_slurm=no
AC_SUBST([SLURM_CFLAGS])
AS_IF([test "x$with_slurm" != no],[
AS_IF([test "x$with_slurm" != xno],[
save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $SLURM_CFLAGS"
AC_CHECK_HEADER([slurm/spank.h], [have_slurm=yes], [have_slurm=no])
Expand All @@ -648,6 +648,8 @@ AS_IF([test "x$with_slurm" != no],[
])
AM_CONDITIONAL([HAVE_SLURM], [test "x$have_slurm" = xyes])

OPTION_DEFAULT_ENABLE([spank_subscriber], [ENABLE_SPANK_SUBSCRIBER], [Builds sampler that subscribes to spank plugin])

AC_CHECK_HEADER([linux/netlink.h], [have_netlink=yes], [have_netlink=no])
AM_CONDITIONAL([HAVE_NETLINK], [test "x$have_netlink" = xyes])

Expand Down
3 changes: 1 addition & 2 deletions ldms/src/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@ SUBDIRS += third-plugins
SUBDIRS += core
SUBDIRS += ldmsd

SUBDIRS += decomp

if ENABLE_OVIS_AUTH
SUBDIRS += auth
endif

if ENABLE_STORE
SUBDIRS += decomp
SUBDIRS += store
endif

Expand Down
8 changes: 8 additions & 0 deletions ldms/src/sampler/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,14 @@ ldmssamplerincludedir = $(includedir)/ldms/sampler
ldmssamplerinclude_HEADERS = sampler_base.h

SUBDIRS += netlink

if ENABLE_LUSTRE
SUBDIRS += lustre_client
SUBDIRS += lustre_mdt
SUBDIRS += lustre_ost
SUBDIRS += lustre_mdc
endif

SUBDIRS += json

if HAVE_DCGM
Expand Down Expand Up @@ -112,8 +116,10 @@ SUBDIRS += job_info_slurm
SUBDIRS += spank
endif

if ENABLE_SPANK_SUBSCRIBER
# This slurm sampler does not have a slurm build dependency
SUBDIRS += slurm
endif

if ENABLE_LUSTRE
SUBDIRS += lustre
Expand Down Expand Up @@ -181,6 +187,7 @@ if ENABLE_MPI_SAMPLER
SUBDIRS += shm
endif

if ENABLE_PAPI
if HAVE_LIBPAPI
SUBDIRS += papi

Expand All @@ -190,6 +197,7 @@ SUBDIRS += rapl
SUBDIRS += hweventpapi
endif

endif
endif

if ENABLE_PROCDISKSTATS
Expand Down
Loading