[Darshan-commits] [Darshan] branch, dev-modular, updated. darshan-2.3.1-171-g10068d0

[Service Account]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".

The branch, dev-modular has been updated
       via  10068d0076c8e93783ca2ebffcdd7725c4b4ce51 (commit)
      from  efd4d7e7bba6578d0d53e678dcceb8649cd038c9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 10068d0076c8e93783ca2ebffcdd7725c4b4ce51
Author: Shane Snyder <snyder at cetuslac1.fst.alcf.anl.gov>
Date:   Wed Sep 9 22:42:52 2015 +0000

    only build bgq module if config check passes

-----------------------------------------------------------------------

Summary of changes:
 darshan-runtime/Makefile.in  |   16 +++++++++++-----
 darshan-runtime/configure    |    2 ++
 darshan-runtime/configure.in |    2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)


Diff of changes:
diff --git a/darshan-runtime/Makefile.in b/darshan-runtime/Makefile.in
index 1acfa95..85dbffb 100644
--- a/darshan-runtime/Makefile.in
+++ b/darshan-runtime/Makefile.in
@@ -15,6 +15,7 @@ CC = @CC@
 LD = @LD@
 
 DISABLE_LDPRELOAD = @DISABLE_LDPRELOAD@
+DARSHAN_USE_BGQ = @DARSHAN_USE_BGQ@
 DARSHAN_LOG_FORMAT = $(srcdir)/../darshan-log-format.h
 DARSHAN_VERSION = @DARSHAN_VERSION@
 
@@ -22,6 +23,14 @@ ifndef DISABLE_LDPRELOAD
 all: lib/libdarshan.so lib/darshan-null.po
 endif
 
+static-mod-objs = lib/darshan-posix.o lib/darshan-mpiio.o lib/darshan-hdf5.o lib/darshan-pnetcdf.o
+dynamic-mod-objs = lib/darshan-posix.po lib/darshan-mpiio.po lib/darshan-hdf5.po lib/darshan-pnetcdf.po
+
+ifdef DARSHAN_USE_BGQ
+static-mod-objs += lib/darshan-bgq.o
+dynamic-mod-objs += lib/darshan-bgq.po
+endif
+
 VPATH = $(srcdir)
 
 CFLAGS = -DDARSHAN_CONFIG_H=\"darshan-runtime-config.h\" -I . -I ../ -I $(srcdir) -I$(srcdir)/../ @CFLAGS@ @CPPFLAGS@ -D_LARGEFILE64_SOURCE 
@@ -69,9 +78,6 @@ lib/darshan-mpiio.o: lib/darshan-mpiio.c darshan.h $(DARSHAN_LOG_FORMAT) $(srcdi
 lib/darshan-mpiio.po: lib/darshan-mpiio.c darshan.h $(DARSHAN_LOG_FORMAT) $(srcdir)/../darshan-mpiio-log-format.h | lib
 	$(CC) $(CFLAGS_SHARED) -c $< -o $@
 
-#
-# BG/Q module
-#
 lib/darshan-bgq.o: lib/darshan-bgq.c darshan.h $(DARSHAN_LOG_FORMAT) $(srcdir)/../darshan-mpiio-log-format.h | lib
 	$(CC) $(CFLAGS) -c $< -o $@
 
@@ -108,10 +114,10 @@ lib/lookup8.o: lib/lookup8.c
 lib/lookup8.po: lib/lookup8.c
 	$(CC) $(CFLAGS_SHARED) -c $< -o $@
 
-lib/libdarshan.a: lib/darshan-core-init-finalize.o lib/darshan-core.o lib/darshan-common.o lib/darshan-posix.o lib/darshan-mpiio.o lib/darshan-hdf5.o lib/darshan-pnetcdf.o lib/darshan-bgq.o lib/lookup3.o lib/lookup8.o
+lib/libdarshan.a: lib/darshan-core-init-finalize.o lib/darshan-core.o lib/darshan-common.o $(static-mod-objs) lib/lookup3.o lib/lookup8.o
 	ar rcs $@ $^
 
-lib/libdarshan.so: lib/darshan-core-init-finalize.po lib/darshan-core.po lib/darshan-common.po lib/darshan-posix.po lib/darshan-mpiio.po lib/darshan-pnetcdf.po lib/darshan-bgq.po lib/lookup3.po lib/lookup8.po
+lib/libdarshan.so: lib/darshan-core-init-finalize.po lib/darshan-core.po lib/darshan-common.po $(dynamic-mod-objs) lib/lookup3.po lib/lookup8.po
 	$(CC) $(CFLAGS_SHARED) $(LDFLAGS) -o $@ $^ -lpthread -lrt -lz -ldl
 
 lib/libdarshan-stubs.a: lib/darshan-hdf5-stubs.o lib/darshan-pnetcdf-stubs.o
diff --git a/darshan-runtime/configure b/darshan-runtime/configure
index 0abf264..9e206a3 100755
--- a/darshan-runtime/configure
+++ b/darshan-runtime/configure
@@ -621,6 +621,7 @@ ac_includes_default="\
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+DARSHAN_USE_BGQ
 MPICH_LIB_OLD
 DARSHAN_VERSION
 DISABLE_LDPRELOAD
@@ -4299,6 +4300,7 @@ DARSHAN_VERSION="3.0.0-pre1"
 
 
 
+
 ac_config_files="$ac_config_files Makefile darshan-mk-log-dirs.pl darshan-gen-cc.pl darshan-gen-cxx.pl darshan-gen-fortran.pl darshan-base-ld-opts darshan-config share/craype-1.x/darshan-module share/craype-2.x/darshan-module lib/pkgconfig/darshan-runtime.pc share/mpi-profile/darshan-cc.conf share/mpi-profile/darshan-cxx.conf share/mpi-profile/darshan-f.conf share/mpi-profile/darshan-bg-cc.conf share/mpi-profile/darshan-bg-cxx.conf share/mpi-profile/darshan-bg-f.conf"
 
 cat >confcache <<\_ACEOF
diff --git a/darshan-runtime/configure.in b/darshan-runtime/configure.in
index 33fc4c0..210c5db 100644
--- a/darshan-runtime/configure.in
+++ b/darshan-runtime/configure.in
@@ -283,7 +283,7 @@ AS_IF([$CC -show foo.c -o foo |grep lmpich >& /dev/null],
     AC_MSG_RESULT(no)
     MPICH_LIB_OLD=0)
 
-# check to see if the bgq instrumentation module should be built
+# check to see whether the bgq instrumentation module should be built
 AC_ARG_ENABLE(
     [bgq_mod],
     [  --disable-bgq-mod       Disables compilation and use of BG/Q module (for BG/Q systems)],


hooks/post-receive
--