Merge pull request #529 from sstsimulator/bjmoor/arielLib

Automatically Merged using develautotester.py

config/sst_check_shm.m4

@@ -0,0 +1,24 @@
+
+AC_DEFUN([SST_CHECK_SHM], [
+
+  sst_check_shm_happy="yes"
+
+  CPPFLAGS_saved="$CPPFLAGS"
+  LDFLAGS_saved="$LDFLAGS"
+  LIBS_saved="$LIBS"
+
+  AC_LANG_PUSH(C)
+  AC_SEARCH_LIBS([shm_open], [rt], [SHM_LIB="$LIBS"], [sst_check_shm_happy="no"])
+  AC_LANG_POP(C)
+
+  CPPFLAGS="$CPPFLAGS_saved"
+  LDFLAGS="$LDFLAGS_saved"
+  LIBS="$LIBS_saved"
+
+  AC_SUBST([SHM_LIB])
+  AM_CONDITIONAL([HAVE_SHM], [test "$sst_check_shm_happy" = "yes"])
+  AS_IF([test "$sst_check_shm_happy" = "yes"],
+        [AC_DEFINE([HAVE_SHM], [1], [Set to 1 if SHM was found])])
+
+  AS_IF([test "$sst_check_shm_happy" = "yes"], [$1], [$2])
+])

src/sst/elements/ariel/Makefile.am

@@ -51,6 +51,7 @@ EXTRA_DIST = \
 	frontend/simple/examples/stream/stream.c
 
 libariel_la_LDFLAGS = -module -avoid-version
+libariel_la_LIBADD = $(SHM_LIB)
 libariel_la_CPPFLAGS = \
 	-DARIEL_TRACE_LIB=$(libdir)/sst \
         -DARIEL_TOOL_DIR="$(libexecdir)" \

src/sst/elements/ariel/configure.m4

@@ -5,6 +5,7 @@ AC_DEFUN([SST_ariel_CONFIG], [
 
   SST_CHECK_PINTOOL([have_pin=1],[have_pin=0],[AC_MSG_ERROR([PIN was requested but not found])])
   SST_CHECK_PTRACE_SET_TRACER()
+  SST_CHECK_SHM()
 
   AS_IF( [test "$have_pin" = 1], [sst_check_ariel="yes"], [sst_check_ariel="no"] )
   AS_IF([test "$sst_check_ariel" = "yes"], [$1], [$2])

src/sst/elements/prospero/Makefile.am

@@ -38,9 +38,10 @@ EXTRA_DIST = \
         tracetool/api/prospero.h
 
 libprospero_la_LDFLAGS = -module -avoid-version
+libprospero_la_LIBADD = $(SHM_LIB)
 
 if USE_LIBZ
-libprospero_la_LIBADD = -lz
+libprospero_la_LIBADD += -lz
 
 libprospero_la_SOURCES += \
 	prosbingzreader.h \

src/sst/elements/prospero/configure.m4

@@ -6,6 +6,7 @@ AC_DEFUN([SST_prospero_CONFIG], [
 
   SST_CHECK_LIBZ()
   SST_CHECK_PINTOOL([have_pin=1],[have_pin=0],[])
+  SST_CHECK_SHM()
 
   AS_IF([test "$prospero_happy" = "yes"], [$1], [$2])
 ])