Fix searching for pbs-config and bump version
git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@61 3f5042e3-fb1d-0410-be18-d6ca2573e517
This commit is contained in:
gstaples
parent
a5491764e3
commit
b910ca92cd
49
configure
vendored
49
configure
vendored
@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.57 for maui 3.2.6p16.
|
||||
# Generated by GNU Autoconf 2.57 for maui 3.2.6p17.
|
||||
#
|
||||
# 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.6p16'
|
||||
PACKAGE_STRING='maui 3.2.6p16'
|
||||
PACKAGE_VERSION='3.2.6p17'
|
||||
PACKAGE_STRING='maui 3.2.6p17'
|
||||
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 PBSCFLAGS PBSLDFLAGS 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 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.2.6p16 to adapt to many kinds of systems.
|
||||
\`configure' configures maui 3.2.6p17 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.2.6p16:";;
|
||||
short | recursive ) echo "Configuration of maui 3.2.6p17:";;
|
||||
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.2.6p16
|
||||
maui configure 3.2.6p17
|
||||
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.2.6p16, which was
|
||||
It was created by maui $as_me 3.2.6p17, which was
|
||||
generated by GNU Autoconf 2.57. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
@ -2340,6 +2340,16 @@ if test "$PBSTARGETDIR" != 'FALSE'; then
|
||||
else
|
||||
PBSTARGETDIR='/usr/local';
|
||||
fi
|
||||
elif test -f "$PBSTARGETDIR/bin/pbs-config"; then
|
||||
PBSTARGETDIR=`$PBSTARGETDIR/bin/pbs-config --prefix`
|
||||
elif test -f "$PBSTARGETDIR/../bin/pbs-config"; then
|
||||
PBSTARGETDIR=`$PBSTARGETDIR/../bin/pbs-config --prefix`
|
||||
elif test -f "$PBSTARGETDIR/pbs-config"; then
|
||||
PBSTARGETDIR=`$PBSTARGETDIR/pbs-config --prefix`
|
||||
elif test -f "$PBSTARGETDIR"; then
|
||||
PBSTARGETDIR=`$PBSTARGETDIR --prefix`
|
||||
else
|
||||
PBSTARGETDIR='/usr/local';
|
||||
fi
|
||||
if test "$RMTYPE" = ''; then
|
||||
RMTYPE=PBS
|
||||
@ -2351,12 +2361,6 @@ if test "$PBSTARGETDIR" != 'FALSE'; then
|
||||
echo "$as_me: error: Only one Resource Manager can be specified (PBS, $RMTYPE)" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
if test "$OS" = "OSF"; then
|
||||
PBSLIBS="$PBSTARGETDIR/ilib/libnet.a -lpbs"
|
||||
else
|
||||
PBSLIBS="-lnet -lpbs"
|
||||
fi
|
||||
|
||||
|
||||
|
||||
pbs_definitions=include/Makefile.inc.pbs
|
||||
@ -2551,7 +2555,9 @@ echo "$as_me: WARNING: Resource Manager not specified - attempting build with pb
|
||||
else
|
||||
PBSTARGETDIR='/usr/local';
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$RMTYPE" = "PBS" ;then
|
||||
if $PBSTARGETDIR/bin/pbs-config --cflags 1>/dev/null 2>&1;then
|
||||
PBSCFLAGS=`$PBSTARGETDIR/bin/pbs-config --cflags`
|
||||
else
|
||||
@ -2559,8 +2565,16 @@ echo "$as_me: WARNING: Resource Manager not specified - attempting build with pb
|
||||
fi
|
||||
if $PBSTARGETDIR/bin/pbs-config --libs 1>/dev/null 2>&1;then
|
||||
PBSLDFLAGS=`$PBSTARGETDIR/bin/pbs-config --libs`
|
||||
elif test -f $PBSTARGETDIR/lib/libpbs.a ;then
|
||||
if test "$OS" = "OSF"; then
|
||||
PBSLIBS="$PBSTARGETDIR/ilib/libnet.a -L$PBSTARGETDIR/lib -lpbs"
|
||||
else
|
||||
PBSLIBS="-L$PBSTARGETDIR/lib -lnet -lpbs"
|
||||
fi
|
||||
else
|
||||
PBSLDFLAGS="-L$PBSTARGETDIR/lib -lnet -lpbs"
|
||||
{ { echo "$as_me:$LINENO: error: can't find pbs-config or libnet.a" >&5
|
||||
echo "$as_me: error: can't find pbs-config or libnet.a" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
|
||||
|
||||
@ -6918,7 +6932,7 @@ _ASBOX
|
||||
} >&5
|
||||
cat >&5 <<_CSEOF
|
||||
|
||||
This file was extended by maui $as_me 3.2.6p16, which was
|
||||
This file was extended by maui $as_me 3.2.6p17, which was
|
||||
generated by GNU Autoconf 2.57. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@ -6973,7 +6987,7 @@ _ACEOF
|
||||
|
||||
cat >>$CONFIG_STATUS <<_ACEOF
|
||||
ac_cs_version="\\
|
||||
maui config.status 3.2.6p16
|
||||
maui config.status 3.2.6p17
|
||||
configured by $0, generated by GNU Autoconf 2.57,
|
||||
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
|
||||
|
||||
@ -7194,7 +7208,6 @@ s,@RMTYPE@,$RMTYPE,;t t
|
||||
s,@LLDIR@,$LLDIR,;t t
|
||||
s,@LLDEF@,$LLDEF,;t t
|
||||
s,@PBSTARGETDIR@,$PBSTARGETDIR,;t t
|
||||
s,@PBSLIBS@,$PBSLIBS,;t t
|
||||
s,@SGEBUILDDIR@,$SGEBUILDDIR,;t t
|
||||
s,@SGEOSDIR@,$SGEOSDIR,;t t
|
||||
s,@LSFDIR@,$LSFDIR,;t t
|
||||
|
||||
30
configure.ac
30
configure.ac
@ -2,7 +2,7 @@
|
||||
# Process this file with autoconf to produce a configure script.
|
||||
|
||||
AC_PREREQ(2.57)
|
||||
AC_INIT(maui, 3.2.6p16, help@supercluster.org)
|
||||
AC_INIT(maui, 3.2.6p17, help@supercluster.org)
|
||||
AC_CONFIG_SRCDIR([src/mcom/MConst.c])
|
||||
#AC_CONFIG_HEADER([config.h])
|
||||
|
||||
@ -140,6 +140,16 @@ if test "$PBSTARGETDIR" != 'FALSE'; then
|
||||
else
|
||||
PBSTARGETDIR='/usr/local';
|
||||
fi
|
||||
elif test -f "$PBSTARGETDIR/bin/pbs-config"; then
|
||||
PBSTARGETDIR=`$PBSTARGETDIR/bin/pbs-config --prefix`
|
||||
elif test -f "$PBSTARGETDIR/../bin/pbs-config"; then
|
||||
PBSTARGETDIR=`$PBSTARGETDIR/../bin/pbs-config --prefix`
|
||||
elif test -f "$PBSTARGETDIR/pbs-config"; then
|
||||
PBSTARGETDIR=`$PBSTARGETDIR/pbs-config --prefix`
|
||||
elif test -f "$PBSTARGETDIR"; then
|
||||
PBSTARGETDIR=`$PBSTARGETDIR --prefix`
|
||||
else
|
||||
PBSTARGETDIR='/usr/local';
|
||||
fi
|
||||
if test "$RMTYPE" = ''; then
|
||||
RMTYPE=PBS
|
||||
@ -149,13 +159,7 @@ if test "$PBSTARGETDIR" != 'FALSE'; then
|
||||
else
|
||||
AC_MSG_ERROR([Only one Resource Manager can be specified (PBS, $RMTYPE)])
|
||||
fi
|
||||
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
|
||||
@ -312,7 +316,9 @@ if test "$RMTYPE" = ''; then
|
||||
else
|
||||
PBSTARGETDIR='/usr/local';
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
if test "$RMTYPE" = "PBS" ;then
|
||||
if $PBSTARGETDIR/bin/pbs-config --cflags 1>/dev/null 2>&1;then
|
||||
PBSCFLAGS=`$PBSTARGETDIR/bin/pbs-config --cflags`
|
||||
else
|
||||
@ -320,8 +326,14 @@ if test "$RMTYPE" = ''; then
|
||||
fi
|
||||
if $PBSTARGETDIR/bin/pbs-config --libs 1>/dev/null 2>&1;then
|
||||
PBSLDFLAGS=`$PBSTARGETDIR/bin/pbs-config --libs`
|
||||
elif test -f $PBSTARGETDIR/lib/libpbs.a ;then
|
||||
if test "$OS" = "OSF"; then
|
||||
PBSLIBS="$PBSTARGETDIR/ilib/libnet.a -L$PBSTARGETDIR/lib -lpbs"
|
||||
else
|
||||
PBSLIBS="-L$PBSTARGETDIR/lib -lnet -lpbs"
|
||||
fi
|
||||
else
|
||||
PBSLDFLAGS="-L$PBSTARGETDIR/lib -lnet -lpbs"
|
||||
AC_MSG_ERROR([can't find pbs-config or libnet.a])
|
||||
fi
|
||||
AC_SUBST(PBSCFLAGS)
|
||||
AC_SUBST(PBSLDFLAGS)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user