updated configure.ac because RMNMHOST didn't exist. Fixed mkdirs and commented out links in src/server/Makefile

git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@125 3f5042e3-fb1d-0410-be18-d6ca2573e517
This commit is contained in:
bchristiansen 2010-02-19 19:48:13 +00:00
parent 1cc6864e13
commit 1d14d34e1e
3 changed files with 10 additions and 10 deletions

10
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 4.0
# Generated by GNU Autoconf 2.57 for maui 3.3.
#
# Report bugs to <help@supercluster.org>.
#
@ -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 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 RMNMHOST 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.
@ -938,7 +938,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
maui configure 4.0
maui configure 3.3
generated by GNU Autoconf 2.57
Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
@ -2601,7 +2601,7 @@ fi;
if test "$USEWAREHOUSE" != 'FALSE'; then
if test "$NMTYPE" = ''; then
RMNMPORT=" NMPORT=12321"
RMNMSERVER=" NMSERVER=$HOSTNAME"
RMNMHOST=" NMHOST=$HOSTNAME"
fi
fi
@ -7224,7 +7224,7 @@ s,@RMSOCKETPROTOCOL@,$RMSOCKETPROTOCOL,;t t
s,@RMWIREPROTOCOL@,$RMWIREPROTOCOL,;t t
s,@RMVERSION@,$RMVERSION,;t t
s,@RMNMPORT@,$RMNMPORT,;t t
s,@RMNMSERVER@,$RMNMSERVER,;t t
s,@RMNMHOST@,$RMNMHOST,;t t
s,@AMTYPE@,$AMTYPE,;t t
s,@AMHOST@,$AMHOST,;t t
s,@AMPORT@,$AMPORT,;t t

View File

@ -350,7 +350,7 @@ AC_ARG_WITH(warehouse,
if test "$USEWAREHOUSE" != 'FALSE'; then
if test "$NMTYPE" = ''; then
RMNMPORT=" NMPORT=12321"
RMNMSERVER=" NMSERVER=$HOSTNAME"
RMNMHOST=" NMHOST=$HOSTNAME"
fi
fi
@ -361,7 +361,7 @@ AC_SUBST(RMSOCKETPROTOCOL)
AC_SUBST(RMWIREPROTOCOL)
AC_SUBST(RMVERSION)
AC_SUBST(RMNMPORT)
AC_SUBST(RMNMSERVER)
AC_SUBST(RMNMHOST)
# END RM CONFIG --------------------------------------

View File

@ -47,8 +47,8 @@ CFLAGS = $(OSCCFLAGS)
all: $(MBINS)
install: all
mkdir -p $(INST_DIR)/{bin,sbin,include,lib}
mkdir -p $(MSCHED_HOME)/{log,traces,stats,spool,tools}
mkdir -p $(INST_DIR)/bin $(INST_DIR)/sbin $(INST_DIR)/include $(INST_DIR)/lib
mkdir -p $(MSCHED_HOME)/log $(MSCHED_HOME)/traces $(MSCHED_HOME)/stats $(MSCHED_HOME)/spool $(MSCHED_HOME)/tools
chmod 1777 $(MSCHED_HOME)/spool
@ -74,7 +74,7 @@ install: all
then cp $(TOP)/maui-private.cfg.dist $(MSCHED_HOME)/maui-private.cfg; \
fi
(cd ../..;ln -sf etc/maui.cfg;ln -sf etc/maui-private.cfg)
# (cd ../..;ln -sf etc/maui.cfg;ln -sf etc/maui-private.cfg)
uninstall:
rm -f $(INST_DIR)/include/moab.h