From 1ccc310d8515b461f140e3d7216f2511290e9ddb Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Mon, 1 Nov 2004 21:57:21 +0000
Subject: [PATCH] Minor change in BGL build/Makefile setup.
---
auxdir/x_ac_bgl.m4 | 17 +++++++++--------
src/plugins/select/bluegene/Makefile.am | 4 ++--
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/auxdir/x_ac_bgl.m4 b/auxdir/x_ac_bgl.m4
index 077fd295800..d9d662507eb 100644
--- a/auxdir/x_ac_bgl.m4
+++ b/auxdir/x_ac_bgl.m4
@@ -14,9 +14,6 @@
AC_DEFUN([X_AC_BGL],
[
- AC_SUBST(BGL_AR_LOC)
- AC_SUBST(BGL_HDR_LOC)
-
bgl_default_dirs="/usr /usr/local /bgl /bgl/bglsched"
for bgl_dir in $bgl_default_dirs; do
@@ -28,27 +25,31 @@ AC_DEFUN([X_AC_BGL],
# Search for "bglbridge.a" in the directory
if test -z "$have_bgl_ar" -a -f "$bgl_dir/bglbridge.a" ; then
have_bgl_ar=yes
- BGL_AR_LOC="$bgl_dir"
+ BGL_LDFLAGS="-L$bgl_dir"
fi
if test -z "$have_bgl_ar" -a -f "$bgl_dir/lib/bglbridge.a" ; then
have_bgl_ar=yes
- BGL_AR_LOC="$bgl_dir/lib"
+ BGL_LDFLAGS="-L$bgl_dir/lib"
fi
# Search for "rm_api.h" in the directory
if test -z "$have_bgl_hdr" -a -f "$bgl_dir/rm_api.h" ; then
have_bgl_hdr=yes
- BGL_HDR_LOC="$bgl_dir"
+ BGL_INCLUDES="-I$bgl_dir"
fi
if test -z "$have_bgl_hdr" -a -f "$bgl_dir/include/rm_api.h" ; then
have_bgl_hdr=yes
- BGL_HDR_LOC="$bgl_dir/include"
+ BGL_INCLUDES="-I$bgl_dir/include"
fi
done
+ AC_SUBST(BGL_LDFLAGS)
+ AC_SUBST(BGL_INCLUDES)
+
if test ! -z "$have_bgl_ar" -a ! -z "$have_bgl_hdr" ; then
ac_with_readline="no"
- AC_DEFINE(HAVE_BGL, 1, [Define to 1 if running on Blue Gene L system])
+ AC_DEFINE(HAVE_BGL, 1, [Define to 1 if emulating or running on Blue Gene system])
+ AC_DEFINE(HAVE_BGL_FILES, 1, [Define to 1 if have Blue Gene files])
AC_DEFINE(HAVE_FRONT_END, 1, [Define to 1 if running slurmd on front-end only])
fi
])
diff --git a/src/plugins/select/bluegene/Makefile.am b/src/plugins/select/bluegene/Makefile.am
index 8482742ef27..7c38b64bc36 100644
--- a/src/plugins/select/bluegene/Makefile.am
+++ b/src/plugins/select/bluegene/Makefile.am
@@ -6,7 +6,7 @@ AUTOMAKE_OPTIONS = foreign
PLUGIN_FLAGS = -module -avoid-version --export-dynamic -lm
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common $(BGL_INCLUDES)
pkglib_LTLIBRARIES = select_bluegene.la
@@ -14,7 +14,7 @@ pkglib_LTLIBRARIES = select_bluegene.la
select_bluegene_la_SOURCES = select_bluegene.c \
bluegene.c bluegene.h \
partition_sys.c partition_sys.h
-select_bluegene_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
+select_bluegene_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) $(BGL_LDFLAGS)
if HAVE_AIX
select_bluegene_la_LIBADD = $(top_builddir)/src/common/libcommon.la
--
GitLab