Support TORQUE-2.1's build system

git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@54 3f5042e3-fb1d-0410-be18-d6ca2573e517
This commit is contained in:
gstaples 2006-05-11 21:07:41 +00:00
parent 4de3c43fa5
commit b6a1fae222
2 changed files with 40 additions and 22 deletions

58
configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.57 for maui 3.2p14.
# Generated by GNU Autoconf 2.57 for maui 3.2.6p15.
#
# Report bugs to <help@supercluster.org>.
#
@ -268,8 +268,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='maui'
PACKAGE_TARNAME='maui'
PACKAGE_VERSION='3.2.6p14'
PACKAGE_STRING='maui 3.2.6p14'
PACKAGE_VERSION='3.2.6p15'
PACKAGE_STRING='maui 3.2.6p15'
PACKAGE_BUGREPORT='help@supercluster.org'
ac_unique_file="src/mcom/MConst.c"
@ -311,7 +311,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT LN_S SPOOLDIR MACHINE SEED OPSYS OS HOSTNAME USER BUILDDATE BUILDDIR RMTYPE LLDIR LLDEF PBSTARGETDIR PBSLIBS SGEBUILDDIR SGEOSDIR LSFDIR LSFLIBS LSFDEFS RMPORT RMHOST RMSOCKETPROTOCOL RMWIREPROTOCOL RMVERSION RMNMPORT RMNMSERVER AMTYPE AMHOST AMPORT AMSOCKETPROTOCOL AMWIREPROTOCOL AMOTHER PCREDIR CPP EGREP LIBOBJS POW_LIB LTLIBOBJS'
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT LN_S SPOOLDIR MACHINE SEED OPSYS OS HOSTNAME USER BUILDDATE BUILDDIR RMTYPE LLDIR LLDEF PBSTARGETDIR PBSLIBS SGEBUILDDIR SGEOSDIR LSFDIR LSFLIBS LSFDEFS PBSCFLAGS PBSLDFLAGS RMPORT RMHOST RMSOCKETPROTOCOL RMWIREPROTOCOL RMVERSION RMNMPORT RMNMSERVER AMTYPE AMHOST AMPORT AMSOCKETPROTOCOL AMWIREPROTOCOL AMOTHER PCREDIR CPP EGREP LIBOBJS POW_LIB LTLIBOBJS'
ac_subst_files='rm_config ll_definitions sdr_definitions pbs_definitions sge_definitions lsf_definitions mx_definitions pcre_definitions'
# Initialize some variables set by options.
@ -780,7 +780,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures maui 3.2p8 to adapt to many kinds of systems.
\`configure' configures maui 3.2.6p15 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -837,7 +837,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of maui 3.2p8:";;
short | recursive ) echo "Configuration of maui 3.2.6p15:";;
esac
cat <<\_ACEOF
@ -938,7 +938,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
maui configure 3.2p8
maui configure 3.2.6p15
generated by GNU Autoconf 2.57
Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
@ -953,7 +953,7 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by maui $as_me 3.2p8, which was
It was created by maui $as_me 3.2.6p15, which was
generated by GNU Autoconf 2.57. Invocation command line was
$ $0 $@
@ -2335,7 +2335,11 @@ else
fi;
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
@ -2535,22 +2539,34 @@ fi
if test "$RMTYPE" = ''; then
{ echo "$as_me:$LINENO: WARNING: Resource Manager not specified - attempting build with pbs" >&5
{ echo "$as_me:$LINENO: WARNING: Resource Manager not specified - attempting build with pbs" >&5
echo "$as_me: WARNING: Resource Manager not specified - attempting build with pbs" >&2;}
RMTYPE=PBS
RMTYPE=PBS
rm_config=include/maui.cfg.dist.inc.rm
rm_config=include/maui.cfg.dist.inc.rm
if test "$OS" = "OSF"; then
PBSLIBS="$PBSTARGETDIR/ilib/libnet.a -lpbs"
else
PBSLIBS="-lnet -lpbs"
fi
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
pbs_definitions=include/Makefile.inc.pbs
pbs_definitions=include/Makefile.inc.pbs
fi
@ -6902,7 +6918,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
This file was extended by maui $as_me 3.2p8, which was
This file was extended by maui $as_me 3.2.6p15, which was
generated by GNU Autoconf 2.57. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -6957,7 +6973,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
maui config.status 3.2p8
maui config.status 3.2.6p15
configured by $0, generated by GNU Autoconf 2.57,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@ -7184,6 +7200,8 @@ s,@SGEOSDIR@,$SGEOSDIR,;t t
s,@LSFDIR@,$LSFDIR,;t t
s,@LSFLIBS@,$LSFLIBS,;t t
s,@LSFDEFS@,$LSFDEFS,;t t
s,@PBSCFLAGS@,$PBSCFLAGS,;t t
s,@PBSLDFLAGS@,$PBSLDFLAGS,;t t
s,@RMPORT@,$RMPORT,;t t
s,@RMHOST@,$RMHOST,;t t
s,@RMSOCKETPROTOCOL@,$RMSOCKETPROTOCOL,;t t

View File

@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.57)
AC_INIT(maui, 3.2p8, help@supercluster.org)
AC_INIT(maui, 3.2.6p15, help@supercluster.org)
AC_CONFIG_SRCDIR([src/mcom/MConst.c])
#AC_CONFIG_HEADER([config.h])
@ -388,7 +388,7 @@ if test "$USEGOLD" != 'FALSE'; then
AC_MSG_ERROR([Only one Allocation Manager can be specified (GOLD, $AMTYPE)])
fi
AMTYPE=SSS
AMTYPE=GOLD
AMHOST=" HOST=$HOSTNAME"
AMPORT=" PORT=7112"
AMSOCKETPROTOCOL=" SOCKETPROTOCOL=HTTP"