From 2e41b24931c38932a8e6f2861341e20c696482af Mon Sep 17 00:00:00 2001
From: Danny Auble <da@schedmd.com>
Date: Fri, 22 Jul 2011 13:06:18 -0700
Subject: [PATCH] add new flag to make srun on a bgl/p emulated system
---
auxdir/x_ac_bluegene.m4 | 8 ++++++--
configure.ac | 5 +++++
src/Makefile.am | 2 +-
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/auxdir/x_ac_bluegene.m4 b/auxdir/x_ac_bluegene.m4
index d5fae34fe36..c85e61d8d28 100644
--- a/auxdir/x_ac_bluegene.m4
+++ b/auxdir/x_ac_bluegene.m4
@@ -15,6 +15,7 @@
AC_DEFUN([X_AC_BGL],
[
+ ac_real_bluegene_loaded=no
ac_bluegene_loaded=no
AC_ARG_WITH(db2-dir, AS_HELP_STRING(--with-db2-dir=PATH,Specify path to parent directory of DB2 library), [ trydb2dir=$withval ])
@@ -109,6 +110,7 @@ AC_DEFUN([X_AC_BGL],
AC_DEFINE_UNQUOTED(BG_SERIAL, "$bg_serial", [Define the BG_SERIAL value])
#define ac_bluegene_loaded so we don't load another bluegene conf
ac_bluegene_loaded=yes
+ ac_real_bluegene_loaded=yes
fi
AC_SUBST(BG_INCLUDES)
@@ -193,7 +195,8 @@ AC_DEFUN([X_AC_BGP],
AC_DEFINE_UNQUOTED(BG_SERIAL, "$bg_serial", [Define the BG_SERIAL value])
#define ac_bluegene_loaded so we don't load another bluegene conf
ac_bluegene_loaded=yes
- fi
+ ac_real_bluegene_loaded=yes
+ fi
AC_SUBST(BG_INCLUDES)
])
@@ -297,8 +300,9 @@ AC_DEFUN([X_AC_BGQ],
# AC_DEFINE_UNQUOTED(BG_SERIAL, "$bg_serial", [Define the BG_SERIAL value])
#define ac_bluegene_loaded so we don't load another bluegene conf
ac_bluegene_loaded=yes
+ ac_real_bluegene_loaded=yes
ac_bgq_loaded=yes
- fi
+ fi
AC_SUBST(BG_INCLUDES)
AC_SUBST(BG_LDFLAGS)
diff --git a/configure.ac b/configure.ac
index fed68cfe464..590ee3f4e59 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,6 +39,11 @@ dnl so handle it later.
AM_CONDITIONAL(BG_L_P_LOADED, test "x$ac_bluegene_loaded" = "xyes")
AC_SUBST(BG_L_P_LOADED)
+dnl ok now check if We are on a real L or P system, (test if to build srun
+dnl or not. If we are emulating things we should build it.
+AM_CONDITIONAL(REAL_BG_L_P_LOADED, test "x$ac_real_bluegene_loaded" = "xyes")
+AC_SUBST(REAL_BG_L_P_LOADED)
+
X_AC_BGQ
dnl We need to know if this is a Q system
diff --git a/src/Makefile.am b/src/Makefile.am
index 021e4d19025..f9c8dcc04b9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS = common api db_api database \
sshare sprio
if !BUILD_SRUN2APRUN
-if !BG_L_P_LOADED
+if !REAL_BG_L_P_LOADED
SUBDIRS += srun
endif
endif
--
GitLab