Permalink
Browse files

add new flag to make srun on a bgl/p emulated system

  • Loading branch information...
1 parent e8e40c7 commit 2e41b24931c38932a8e6f2861341e20c696482af @dannyauble dannyauble committed Jul 22, 2011
Showing with 12 additions and 3 deletions.
  1. +6 −2 auxdir/x_ac_bluegene.m4
  2. +5 −0 configure.ac
  3. +1 −1 src/Makefile.am
View
@@ -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)
View
@@ -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
View
@@ -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

0 comments on commit 2e41b24

Please sign in to comment.