From 2767fab3cf3e46e3641d9be11a51069b7ad76fc3 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Fri, 5 Nov 2004 00:07:02 +0000
Subject: [PATCH] Modify the BGL m4 script to avoid using the API or HEADER on
Front-end-node, the static libraries will not function.
---
auxdir/x_ac_bgl.m4 | 29 +++++++++++++++++++++--------
1 file changed, 21 insertions(+), 8 deletions(-)
diff --git a/auxdir/x_ac_bgl.m4 b/auxdir/x_ac_bgl.m4
index a05f5fc6a4c..f61a0c681a2 100644
--- a/auxdir/x_ac_bgl.m4
+++ b/auxdir/x_ac_bgl.m4
@@ -33,30 +33,43 @@ AC_DEFUN([X_AC_BGL],
fi
have_bgl_ar=yes
- BGL_LDFLAGS="$BGL_LDFLAGS -Wl,-rpath $bgl_dir/lib -Wl,-L$bgl_dir/lib -Wl,-whole-archive -Wl,-lbglbridge -Wl,-no-whole-archive $bgl_dir/lib/bglbootload.a $bgl_dir/lib/bglsp440supt.a -lbgldb -lbglmachine -ltableapi -lexpat -lbglsp"
+ bgl_ldflags="$bgl_ldflags -Wl,-rpath $bgl_dir/lib -Wl,-L$bgl_dir/lib -Wl,-whole-archive -Wl,-lbglbridge -Wl,-no-whole-archive $bgl_dir/lib/bglbootload.a $bgl_dir/lib/bglsp440supt.a -lbgldb -lbglmachine -ltableapi -lexpat -lbglsp"
fi
# Search for required DB2 library in the directory
if test -z "$have_db2" -a -f "$bgl_dir/lib/libdb2.so" ; then
have_db2=yes
- BGL_LDFLAGS="$BGL_LDFLAGS -Wl,-rpath $bgl_dir/lib -L$bgl_dir/lib -ldb2"
+ bgl_ldflags="$bgl_ldflags -Wl,-rpath $bgl_dir/lib -L$bgl_dir/lib -ldb2"
fi
# Search for headers in the directory
if test -z "$have_bgl_hdr" -a -f "$bgl_dir/include/rm_api.h" ; then
have_bgl_hdr=yes
- BGL_INCLUDES="-I$bgl_dir/include"
+ bgl_includes="-I$bgl_dir/include"
fi
done
- AC_SUBST(BGL_INCLUDES)
- AC_SUBST(BGL_LDFLAGS)
-
if test ! -z "$have_bgl_ar" -a ! -z "$have_bgl_hdr" -a ! -z "$have_db2" ; then
+ AC_DEFINE(HAVE_BGL, 1, [Define to 1 if emulating or running on Blue Gene s
+ystem])
+ AC_DEFINE(HAVE_FRONT_END, 1, [Define to 1 if running slurmd on front-end o
+nly])
ac_with_readline="no"
- AC_DEFINE(HAVE_BGL, 1, [Define to 1 if emulating or running on Blue Gene system])
+ saved_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$saved_LDFLAGS $bgl_ldflags"
+ AC_TRY_LINK(
+ [ int rm_set_serial(char *); ],
+ [ rm_set_serial(""); ],
+ have_bgl_files=yes, [])
+ LDFLAGS="$saved_LDFLAGS"
+ fi
+ if test ! -z "$have_bgl_files" ; then
+ BGL_INCLUDES="$bgl_includes"
+ BGL_LDFLAGS="$bgl_ldflags"
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
+
+ AC_SUBST(BGL_INCLUDES)
+ AC_SUBST(BGL_LDFLAGS)
])
--
GitLab