arif/maui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Support new TORQUE pbs-config build system

Browse Source 
git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@52 3f5042e3-fb1d-0410-be18-d6ca2573e517
This commit is contained in:
gstaples 2006-02-28 03:30:24 +00:00
parent 33322aa532
commit 857503f01d
4 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
configure.ac
View File

@ -135,7 +135,11 @@ AC_ARG_WITH(pbs,
[PBSTARGETDIR='FALSE'])
if test "$PBSTARGETDIR" != 'FALSE'; then
if test "$PBSTARGETDIR" = 'yes'; then
PBSTARGETDIR='/usr/local';
if pbs-config --prefix 1>/dev/null 2>&1;then
PBSTARGETDIR=`pbs-config --prefix`
else
PBSTARGETDIR='/usr/local';
fi
fi
if test "$RMTYPE" = ''; then
RMTYPE=PBS
@ -297,21 +301,33 @@ fi
if test "$RMTYPE" = ''; then
AC_MSG_WARN([Resource Manager not specified - attempting build with pbs])
RMTYPE=PBS
AC_SUBST(RMTYPE)
AC_SUBST_FILE(rm_config)
rm_config=include/maui.cfg.dist.inc.rm
AC_MSG_WARN([Resource Manager not specified - attempting build with pbs])
RMTYPE=PBS
AC_SUBST(RMTYPE)
AC_SUBST_FILE(rm_config)
rm_config=include/maui.cfg.dist.inc.rm
if pbs-config --prefix 1>/dev/null 2>&1;then
PBSTARGETDIR=`pbs-config --prefix`
else
PBSTARGETDIR='/usr/local';
fi
if $PBSTARGETDIR/bin/pbs-config --cflags 1>/dev/null 2>&1;then
PBSCFLAGS=`$PBSTARGETDIR/bin/pbs-config --cflags`
else
PBSCFLAGS=-I$PBSTARGETDIR/include
fi
if $PBSTARGETDIR/bin/pbs-config --libs 1>/dev/null 2>&1;then
PBSLDFLAGS=`$PBSTARGETDIR/bin/pbs-config --libs`
else
PBSLDFLAGS="-L$PBSTARGETDIR/lib -lnet -lpbs"
fi
AC_SUBST(PBSCFLAGS)
AC_SUBST(PBSLDFLAGS)
AC_SUBST_FILE(pbs_definitions)
pbs_definitions=include/Makefile.inc.pbs
if test "$OS" = "OSF"; then
PBSLIBS="$PBSTARGETDIR/ilib/libnet.a -lpbs"
else
PBSLIBS="-lnet -lpbs"
fi
AC_SUBST(PBSTARGETDIR)
AC_SUBST(PBSLIBS)
AC_SUBST_FILE(pbs_definitions)
pbs_definitions=include/Makefile.inc.pbs
fi

5
include/Makefile.inc.pbs.in
View File

@ -1,5 +1,4 @@
# PBS Definitions
export PBSDEF = -D__MPBS
export PBSIP = -I@PBSTARGETDIR@/include
export PBSLP = -L@PBSTARGETDIR@/lib
export PBSLIB = @PBSLIBS@
export PBSCFLAGS = @PBSCFLAGS@
export PBSLDFLAGS = @PBSLDFLAGS@

4
src/moab/Makefile
View File

@ -14,8 +14,8 @@
SCHEDIP=-I$(INC) -I$(MSCHED_HOME)/include
SHELL =/bin/sh
LP =-L$(LIB) $(SCHEDLP) $(LLLP) $(PBSLP) $(MXLP) $(REGEXLP)
IP =$(SCHEDIP) $(LLIP) $(PBSIP) $(REGEXIP) $(MXIP)
LP =-L$(LIB) $(SCHEDLP) $(LLLP) $(MXLP) $(REGEXLP) $(PBSLDFLAGS)
IP =$(SCHEDIP) $(LLIP) $(REGEXIP) $(MXIP) $(PBSCFLAGS)
INCS =$(INC)moab.h $(INC)msched.h
DEFS =-D$(OPSYS) $(LLDEF) $(SDRDEF) $(PBSDEF) $(OSDEF) $(MXDEF) $(REGEXDEF) \
$(SECDEF) $(RMSDEF) $(THREADDEF)

6
src/server/Makefile
View File

@ -14,8 +14,8 @@
SCHEDIP=-I$(INC) -I$(TOP)/include
SHELL =/bin/sh
LP =-L$(LIB) $(SCHEDLP) $(LLLP) $(PBSLP) $(MXLP) $(REGEXLP)
IP =$(SCHEDIP) $(LLIP) $(PBSIP) $(SGEIP) $(REGEXIP) $(MXIP)
LP =-L$(LIB) $(SCHEDLP) $(LLLP) $(MXLP) $(REGEXLP) $(PBSLDFLAGS)
IP =$(SCHEDIP) $(LLIP) $(SGEIP) $(REGEXIP) $(MXIP) $(PBSCFLAGS)
INCS =$(INC)moab.h $(INC)msched-proto.h $(INC)msched-common.h
DEFS =-D$(OPSYS) $(LLDEF) $(SDRDEF) $(PBSDEF) $(OSDEF) $(MXDEF) \
$(REGEXDEF) $(RMSDEF) $(SECDEF) $(THREADDEF)
@ -26,7 +26,7 @@ COMLIB =mcom
MBINS =$(SERVER) mclient mprof
LIBS =-l$(SCHEDLIB) -l$(COMLIB) $(THREADLIB) $(MXLIB) $(LLLIB) $(SDRLIB) \
$(PBSLIB) $(REGEXLIB) $(SECLIB) -lm
$(REGEXLIB) $(SECLIB) -lm
MCLIENTS =canceljob changeparam checkjob checknode diagnose releasehold \
releaseres resetstats runjob schedctl sethold setqos setres setspri \