From bb2e37a28615a7c178b37cfabc57b1ce52dba6f8 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@schedmd.com>
Date: Wed, 14 Aug 2013 11:46:26 -0700
Subject: [PATCH] ALPS - Only use the -ljob with salloc when running on a ALPS
 Cray install.

---
 src/salloc/Makefile.am | 2 ++
 src/salloc/Makefile.in | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/salloc/Makefile.am b/src/salloc/Makefile.am
index 3f795540da8..10faf04a073 100644
--- a/src/salloc/Makefile.am
+++ b/src/salloc/Makefile.am
@@ -14,9 +14,11 @@ convenience_libs = $(top_builddir)/src/api/libslurm.o $(DL_LIBS)
 salloc_LDADD = \
 	$(convenience_libs)
 
+if HAVE_ALPS_CRAY
 if HAVE_REAL_CRAY
   salloc_LDADD += -ljob
 endif
+endif
 
 salloc_LDFLAGS = -export-dynamic $(CMD_LDFLAGS) \
 	$(HWLOC_LDFLAGS) $(HWLOC_LIBS)
diff --git a/src/salloc/Makefile.in b/src/salloc/Makefile.in
index dd01cf9e9d3..26f9666ea95 100644
--- a/src/salloc/Makefile.in
+++ b/src/salloc/Makefile.in
@@ -55,7 +55,7 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 bin_PROGRAMS = salloc$(EXEEXT)
-@HAVE_REAL_CRAY_TRUE@am__append_1 = -ljob
+@HAVE_ALPS_CRAY_TRUE@@HAVE_REAL_CRAY_TRUE@am__append_1 = -ljob
 subdir = src/salloc
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-- 
GitLab