diff --git a/Makefile.am b/Makefile.am
index d8122c99365dc8f61c12e794979619f140ad135a..ef26c31993e89868b084a06c79cdcdac64671dd4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,6 @@ SUBDIRS = auxdir src testsuite doc
EXTRA_DIST = \
etc/bluegene.conf.example \
- etc/federation.conf.example \
etc/slurm.conf.example \
etc/slurmdbd.conf.example \
etc/slurm.epilog.clean \
diff --git a/Makefile.in b/Makefile.in
index 4bce57b75d8864f6778a633646f66ed8054f67bc..c7707f838235970a2be19e71b15f2d6f0f6c4929 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -62,9 +62,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -210,9 +208,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -220,8 +216,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
@@ -379,7 +373,6 @@ ACLOCAL_AMFLAGS = -I auxdir
SUBDIRS = auxdir src testsuite doc
EXTRA_DIST = \
etc/bluegene.conf.example \
- etc/federation.conf.example \
etc/slurm.conf.example \
etc/slurmdbd.conf.example \
etc/slurm.epilog.clean \
diff --git a/aclocal.m4 b/aclocal.m4
index 5c1b30b6e009231ab47b196b96740cfdf3fbb73b..e326551b8f9c841f9266d37a3b84393d3d6ed3f7 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1362,9 +1362,7 @@ m4_include([auxdir/x_ac_cflags.m4])
m4_include([auxdir/x_ac_cray.m4])
m4_include([auxdir/x_ac_databases.m4])
m4_include([auxdir/x_ac_debug.m4])
-m4_include([auxdir/x_ac_elan.m4])
m4_include([auxdir/x_ac_env.m4])
-m4_include([auxdir/x_ac_federation.m4])
m4_include([auxdir/x_ac_gpl_licensed.m4])
m4_include([auxdir/x_ac_hwloc.m4])
m4_include([auxdir/x_ac_iso.m4])
diff --git a/auxdir/Makefile.in b/auxdir/Makefile.in
index a024c54555618e27635aee4bf0db126190cc0a2d..5356d78dccf21a0b64b29e848ffbf984df22ba18 100644
--- a/auxdir/Makefile.in
+++ b/auxdir/Makefile.in
@@ -54,9 +54,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -124,9 +122,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -134,8 +130,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/config.h.in b/config.h.in
index 28c7a0fdfebcc7234a168e741d7b3024016e75fa..bd68e87ff1f1054db5c4c9466c9a5e3e593fc962 100644
--- a/config.h.in
+++ b/config.h.in
@@ -133,15 +133,6 @@
/* Define to 1 if you have the <kstat.h> header file. */
#undef HAVE_KSTAT_H
-/* define if you have libelan3. */
-#undef HAVE_LIBELAN3
-
-/* define if you have libelanctrl. */
-#undef HAVE_LIBELANCTRL
-
-/* define if you have libelanhosts. */
-#undef HAVE_LIBELANHOSTS
-
/* Define to 1 if you have the `expat' library (-lexpat). */
#undef HAVE_LIBEXPAT
@@ -151,9 +142,6 @@
/* define if you have libnrt. */
#undef HAVE_LIBNRT
-/* define if you have libntbl. */
-#undef HAVE_LIBNTBL
-
/* Define to 1 if you have the <limits.h> header file. */
#undef HAVE_LIMITS_H
diff --git a/configure b/configure
index e52a056be8ad9a95f6a5989d879aadb03e659b46..a909b5716b4ac3fbffb2b265e3f3b1d6c024214c 100755
--- a/configure
+++ b/configure
@@ -656,14 +656,6 @@ HAVE_NRT_FALSE
HAVE_NRT_TRUE
NRT_LDFLAGS
NRT_CPPFLAGS
-HAVE_FEDERATION
-HAVE_FEDERATION_FALSE
-HAVE_FEDERATION_TRUE
-FEDERATION_LDFLAGS
-HAVE_ELAN
-HAVE_ELAN_FALSE
-HAVE_ELAN_TRUE
-ELAN_LIBS
SLURM_PREFIX
SLURMCTLD_PORT_COUNT
SLURMDBD_PORT
@@ -20997,273 +20989,6 @@ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rms_prgcreate in -lrmscall" >&5
-$as_echo_n "checking for rms_prgcreate in -lrmscall... " >&6; }
-if ${ac_cv_lib_rmscall_rms_prgcreate+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lrmscall $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char rms_prgcreate ();
-int
-main ()
-{
-return rms_prgcreate ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_rmscall_rms_prgcreate=yes
-else
- ac_cv_lib_rmscall_rms_prgcreate=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rmscall_rms_prgcreate" >&5
-$as_echo "$ac_cv_lib_rmscall_rms_prgcreate" >&6; }
-if test "x$ac_cv_lib_rmscall_rms_prgcreate" = xyes; then :
- ac_elan_have_rmscall=yes; ELAN_LIBS="-lrmscall"
-fi
-
-
- if test "$ac_elan_have_rmscall" != "yes" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Cannot support QsNet without librmscall" >&5
-$as_echo "$as_me: Cannot support QsNet without librmscall" >&6;}
- fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for elan3_create in -lelan3" >&5
-$as_echo_n "checking for elan3_create in -lelan3... " >&6; }
-if ${ac_cv_lib_elan3_elan3_create+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lelan3 $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char elan3_create ();
-int
-main ()
-{
-return elan3_create ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_elan3_elan3_create=yes
-else
- ac_cv_lib_elan3_elan3_create=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_elan3_elan3_create" >&5
-$as_echo "$ac_cv_lib_elan3_elan3_create" >&6; }
-if test "x$ac_cv_lib_elan3_elan3_create" = xyes; then :
- ac_elan_have_elan3=yes
-else
- ac_elan_noelan3=1
-fi
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for elanctrl_open in -lelanctrl" >&5
-$as_echo_n "checking for elanctrl_open in -lelanctrl... " >&6; }
-if ${ac_cv_lib_elanctrl_elanctrl_open+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lelanctrl $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char elanctrl_open ();
-int
-main ()
-{
-return elanctrl_open ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_elanctrl_elanctrl_open=yes
-else
- ac_cv_lib_elanctrl_elanctrl_open=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_elanctrl_elanctrl_open" >&5
-$as_echo "$ac_cv_lib_elanctrl_elanctrl_open" >&6; }
-if test "x$ac_cv_lib_elanctrl_elanctrl_open" = xyes; then :
- ac_elan_have_elanctrl=yes
-else
- ac_elan_noelanctrl=1
-fi
-
-
- if test "$ac_elan_have_elan3" = "yes"; then
-
-$as_echo "#define HAVE_LIBELAN3 1" >>confdefs.h
-
- ELAN_LIBS="$ELAN_LIBS -lelan3"
- test "$ac_elan_have_rmscall" = "yes" && ac_have_elan="yes"
- elif test "$ac_elan_have_elanctrl" = "yes"; then
-
-$as_echo "#define HAVE_LIBELANCTRL 1" >>confdefs.h
-
- ELAN_LIBS="$ELAN_LIBS -lelanctrl"
- test "$ac_elan_have_rmscall" = "yes" && ac_have_elan="yes"
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: Cannot support QsNet without libelan3 or libelanctrl!" >&5
-$as_echo "$as_me: Cannot support QsNet without libelan3 or libelanctrl!" >&6;}
- fi
-
- if test "$ac_have_elan" = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for elanhost_config_create in -lelanhosts" >&5
-$as_echo_n "checking for elanhost_config_create in -lelanhosts... " >&6; }
-if ${ac_cv_lib_elanhosts_elanhost_config_create+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lelanhosts $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char elanhost_config_create ();
-int
-main ()
-{
-return elanhost_config_create ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_elanhosts_elanhost_config_create=yes
-else
- ac_cv_lib_elanhosts_elanhost_config_create=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_elanhosts_elanhost_config_create" >&5
-$as_echo "$ac_cv_lib_elanhosts_elanhost_config_create" >&6; }
-if test "x$ac_cv_lib_elanhosts_elanhost_config_create" = xyes; then :
- ac_elan_have_elanhosts=yes
-fi
-
-
- if test "$ac_elan_have_elanhosts" = "yes"; then
-
-$as_echo "#define HAVE_LIBELANHOSTS 1" >>confdefs.h
-
- ELAN_LIBS="$ELAN_LIBS -lelanhosts"
- else
- ac_have_elan="no"
- { $as_echo "$as_me:${as_lineno-$LINENO}: Cannot build QsNet modules without libelanhosts" >&5
-$as_echo "$as_me: Cannot build QsNet modules without libelanhosts" >&6;}
- fi
- fi
-
-
-
- if test "x$ac_have_elan" = "xyes"; then
- HAVE_ELAN_TRUE=
- HAVE_ELAN_FALSE='#'
-else
- HAVE_ELAN_TRUE='#'
- HAVE_ELAN_FALSE=
-fi
-
-
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable AIX Federation switch support" >&5
-$as_echo_n "checking whether to enable AIX Federation switch support... " >&6; }
- ntbl_default_dirs="/usr/lib"
- for ntbl_dir in $ntbl_default_dirs; do
- # skip dirs that don't exist
- if test ! -z "$ntbl_dir" -a ! -d "$ntbl_dir" ; then
- continue;
- fi
-
- if test "$OBJECT_MODE" = "64"; then
- libntbl="ntbl_64"
- else
- libntbl="ntbl"
- fi
-
- # search for required NTBL API libraries
- if test -f "$ntbl_dir/lib${libntbl}.so"; then
- ac_have_federation="yes"
- FEDERATION_LDFLAGS="-l$libntbl"
- break;
- fi
-
- done
-
- if test "x$ac_have_federation" != "xyes" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: Cannot support Federation without libntbl" >&5
-$as_echo "$as_me: Cannot support Federation without libntbl" >&6;}
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAVE_LIBNTBL 1" >>confdefs.h
-
- fi
-
-
-
- if test "x$ac_have_federation" = "xyes"; then
- HAVE_FEDERATION_TRUE=
- HAVE_FEDERATION_FALSE='#'
-else
- HAVE_FEDERATION_TRUE='#'
- HAVE_FEDERATION_FALSE=
-fi
-
-
-
-
-
nrt_default_dirs="/usr/include"
# Check whether --with-nrth was given.
@@ -22256,7 +21981,7 @@ fi
-ac_config_files="$ac_config_files Makefile config.xml auxdir/Makefile contribs/Makefile contribs/arrayrun/Makefile contribs/cray/Makefile contribs/lua/Makefile contribs/pam/Makefile contribs/perlapi/Makefile contribs/perlapi/libslurm/Makefile contribs/perlapi/libslurm/perl/Makefile.PL contribs/perlapi/libslurmdb/Makefile contribs/perlapi/libslurmdb/perl/Makefile.PL contribs/torque/Makefile contribs/phpext/Makefile contribs/phpext/slurm_php/config.m4 contribs/sjobexit/Makefile contribs/slurmdb-direct/Makefile src/Makefile src/api/Makefile src/common/Makefile src/db_api/Makefile src/database/Makefile src/sacct/Makefile src/sacctmgr/Makefile src/sreport/Makefile src/sstat/Makefile src/sshare/Makefile src/salloc/Makefile src/sbatch/Makefile src/sattach/Makefile src/sprio/Makefile src/srun/Makefile src/srun_cr/Makefile src/slurmd/Makefile src/slurmd/common/Makefile src/slurmd/slurmd/Makefile src/slurmd/slurmstepd/Makefile src/slurmdbd/Makefile src/slurmctld/Makefile src/sbcast/Makefile src/scontrol/Makefile src/scancel/Makefile src/squeue/Makefile src/sinfo/Makefile src/smap/Makefile src/strigger/Makefile src/sview/Makefile src/plugins/Makefile src/plugins/accounting_storage/Makefile src/plugins/accounting_storage/common/Makefile src/plugins/accounting_storage/filetxt/Makefile src/plugins/accounting_storage/mysql/Makefile src/plugins/accounting_storage/pgsql/Makefile src/plugins/accounting_storage/none/Makefile src/plugins/accounting_storage/slurmdbd/Makefile src/plugins/auth/Makefile src/plugins/auth/authd/Makefile src/plugins/auth/munge/Makefile src/plugins/auth/none/Makefile src/plugins/checkpoint/Makefile src/plugins/checkpoint/aix/Makefile src/plugins/checkpoint/none/Makefile src/plugins/checkpoint/ompi/Makefile src/plugins/checkpoint/blcr/Makefile src/plugins/checkpoint/blcr/cr_checkpoint.sh src/plugins/checkpoint/blcr/cr_restart.sh src/plugins/crypto/Makefile src/plugins/crypto/munge/Makefile src/plugins/crypto/openssl/Makefile src/plugins/gres/Makefile src/plugins/gres/gpu/Makefile src/plugins/gres/nic/Makefile src/plugins/jobacct_gather/Makefile src/plugins/jobacct_gather/linux/Makefile src/plugins/jobacct_gather/aix/Makefile src/plugins/jobacct_gather/none/Makefile src/plugins/jobcomp/Makefile src/plugins/jobcomp/filetxt/Makefile src/plugins/jobcomp/none/Makefile src/plugins/jobcomp/script/Makefile src/plugins/jobcomp/mysql/Makefile src/plugins/jobcomp/pgsql/Makefile src/plugins/job_submit/Makefile src/plugins/job_submit/cnode/Makefile src/plugins/job_submit/defaults/Makefile src/plugins/job_submit/logging/Makefile src/plugins/job_submit/lua/Makefile src/plugins/job_submit/partition/Makefile src/plugins/preempt/Makefile src/plugins/preempt/none/Makefile src/plugins/preempt/partition_prio/Makefile src/plugins/preempt/qos/Makefile src/plugins/priority/Makefile src/plugins/priority/basic/Makefile src/plugins/priority/multifactor/Makefile src/plugins/proctrack/Makefile src/plugins/proctrack/aix/Makefile src/plugins/proctrack/cgroup/Makefile src/plugins/proctrack/pgid/Makefile src/plugins/proctrack/linuxproc/Makefile src/plugins/proctrack/rms/Makefile src/plugins/proctrack/sgi_job/Makefile src/plugins/proctrack/lua/Makefile src/plugins/sched/Makefile src/plugins/sched/backfill/Makefile src/plugins/sched/builtin/Makefile src/plugins/sched/hold/Makefile src/plugins/sched/wiki/Makefile src/plugins/sched/wiki2/Makefile src/plugins/select/Makefile src/plugins/select/bluegene/Makefile src/plugins/select/bluegene/ba/Makefile src/plugins/select/bluegene/ba_bgq/Makefile src/plugins/select/bluegene/bl/Makefile src/plugins/select/bluegene/bl_bgq/Makefile src/plugins/select/bluegene/sfree/Makefile src/plugins/select/cons_res/Makefile src/plugins/select/cray/Makefile src/plugins/select/cray/libalps/Makefile src/plugins/select/cray/libemulate/Makefile src/plugins/select/linear/Makefile src/plugins/switch/Makefile src/plugins/switch/elan/Makefile src/plugins/switch/federation/Makefile src/plugins/switch/none/Makefile src/plugins/switch/nrt/Makefile src/plugins/switch/nrt/libpermapi/Makefile src/plugins/mpi/Makefile src/plugins/mpi/mpich1_p4/Makefile src/plugins/mpi/mpich1_shmem/Makefile src/plugins/mpi/mpichgm/Makefile src/plugins/mpi/mpichmx/Makefile src/plugins/mpi/mvapich/Makefile src/plugins/mpi/lam/Makefile src/plugins/mpi/none/Makefile src/plugins/mpi/openmpi/Makefile src/plugins/task/Makefile src/plugins/task/affinity/Makefile src/plugins/task/cgroup/Makefile src/plugins/task/none/Makefile src/plugins/topology/Makefile src/plugins/topology/3d_torus/Makefile src/plugins/topology/node_rank/Makefile src/plugins/topology/none/Makefile src/plugins/topology/tree/Makefile doc/Makefile doc/man/Makefile doc/man/man1/Makefile doc/man/man3/Makefile doc/man/man5/Makefile doc/man/man8/Makefile doc/html/Makefile doc/html/configurator.html testsuite/Makefile testsuite/expect/Makefile testsuite/slurm_unit/Makefile testsuite/slurm_unit/api/Makefile testsuite/slurm_unit/api/manual/Makefile testsuite/slurm_unit/common/Makefile"
+ac_config_files="$ac_config_files Makefile config.xml auxdir/Makefile contribs/Makefile contribs/arrayrun/Makefile contribs/cray/Makefile contribs/lua/Makefile contribs/pam/Makefile contribs/perlapi/Makefile contribs/perlapi/libslurm/Makefile contribs/perlapi/libslurm/perl/Makefile.PL contribs/perlapi/libslurmdb/Makefile contribs/perlapi/libslurmdb/perl/Makefile.PL contribs/torque/Makefile contribs/phpext/Makefile contribs/phpext/slurm_php/config.m4 contribs/sjobexit/Makefile contribs/slurmdb-direct/Makefile src/Makefile src/api/Makefile src/common/Makefile src/db_api/Makefile src/database/Makefile src/sacct/Makefile src/sacctmgr/Makefile src/sreport/Makefile src/sstat/Makefile src/sshare/Makefile src/salloc/Makefile src/sbatch/Makefile src/sattach/Makefile src/sprio/Makefile src/srun/Makefile src/srun_cr/Makefile src/slurmd/Makefile src/slurmd/common/Makefile src/slurmd/slurmd/Makefile src/slurmd/slurmstepd/Makefile src/slurmdbd/Makefile src/slurmctld/Makefile src/sbcast/Makefile src/scontrol/Makefile src/scancel/Makefile src/squeue/Makefile src/sinfo/Makefile src/smap/Makefile src/strigger/Makefile src/sview/Makefile src/plugins/Makefile src/plugins/accounting_storage/Makefile src/plugins/accounting_storage/common/Makefile src/plugins/accounting_storage/filetxt/Makefile src/plugins/accounting_storage/mysql/Makefile src/plugins/accounting_storage/pgsql/Makefile src/plugins/accounting_storage/none/Makefile src/plugins/accounting_storage/slurmdbd/Makefile src/plugins/auth/Makefile src/plugins/auth/authd/Makefile src/plugins/auth/munge/Makefile src/plugins/auth/none/Makefile src/plugins/checkpoint/Makefile src/plugins/checkpoint/aix/Makefile src/plugins/checkpoint/none/Makefile src/plugins/checkpoint/ompi/Makefile src/plugins/checkpoint/blcr/Makefile src/plugins/checkpoint/blcr/cr_checkpoint.sh src/plugins/checkpoint/blcr/cr_restart.sh src/plugins/crypto/Makefile src/plugins/crypto/munge/Makefile src/plugins/crypto/openssl/Makefile src/plugins/gres/Makefile src/plugins/gres/gpu/Makefile src/plugins/gres/nic/Makefile src/plugins/jobacct_gather/Makefile src/plugins/jobacct_gather/linux/Makefile src/plugins/jobacct_gather/aix/Makefile src/plugins/jobacct_gather/none/Makefile src/plugins/jobcomp/Makefile src/plugins/jobcomp/filetxt/Makefile src/plugins/jobcomp/none/Makefile src/plugins/jobcomp/script/Makefile src/plugins/jobcomp/mysql/Makefile src/plugins/jobcomp/pgsql/Makefile src/plugins/job_submit/Makefile src/plugins/job_submit/cnode/Makefile src/plugins/job_submit/defaults/Makefile src/plugins/job_submit/logging/Makefile src/plugins/job_submit/lua/Makefile src/plugins/job_submit/partition/Makefile src/plugins/preempt/Makefile src/plugins/preempt/none/Makefile src/plugins/preempt/partition_prio/Makefile src/plugins/preempt/qos/Makefile src/plugins/priority/Makefile src/plugins/priority/basic/Makefile src/plugins/priority/multifactor/Makefile src/plugins/proctrack/Makefile src/plugins/proctrack/aix/Makefile src/plugins/proctrack/cgroup/Makefile src/plugins/proctrack/pgid/Makefile src/plugins/proctrack/linuxproc/Makefile src/plugins/proctrack/sgi_job/Makefile src/plugins/proctrack/lua/Makefile src/plugins/sched/Makefile src/plugins/sched/backfill/Makefile src/plugins/sched/builtin/Makefile src/plugins/sched/hold/Makefile src/plugins/sched/wiki/Makefile src/plugins/sched/wiki2/Makefile src/plugins/select/Makefile src/plugins/select/bluegene/Makefile src/plugins/select/bluegene/ba/Makefile src/plugins/select/bluegene/ba_bgq/Makefile src/plugins/select/bluegene/bl/Makefile src/plugins/select/bluegene/bl_bgq/Makefile src/plugins/select/bluegene/sfree/Makefile src/plugins/select/cons_res/Makefile src/plugins/select/cray/Makefile src/plugins/select/cray/libalps/Makefile src/plugins/select/cray/libemulate/Makefile src/plugins/select/linear/Makefile src/plugins/switch/Makefile src/plugins/switch/none/Makefile src/plugins/switch/nrt/Makefile src/plugins/switch/nrt/libpermapi/Makefile src/plugins/mpi/Makefile src/plugins/mpi/mpich1_p4/Makefile src/plugins/mpi/mpich1_shmem/Makefile src/plugins/mpi/mpichgm/Makefile src/plugins/mpi/mpichmx/Makefile src/plugins/mpi/mvapich/Makefile src/plugins/mpi/lam/Makefile src/plugins/mpi/none/Makefile src/plugins/mpi/openmpi/Makefile src/plugins/task/Makefile src/plugins/task/affinity/Makefile src/plugins/task/cgroup/Makefile src/plugins/task/none/Makefile src/plugins/topology/Makefile src/plugins/topology/3d_torus/Makefile src/plugins/topology/node_rank/Makefile src/plugins/topology/none/Makefile src/plugins/topology/tree/Makefile doc/Makefile doc/man/Makefile doc/man/man1/Makefile doc/man/man3/Makefile doc/man/man5/Makefile doc/man/man8/Makefile doc/html/Makefile doc/html/configurator.html testsuite/Makefile testsuite/expect/Makefile testsuite/slurm_unit/Makefile testsuite/slurm_unit/api/Makefile testsuite/slurm_unit/api/manual/Makefile testsuite/slurm_unit/common/Makefile"
cat >confcache <<\_ACEOF
@@ -22497,14 +22222,6 @@ if test -z "${DEBUG_MODULES_TRUE}" && test -z "${DEBUG_MODULES_FALSE}"; then
as_fn_error $? "conditional \"DEBUG_MODULES\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${HAVE_ELAN_TRUE}" && test -z "${HAVE_ELAN_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_ELAN\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_FEDERATION_TRUE}" && test -z "${HAVE_FEDERATION_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_FEDERATION\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${HAVE_NRT_TRUE}" && test -z "${HAVE_NRT_FALSE}"; then
as_fn_error $? "conditional \"HAVE_NRT\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -23639,7 +23356,6 @@ do
"src/plugins/proctrack/cgroup/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/proctrack/cgroup/Makefile" ;;
"src/plugins/proctrack/pgid/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/proctrack/pgid/Makefile" ;;
"src/plugins/proctrack/linuxproc/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/proctrack/linuxproc/Makefile" ;;
- "src/plugins/proctrack/rms/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/proctrack/rms/Makefile" ;;
"src/plugins/proctrack/sgi_job/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/proctrack/sgi_job/Makefile" ;;
"src/plugins/proctrack/lua/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/proctrack/lua/Makefile" ;;
"src/plugins/sched/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/sched/Makefile" ;;
@@ -23661,8 +23377,6 @@ do
"src/plugins/select/cray/libemulate/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/select/cray/libemulate/Makefile" ;;
"src/plugins/select/linear/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/select/linear/Makefile" ;;
"src/plugins/switch/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/switch/Makefile" ;;
- "src/plugins/switch/elan/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/switch/elan/Makefile" ;;
- "src/plugins/switch/federation/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/switch/federation/Makefile" ;;
"src/plugins/switch/none/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/switch/none/Makefile" ;;
"src/plugins/switch/nrt/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/switch/nrt/Makefile" ;;
"src/plugins/switch/nrt/libpermapi/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/switch/nrt/libpermapi/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index d2415a1f7bb5940bb58aa559b3df32770e161879..a787fb331a0098fca641bb2f9972aa74246c6289 100644
--- a/configure.ac
+++ b/configure.ac
@@ -277,19 +277,6 @@ else
fi
AC_SUBST(SLURM_PREFIX)
-dnl check for whether to include Elan support
-dnl
-X_AC_ELAN
-AM_CONDITIONAL(HAVE_ELAN, test "x$ac_have_elan" = "xyes")
-AC_SUBST(HAVE_ELAN)
-
-dnl check for whether to include Federation support
-dnl
-X_AC_FEDERATION
-AM_CONDITIONAL(HAVE_FEDERATION, test "x$ac_have_federation" = "xyes")
-AC_SUBST(HAVE_FEDERATION)
-
-
dnl check for whether to include IBM NRT (Network Resource Table) support
dnl
X_AC_NRT
@@ -497,7 +484,6 @@ AC_CONFIG_FILES([Makefile
src/plugins/proctrack/cgroup/Makefile
src/plugins/proctrack/pgid/Makefile
src/plugins/proctrack/linuxproc/Makefile
- src/plugins/proctrack/rms/Makefile
src/plugins/proctrack/sgi_job/Makefile
src/plugins/proctrack/lua/Makefile
src/plugins/sched/Makefile
@@ -519,8 +505,6 @@ AC_CONFIG_FILES([Makefile
src/plugins/select/cray/libemulate/Makefile
src/plugins/select/linear/Makefile
src/plugins/switch/Makefile
- src/plugins/switch/elan/Makefile
- src/plugins/switch/federation/Makefile
src/plugins/switch/none/Makefile
src/plugins/switch/nrt/Makefile
src/plugins/switch/nrt/libpermapi/Makefile
diff --git a/contribs/Makefile.in b/contribs/Makefile.in
index 08e9f313dd8d0f50c3d2b4ba9997f104a70adf6f..87c903494fa441cde88e0fbb765007f82bbfbd1f 100644
--- a/contribs/Makefile.in
+++ b/contribs/Makefile.in
@@ -53,9 +53,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -163,9 +161,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -173,8 +169,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/contribs/arrayrun/Makefile.in b/contribs/arrayrun/Makefile.in
index 9429d9277f0db85fee69cd0773588c1dcbe1dee0..0eaf45d0e901e62ae0ac2be6d6d9725b645d29d5 100644
--- a/contribs/arrayrun/Makefile.in
+++ b/contribs/arrayrun/Makefile.in
@@ -53,9 +53,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -123,9 +121,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -133,8 +129,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/contribs/cray/Makefile.in b/contribs/cray/Makefile.in
index 24745050c246d7ec966421aaca8be018b7a449ac..1956d6238a60809185db609f4192fd478b007b4a 100644
--- a/contribs/cray/Makefile.in
+++ b/contribs/cray/Makefile.in
@@ -58,9 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -151,9 +149,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -161,8 +157,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/contribs/lua/Makefile.in b/contribs/lua/Makefile.in
index 9760e831d6f9e54f60787d28e48e3a05c9b2e73d..a8feb06c6ea91f009cf1ce5e368ce87a80069925 100644
--- a/contribs/lua/Makefile.in
+++ b/contribs/lua/Makefile.in
@@ -53,9 +53,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -123,9 +121,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -133,8 +129,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/contribs/pam/Makefile.in b/contribs/pam/Makefile.in
index b18b404810cfd638e3d87cf9fcacb3d767c9db98..385784037e84f44e1078370b5dbcef2ae2d74311 100644
--- a/contribs/pam/Makefile.in
+++ b/contribs/pam/Makefile.in
@@ -57,9 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -177,9 +175,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -187,8 +183,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/contribs/perlapi/Makefile.in b/contribs/perlapi/Makefile.in
index b7ea2a761e8ebf4de84428781a99a3f3763cced0..6ee27d50dc6e83f19347d161a656cb82b8a80f28 100644
--- a/contribs/perlapi/Makefile.in
+++ b/contribs/perlapi/Makefile.in
@@ -53,9 +53,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -163,9 +161,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -173,8 +169,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/contribs/perlapi/libslurm/Makefile.in b/contribs/perlapi/libslurm/Makefile.in
index 9e2b86a234c361afc48992d4b70490d29ed303af..18878c3d2f92e824d24fe5555194f565ce7d52c9 100644
--- a/contribs/perlapi/libslurm/Makefile.in
+++ b/contribs/perlapi/libslurm/Makefile.in
@@ -53,9 +53,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -123,9 +121,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -133,8 +129,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/contribs/perlapi/libslurmdb/Makefile.in b/contribs/perlapi/libslurmdb/Makefile.in
index e10c2864dfd99a0dcb55cebb35aa3a4823fd229b..2c9d622b6482bd923de494b976d109cb809660d1 100644
--- a/contribs/perlapi/libslurmdb/Makefile.in
+++ b/contribs/perlapi/libslurmdb/Makefile.in
@@ -53,9 +53,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -123,9 +121,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -133,8 +129,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/contribs/phpext/Makefile.in b/contribs/phpext/Makefile.in
index a4c63df5ae8709e886e593a121a0de4f8e6a9ab4..eabfbc185ab856ddd2cdd5905d18744d265b6922 100644
--- a/contribs/phpext/Makefile.in
+++ b/contribs/phpext/Makefile.in
@@ -53,9 +53,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -123,9 +121,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -133,8 +129,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/contribs/sjobexit/Makefile.in b/contribs/sjobexit/Makefile.in
index 3f4babd5dacbde65fe02f78ed12d084de55fa301..b4f5de24dd325a8e2ef535e6c037ac442981e235 100644
--- a/contribs/sjobexit/Makefile.in
+++ b/contribs/sjobexit/Makefile.in
@@ -57,9 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -150,9 +148,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -160,8 +156,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/contribs/slurmdb-direct/Makefile.in b/contribs/slurmdb-direct/Makefile.in
index 10ca5f360070a1111584c0da67fbc4dfae034cc0..5a7f9457f53bb72ba78e58608a6f33160f972d75 100644
--- a/contribs/slurmdb-direct/Makefile.in
+++ b/contribs/slurmdb-direct/Makefile.in
@@ -57,9 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -150,9 +148,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -160,8 +156,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/contribs/torque/Makefile.in b/contribs/torque/Makefile.in
index 4ab96ebaad794c2861dfe1afb1b261b268b859be..2c0cef4cdf1052f601ef0aafe2c4a38fb0e60819 100644
--- a/contribs/torque/Makefile.in
+++ b/contribs/torque/Makefile.in
@@ -57,9 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -150,9 +148,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -160,8 +156,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 444733988e33e4df9cb3652eface3122315f3e2a..539dd3ef039b313858987777d07ed324122b9b74 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -53,9 +53,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -163,9 +161,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -173,8 +169,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/doc/html/Makefile.in b/doc/html/Makefile.in
index 4ef566a16d9462bca1b810a880edfa3913d73b65..3bf9fcaf6908d5563fb4d68d7824d9b02b6f2808 100644
--- a/doc/html/Makefile.in
+++ b/doc/html/Makefile.in
@@ -55,9 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -148,9 +146,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -158,8 +154,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/doc/man/Makefile.in b/doc/man/Makefile.in
index dc927a755509d1cce47451aa6183fd58420cd6bb..6d188094c9cbace56d895369f86d8329ffc7f41c 100644
--- a/doc/man/Makefile.in
+++ b/doc/man/Makefile.in
@@ -53,9 +53,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -163,9 +161,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -173,8 +169,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/doc/man/man1/Makefile.in b/doc/man/man1/Makefile.in
index 5833d5d7cd62c29ffa0f9dc29d734f7719057838..a94ec5fbcd0ba5a11f1011b9fe7d6b7b58fa981d 100644
--- a/doc/man/man1/Makefile.in
+++ b/doc/man/man1/Makefile.in
@@ -55,9 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -151,9 +149,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -161,8 +157,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/doc/man/man3/Makefile.in b/doc/man/man3/Makefile.in
index b32b580340736a65c115394704e11d01ac3609f0..8ce629878cd8fbcc6830c960150fc74fe66bd889 100644
--- a/doc/man/man3/Makefile.in
+++ b/doc/man/man3/Makefile.in
@@ -53,9 +53,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -148,9 +146,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -158,8 +154,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/doc/man/man5/Makefile.am b/doc/man/man5/Makefile.am
index aaf36981908c94b243aabf10816d5950a619396f..f8a9ca37a7ccc7ec99511ca984156f9dbfa2a062 100644
--- a/doc/man/man5/Makefile.am
+++ b/doc/man/man5/Makefile.am
@@ -6,7 +6,6 @@ man5_MANS = bluegene.conf.5 \
cgroup.conf.5 \
cray.conf.5 \
gres.conf.5 \
- nrt.conf.5 \
slurm.conf.5 \
slurmdbd.conf.5 \
topology.conf.5 \
@@ -17,7 +16,6 @@ html_DATA = \
bluegene.conf.html \
cgroup.conf.html \
gres.conf.html \
- nrt.conf.html \
slurm.conf.html \
slurmdbd.conf.html \
topology.conf.html \
diff --git a/doc/man/man5/Makefile.in b/doc/man/man5/Makefile.in
index 6fecadc7fff0f7b409fa0c9bb70ba1ac14eadc18..e484deab85046748fdf6bc2f3ce209b4140ecee0 100644
--- a/doc/man/man5/Makefile.in
+++ b/doc/man/man5/Makefile.in
@@ -55,9 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -151,9 +149,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -161,8 +157,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
@@ -320,7 +314,6 @@ man5_MANS = bluegene.conf.5 \
cgroup.conf.5 \
cray.conf.5 \
gres.conf.5 \
- nrt.conf.5 \
slurm.conf.5 \
slurmdbd.conf.5 \
topology.conf.5 \
@@ -330,7 +323,6 @@ man5_MANS = bluegene.conf.5 \
@HAVE_MAN2HTML_TRUE@ bluegene.conf.html \
@HAVE_MAN2HTML_TRUE@ cgroup.conf.html \
@HAVE_MAN2HTML_TRUE@ gres.conf.html \
-@HAVE_MAN2HTML_TRUE@ nrt.conf.html \
@HAVE_MAN2HTML_TRUE@ slurm.conf.html \
@HAVE_MAN2HTML_TRUE@ slurmdbd.conf.html \
@HAVE_MAN2HTML_TRUE@ topology.conf.html \
diff --git a/doc/man/man5/nrt.conf.5 b/doc/man/man5/nrt.conf.5
deleted file mode 100644
index 95241eab1efbe1c3623cefc6c14c8473255a09f7..0000000000000000000000000000000000000000
--- a/doc/man/man5/nrt.conf.5
+++ /dev/null
@@ -1,75 +0,0 @@
-.TH "nrt.conf" "5" "January 2012" "nrt.conf 2.4" "SLURM configuration file"
-
-.SH "NAME"
-nrt.conf \- Slurm configuration file for the IBM Network Resource Table (NRT) specific information
-
-.SH "DESCRIPTION"
-\fBnrt.conf\fP is an ASCII file which defines parameters used by
-SLURM's switch/nrt plugin in support of IBM systems in which the Network
-Resource Table (NRT) Application Programming Interface (API) is used to
-manage its network.
-The file location can be modified at system build time using the
-DEFAULT_SLURM_CONF parameter or at execution time by setting the SLURM_CONF
-environment variable. The file will always be located in the
-same directory as the \fBslurm.conf\fP file.
-.LP
-Parameter names are case insensitive.
-Any text following a "#" in the configuration file is treated
-as a comment through the end of that line.
-The size of each line in the file is limited to 1024 characters.
-Changes to the configuration file take effect upon restart of
-SLURM daemons.
-.LP
-The configuration parameters available include:
-
-.TP
-\fBAdapterName\fR=<switch_name>
-Name of switch adapter(s). This can use the same name format as the SLURM
-hostname expression (numeric values or ranges in square brackets). For example,
-"sni0", "sni[0-1]", "sni[0,1]" or "sni[0-1,2]".
-
-.TP
-\fBAdapterType\fR=<type>
-The adapter type. Valid values include:
-.RS
-.TP 12
-\fBIB\fR
-InfiniBand switch type
-.TP
-\fBHPCE\fR
-HPCE switch type
-.RE
-
-.SH "EXAMPLE"
-.LP
-.br
-###
-.br
-# SLURM Network Resource Table (NRT) configuration file
-.br
-###
-.br
-AdapterName=sni[0-1]
-.br
-AdapterType=IB
-
-.SH "COPYING"
-Copyright (C) 2012 SchedMD LLC.
-Produced at SchedMD LLC (cf, DISCLAIMER).
-.LP
-This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
-.LP
-SLURM is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 2 of the License, or (at your option)
-any later version.
-.LP
-SLURM is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
-details.
-
-.SH "SEE ALSO"
-.LP
-\fBslurm.conf\fR(5)
diff --git a/doc/man/man8/Makefile.in b/doc/man/man8/Makefile.in
index df9db0507364dbed11082ae75f1c29b7f0f79fc2..6875a7edb281050bd67732787d2bb5749c9fb8e8 100644
--- a/doc/man/man8/Makefile.in
+++ b/doc/man/man8/Makefile.in
@@ -55,9 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -151,9 +149,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -161,8 +157,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/etc/federation.conf.example b/etc/federation.conf.example
deleted file mode 100644
index 5c376ae43f200dab3daa8757bbfe7ff12117e7b5..0000000000000000000000000000000000000000
--- a/etc/federation.conf.example
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Global specifications for Federation Switch Plugin
-#
-# AdapterName: Adapter names can be in these forms
-# sni0
-# sni[0-1]
-# sni[0,1]
-# sni[0-1,2]
-
-AdapterName=sni[0-1]
diff --git a/slurm.spec b/slurm.spec
index f5f20ac67cdabff5c0b49d9ebef99eff98c2e3bb..10e25db69946723ed7913d887ae0c8badd294a31 100644
--- a/slurm.spec
+++ b/slurm.spec
@@ -12,7 +12,6 @@
# --with bluegene %_with_bluegene 1 build bluegene RPM
# --with cray_xt %_with_cray_xt 1 build for Cray XT system
# --with debug %_with_debug 1 enable extra debugging within SLURM
-# --with elan %_with_elan 1 build switch-elan RPM
# --with lua %_with_lua 1 build SLURM lua bindings (proctrack only for now)
# --without munge %_without_munge 1 don't build auth-munge RPM
# --with mysql %_with_mysql 1 require mysql support
@@ -43,7 +42,6 @@
%slurm_without_opt bluegene
%slurm_without_opt cray
%slurm_without_opt debug
-%slurm_without_opt elan
%slurm_without_opt sun_const
%slurm_without_opt srun2aprun
@@ -255,16 +253,6 @@ Requires: slurm
SLURM plugin interfaces to IBM Blue Gene system
%endif
-%if %{slurm_with elan}
-%package switch-elan
-Summary: SLURM switch plugin for Quadrics Elan3 or Elan4.
-Group: System Environment/Base
-Requires: slurm qsnetlibs
-BuildRequires: qsnetlibs
-%description switch-elan
-SLURM switch plugin for Quadrics Elan3 or Elan4.
-%endif
-
%package slurmdbd
Summary: SLURM database daemon
Group: System Environment/Base
@@ -316,13 +304,13 @@ Wrappers to write directly to the slurmdb.
%if %{slurm_with aix}
%package aix
-Summary: SLURM interfaces to IBM AIX and Federation switch.
+Summary: SLURM interfaces to IBM AIX.
Group: System Environment/Base
Requires: slurm
BuildRequires: proctrack >= 3
Obsoletes: slurm-aix-federation
%description aix
-SLURM plugins for IBM AIX and Federation switch.
+SLURM plugins for IBM AIX.
%endif
%if %{slurm_with percs}
@@ -497,10 +485,6 @@ test -f $RPM_BUILD_ROOT/etc/init.d/slurm &&
test -f $RPM_BUILD_ROOT/%{_bindir}/sview &&
echo %{_bindir}/sview >> $LIST
-%if %{slurm_with aix}
-install -D -m644 etc/federation.conf.example ${RPM_BUILD_ROOT}%{_sysconfdir}/federation.conf.example
-%endif
-
%if %{slurm_with bluegene}
install -D -m644 etc/bluegene.conf.example ${RPM_BUILD_ROOT}%{_sysconfdir}/bluegene.conf.example
mkdir -p ${RPM_BUILD_ROOT}/etc/ld.so.conf.d
@@ -522,8 +506,6 @@ LIST=./aix.files
touch $LIST
test -f $RPM_BUILD_ROOT/%{_libdir}/slurm/proctrack_aix.so &&
echo %{_libdir}/slurm/proctrack_aix.so >> $LIST
-test -f $RPM_BUILD_ROOT/%{_libdir}/slurm/switch_federation.so &&
- echo %{_libdir}/slurm/switch_federation.so >> $LIST
LIST=./percs.files
touch $LIST
@@ -691,14 +673,6 @@ rm -rf $RPM_BUILD_ROOT
#############################################################################
-%if %{slurm_with elan}
-%files switch-elan
-%defattr(-,root,root)
-%{_libdir}/slurm/switch_elan.so
-%{_libdir}/slurm/proctrack_rms.so
-%endif
-#############################################################################
-
%files -f slurmdbd.files slurmdbd
%defattr(-,root,root)
%{_sbindir}/slurmdbd
@@ -798,7 +772,6 @@ rm -rf $RPM_BUILD_ROOT
%files -f aix.files aix
%defattr(-,root,root)
%{_libdir}/slurm/checkpoint_aix.so
-%config %{_sysconfdir}/federation.conf.example
%endif
#############################################################################
diff --git a/src/Makefile.in b/src/Makefile.in
index c3e4f2c56d55d797b73dcbd97a90d7bded30ef8f..eca6190150065db0906a8db9b0c7b180eb586dcc 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -55,9 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -168,9 +166,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -178,8 +174,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/api/Makefile.in b/src/api/Makefile.in
index f98499df4f65113f459b6b4507216353bd45f687..207f94523e6fcc773e77dc42563664b9d8921cf9 100644
--- a/src/api/Makefile.in
+++ b/src/api/Makefile.in
@@ -59,9 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -199,10 +197,8 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
# This is needed if compiling on windows
EXEEXT =
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -210,8 +206,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/common/Makefile.in b/src/common/Makefile.in
index 047ede3ed971779a48905cb6acbe22517b7262b0..50ad32a7efc333ee89543981b95c8acdb2ecfc6e 100644
--- a/src/common/Makefile.in
+++ b/src/common/Makefile.in
@@ -67,9 +67,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -244,10 +242,8 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
# This is needed if compiling on windows
EXEEXT =
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -255,8 +251,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/database/Makefile.in b/src/database/Makefile.in
index 550eea5d0d3039990d158cb1ebb464022f8d0f81..5a7b8c6c1c20a87e09a9c38a30b32763642462bf 100644
--- a/src/database/Makefile.in
+++ b/src/database/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -175,9 +173,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -185,8 +181,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/db_api/Makefile.in b/src/db_api/Makefile.in
index 9a278cf0d5fbceba34578726fe69fb2de8f328c2..0d20a7ab980df1c78e2c82859f95493b767ce5ea 100644
--- a/src/db_api/Makefile.in
+++ b/src/db_api/Makefile.in
@@ -59,9 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -184,10 +182,8 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
# This is needed if compiling on windows
EXEEXT =
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -195,8 +191,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/Makefile.in b/src/plugins/Makefile.in
index de008c24ebd43396d20b9a4fede4888d3f080ab9..e31a702b65fcb2197024da554553ae1c99a7edef 100644
--- a/src/plugins/Makefile.in
+++ b/src/plugins/Makefile.in
@@ -53,9 +53,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -163,9 +161,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -173,8 +169,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/accounting_storage/Makefile.in b/src/plugins/accounting_storage/Makefile.in
index 022a19269e65e2594e94e0b788a56eee9a67dcc2..b80cf1d6797575f93778143a5e0e614dca78c9ac 100644
--- a/src/plugins/accounting_storage/Makefile.in
+++ b/src/plugins/accounting_storage/Makefile.in
@@ -55,9 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -165,9 +163,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -175,8 +171,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/accounting_storage/common/Makefile.in b/src/plugins/accounting_storage/common/Makefile.in
index c31391378bd2e30208bb448c3ff701762b98e872..f203cea7f6b3355ab4a567d7862e02d71ca72f8e 100644
--- a/src/plugins/accounting_storage/common/Makefile.in
+++ b/src/plugins/accounting_storage/common/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -146,9 +144,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -156,8 +152,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/accounting_storage/filetxt/Makefile.in b/src/plugins/accounting_storage/filetxt/Makefile.in
index 40304492d5601bdc65a9145feb23f08c95fd9708..ad3e1b97b619904d1e1b01d92c771941961cb34f 100644
--- a/src/plugins/accounting_storage/filetxt/Makefile.in
+++ b/src/plugins/accounting_storage/filetxt/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -173,9 +171,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -183,8 +179,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/accounting_storage/mysql/Makefile.in b/src/plugins/accounting_storage/mysql/Makefile.in
index b8da21928f69d51b4bc274205b27894f430b0ecc..8159f3b01809e3160f38444e36cef6ddb032f090 100644
--- a/src/plugins/accounting_storage/mysql/Makefile.in
+++ b/src/plugins/accounting_storage/mysql/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -223,9 +221,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -233,8 +229,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/accounting_storage/none/Makefile.in b/src/plugins/accounting_storage/none/Makefile.in
index da4f7fa55b27da0eda9788fe3ab952685d38ef96..852d50fc2ae70e0dcc2afe41b08471ee91dc6f43 100644
--- a/src/plugins/accounting_storage/none/Makefile.in
+++ b/src/plugins/accounting_storage/none/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -172,9 +170,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -182,8 +178,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/accounting_storage/pgsql/Makefile.in b/src/plugins/accounting_storage/pgsql/Makefile.in
index eb667badbb7e51741e763fe898ed7231b80215e4..6cb9dd6c8f36d66aa216d7eb82422f4e1beca636 100644
--- a/src/plugins/accounting_storage/pgsql/Makefile.in
+++ b/src/plugins/accounting_storage/pgsql/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -218,9 +216,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -228,8 +224,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/accounting_storage/slurmdbd/Makefile.in b/src/plugins/accounting_storage/slurmdbd/Makefile.in
index 26be8982299ede5faeebd1a114aaeb93160e9798..3e95916d4163bb9aa91a5040a9b4991d1985193b 100644
--- a/src/plugins/accounting_storage/slurmdbd/Makefile.in
+++ b/src/plugins/accounting_storage/slurmdbd/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -173,9 +171,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -183,8 +179,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/auth/Makefile.in b/src/plugins/auth/Makefile.in
index 2e2bf3d0a71484e72a1d30488cdf3e74536e1768..4858c0cf919aa3c85ed1abfce91381a361bfa598 100644
--- a/src/plugins/auth/Makefile.in
+++ b/src/plugins/auth/Makefile.in
@@ -55,9 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -165,9 +163,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -175,8 +171,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/auth/authd/Makefile.in b/src/plugins/auth/authd/Makefile.in
index 64d654c54ea974869749668fa87cedb0f95103eb..34fa1ed67dc5083846eaed21a26d1e2ecebaacb1 100644
--- a/src/plugins/auth/authd/Makefile.in
+++ b/src/plugins/auth/authd/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -171,9 +169,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -181,8 +177,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/auth/munge/Makefile.in b/src/plugins/auth/munge/Makefile.in
index 827ddb8451cb7e0375e5359124a940250f0fd98f..516b70defc1abbaf08663b3e5974edb2a3df9d93 100644
--- a/src/plugins/auth/munge/Makefile.in
+++ b/src/plugins/auth/munge/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -172,9 +170,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -182,8 +178,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/auth/none/Makefile.in b/src/plugins/auth/none/Makefile.in
index 7688bb51ab7ae5a7eecb2793e669d93740010fa7..d7a7385c0ba16ddf43924a52ef4a890fb458669c 100644
--- a/src/plugins/auth/none/Makefile.in
+++ b/src/plugins/auth/none/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -170,9 +168,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -180,8 +176,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/checkpoint/Makefile.in b/src/plugins/checkpoint/Makefile.in
index dcbb80e38376d46654f26476eeef962dc2152af0..76951b4124750a9db107bd362d92525408a4688f 100644
--- a/src/plugins/checkpoint/Makefile.in
+++ b/src/plugins/checkpoint/Makefile.in
@@ -55,9 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -165,9 +163,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -175,8 +171,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/checkpoint/aix/Makefile.in b/src/plugins/checkpoint/aix/Makefile.in
index cad1526ba1f8d1322fd4207934d5c0a6b22c0cea..da459bbc38d1598edd0d0bb517243153b703054b 100644
--- a/src/plugins/checkpoint/aix/Makefile.in
+++ b/src/plugins/checkpoint/aix/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -175,9 +173,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -185,8 +181,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/checkpoint/blcr/Makefile.in b/src/plugins/checkpoint/blcr/Makefile.in
index 38535cfa0f154e002d02867b9ae8a649e4fe8f9d..0ccd076763a5ca9240e7d6383d26730003ba8ec4 100644
--- a/src/plugins/checkpoint/blcr/Makefile.in
+++ b/src/plugins/checkpoint/blcr/Makefile.in
@@ -59,9 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -181,9 +179,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -191,8 +187,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/checkpoint/none/Makefile.in b/src/plugins/checkpoint/none/Makefile.in
index de8e3da9c8689ca1b04a83107a3c089257749cb1..8992394b68ed1f70b4d7d29d4872dc85302200a1 100644
--- a/src/plugins/checkpoint/none/Makefile.in
+++ b/src/plugins/checkpoint/none/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -170,9 +168,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -180,8 +176,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/checkpoint/ompi/Makefile.in b/src/plugins/checkpoint/ompi/Makefile.in
index 7c42d6d8560606750f1c52a38f7d2a53eda8a6e8..f915d9f10297ffe28d881e41df1efa57d15a3ad4 100644
--- a/src/plugins/checkpoint/ompi/Makefile.in
+++ b/src/plugins/checkpoint/ompi/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -170,9 +168,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -180,8 +176,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/crypto/Makefile.in b/src/plugins/crypto/Makefile.in
index db49f318aa7c6daa33b93ea113e0aef7e3073187..483ccab883dbe7d5e33acf0f6a999cb91f686363 100644
--- a/src/plugins/crypto/Makefile.in
+++ b/src/plugins/crypto/Makefile.in
@@ -55,9 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -165,9 +163,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -175,8 +171,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/crypto/munge/Makefile.in b/src/plugins/crypto/munge/Makefile.in
index c6671e3f03319828024e3d673c3a67e27030209a..c5e4942757d6bfc17a9219148e5139c8817dc97e 100644
--- a/src/plugins/crypto/munge/Makefile.in
+++ b/src/plugins/crypto/munge/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -172,9 +170,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -182,8 +178,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/crypto/openssl/Makefile.in b/src/plugins/crypto/openssl/Makefile.in
index 018df070a1f7321f5105a61a5170faaa6d3a3e2e..a8fcb1164cd9baf223f20c6a6c04ec20a4ae84a9 100644
--- a/src/plugins/crypto/openssl/Makefile.in
+++ b/src/plugins/crypto/openssl/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -177,9 +175,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -187,8 +183,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/gres/Makefile.in b/src/plugins/gres/Makefile.in
index f406e857ca04b65c18e860de5a4377aa4d58b399..645dac0da16cb36cec64b9826a408f1cb6d3a59f 100644
--- a/src/plugins/gres/Makefile.in
+++ b/src/plugins/gres/Makefile.in
@@ -55,9 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -165,9 +163,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -175,8 +171,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/gres/gpu/Makefile.in b/src/plugins/gres/gpu/Makefile.in
index c3659710681bc3908d9c17fe73df77cda052e803..3bef6c68cb367eb59e0b6633f24ae0de8df8493d 100644
--- a/src/plugins/gres/gpu/Makefile.in
+++ b/src/plugins/gres/gpu/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -171,9 +169,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -181,8 +177,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/gres/nic/Makefile.in b/src/plugins/gres/nic/Makefile.in
index 023eb8031141756627d76289ed83d21c9eeec7bf..c8666446e4978bc815447b9f18f4d9fe5ba90d54 100644
--- a/src/plugins/gres/nic/Makefile.in
+++ b/src/plugins/gres/nic/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -171,9 +169,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -181,8 +177,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/job_submit/Makefile.in b/src/plugins/job_submit/Makefile.in
index 8771acc4e6a2ce9da2fbd5203cda3ca18df70f02..a0f4e1028d8c33d3930db76690b360a13394ff2b 100644
--- a/src/plugins/job_submit/Makefile.in
+++ b/src/plugins/job_submit/Makefile.in
@@ -55,9 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -165,9 +163,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -175,8 +171,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/job_submit/cnode/Makefile.in b/src/plugins/job_submit/cnode/Makefile.in
index 769c77a16d6cbdf21e3b64883b566817aa1672d1..cdaf4da783209654fd09a1a5c2b00b553b06a69e 100644
--- a/src/plugins/job_submit/cnode/Makefile.in
+++ b/src/plugins/job_submit/cnode/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -170,9 +168,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -180,8 +176,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/job_submit/defaults/Makefile.in b/src/plugins/job_submit/defaults/Makefile.in
index 3294f5f2e8b3c0f92497167a9c314ba1e0040c2f..274e85c93157520e049bc9d4a135993711685c8f 100644
--- a/src/plugins/job_submit/defaults/Makefile.in
+++ b/src/plugins/job_submit/defaults/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -170,9 +168,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -180,8 +176,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/job_submit/logging/Makefile.in b/src/plugins/job_submit/logging/Makefile.in
index 8a50b8c4ddd86b429b12330dd14ce7def8826ced..330343c378a2a6abfa243786bf48617691f1ea68 100644
--- a/src/plugins/job_submit/logging/Makefile.in
+++ b/src/plugins/job_submit/logging/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -170,9 +168,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -180,8 +176,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/job_submit/lua/Makefile.in b/src/plugins/job_submit/lua/Makefile.in
index 0b6cd5f7acfce66fe3952c127cef2da8c8a79676..e1594dbc82ae38b03a65c14c4ea734175509366d 100644
--- a/src/plugins/job_submit/lua/Makefile.in
+++ b/src/plugins/job_submit/lua/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -175,9 +173,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -185,8 +181,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/job_submit/partition/Makefile.in b/src/plugins/job_submit/partition/Makefile.in
index 138fab2d2b2b4644f7ff6844993fae11e6586846..85071cc1275d50a85a0d61e4777acc3f06365837 100644
--- a/src/plugins/job_submit/partition/Makefile.in
+++ b/src/plugins/job_submit/partition/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -171,9 +169,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -181,8 +177,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/jobacct_gather/Makefile.in b/src/plugins/jobacct_gather/Makefile.in
index 384b3e7e68e59abae201004a7812d487b9827bd0..bff74cf1c0b690c7b960d640863ce7ffd378f30e 100644
--- a/src/plugins/jobacct_gather/Makefile.in
+++ b/src/plugins/jobacct_gather/Makefile.in
@@ -55,9 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -165,9 +163,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -175,8 +171,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/jobacct_gather/aix/Makefile.in b/src/plugins/jobacct_gather/aix/Makefile.in
index b2148bf837fb9ca3b93b62cbce56778bdff0fa1f..bdd6757a344adeae1d5e6bb8f41f18a48c061160 100644
--- a/src/plugins/jobacct_gather/aix/Makefile.in
+++ b/src/plugins/jobacct_gather/aix/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -170,9 +168,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -180,8 +176,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/jobacct_gather/linux/Makefile.in b/src/plugins/jobacct_gather/linux/Makefile.in
index 878f78f4518116ac5410782d8abceba3d2cb8d05..7ffbd0920fcc0cb76c9edb352fd73c6ff2c06bdd 100644
--- a/src/plugins/jobacct_gather/linux/Makefile.in
+++ b/src/plugins/jobacct_gather/linux/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -171,9 +169,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -181,8 +177,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/jobacct_gather/none/Makefile.in b/src/plugins/jobacct_gather/none/Makefile.in
index df125354b374cb7c0dba0d6f86a1ac78c46a1f53..1fc8386a326695e69fce5c35fee8851dd6a50f29 100644
--- a/src/plugins/jobacct_gather/none/Makefile.in
+++ b/src/plugins/jobacct_gather/none/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -170,9 +168,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -180,8 +176,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/jobcomp/Makefile.in b/src/plugins/jobcomp/Makefile.in
index e6fb03418af757a7b97a5ff9aa31c57eea3e7821..3d3bd743557e3c666017691d769e35bac66dffe2 100644
--- a/src/plugins/jobcomp/Makefile.in
+++ b/src/plugins/jobcomp/Makefile.in
@@ -55,9 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -165,9 +163,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -175,8 +171,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/jobcomp/filetxt/Makefile.in b/src/plugins/jobcomp/filetxt/Makefile.in
index 408b7cba1740bd01ff7379af9d45761b711f45bb..b5e34e05ff56ff4ed7269af448f39bf0fde4d8f4 100644
--- a/src/plugins/jobcomp/filetxt/Makefile.in
+++ b/src/plugins/jobcomp/filetxt/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -171,9 +169,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -181,8 +177,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/jobcomp/mysql/Makefile.in b/src/plugins/jobcomp/mysql/Makefile.in
index 9297582fa0613d196203ea40f11075a1d5ba94fc..577cc6d18f8a4576695774047a89eb918c92188a 100644
--- a/src/plugins/jobcomp/mysql/Makefile.in
+++ b/src/plugins/jobcomp/mysql/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -179,9 +177,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -189,8 +185,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/jobcomp/none/Makefile.in b/src/plugins/jobcomp/none/Makefile.in
index 6bcd69ac1de656b9446e50a215f1d591a66171ac..677c3937ae9190451c5b7e3cc9ac338ca492acb8 100644
--- a/src/plugins/jobcomp/none/Makefile.in
+++ b/src/plugins/jobcomp/none/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -170,9 +168,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -180,8 +176,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/jobcomp/pgsql/Makefile.in b/src/plugins/jobcomp/pgsql/Makefile.in
index 071995bd0e0027f194754040ebca2b8d7a7b65fc..acf9f1a409853adfeca60020bbc24e77cb30f450 100644
--- a/src/plugins/jobcomp/pgsql/Makefile.in
+++ b/src/plugins/jobcomp/pgsql/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -179,9 +177,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -189,8 +185,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/jobcomp/script/Makefile.in b/src/plugins/jobcomp/script/Makefile.in
index 3dc0f8298339f34d4a46979923f1fa16c984ea6f..797ce531d62b25ab16489bf1fc193383201cdffa 100644
--- a/src/plugins/jobcomp/script/Makefile.in
+++ b/src/plugins/jobcomp/script/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -170,9 +168,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -180,8 +176,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/mpi/Makefile.in b/src/plugins/mpi/Makefile.in
index c684d9403e45d05fc40dbfadfb6534c7e4c64c34..9d105d01661a4679a437403154ec8bf48202fa32 100644
--- a/src/plugins/mpi/Makefile.in
+++ b/src/plugins/mpi/Makefile.in
@@ -55,9 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -165,9 +163,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -175,8 +171,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/mpi/lam/Makefile.in b/src/plugins/mpi/lam/Makefile.in
index ef2485b14b2d83f58bb9a804222cb041bf21e487..2893fd96ded15f37bc875ef31183a923e2932302 100644
--- a/src/plugins/mpi/lam/Makefile.in
+++ b/src/plugins/mpi/lam/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -170,9 +168,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -180,8 +176,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/mpi/mpich1_p4/Makefile.in b/src/plugins/mpi/mpich1_p4/Makefile.in
index f4ec9c4ed46e749308b67e1fb998da81c50402a5..2502a9e42fa0a162a6b8964664256ffca63ad4da 100644
--- a/src/plugins/mpi/mpich1_p4/Makefile.in
+++ b/src/plugins/mpi/mpich1_p4/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -170,9 +168,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -180,8 +176,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/mpi/mpich1_shmem/Makefile.in b/src/plugins/mpi/mpich1_shmem/Makefile.in
index fee21f5640667d9b2d39c27675b48ebf0ff01285..48092fdac78423b127dbfd9280faf04d296d75f8 100644
--- a/src/plugins/mpi/mpich1_shmem/Makefile.in
+++ b/src/plugins/mpi/mpich1_shmem/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -170,9 +168,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -180,8 +176,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/mpi/mpichgm/Makefile.in b/src/plugins/mpi/mpichgm/Makefile.in
index b5dbe97a34b7bcdc57609c3f9e95700c2e1338d7..6d32862cc22fbf88c1828024c40b20485662cda3 100644
--- a/src/plugins/mpi/mpichgm/Makefile.in
+++ b/src/plugins/mpi/mpichgm/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -170,9 +168,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -180,8 +176,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/mpi/mpichmx/Makefile.in b/src/plugins/mpi/mpichmx/Makefile.in
index 7ca8e38a4273b848c9248f51d44580d7c09b0f15..d53825c5301bf727318e8cf62f96b4d49525c05c 100644
--- a/src/plugins/mpi/mpichmx/Makefile.in
+++ b/src/plugins/mpi/mpichmx/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -170,9 +168,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -180,8 +176,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/mpi/mvapich/Makefile.in b/src/plugins/mpi/mvapich/Makefile.in
index be0c50543e05df6224f0949cb0e68299b3ce5fd6..84679fb578d31d757bd3cd9e952a5a70f16670a1 100644
--- a/src/plugins/mpi/mvapich/Makefile.in
+++ b/src/plugins/mpi/mvapich/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -170,9 +168,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -180,8 +176,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/mpi/none/Makefile.in b/src/plugins/mpi/none/Makefile.in
index 54762b3509ba9089947896105590e1fdd5c4f8c4..1bededfb48790a5c521b31c9e66ce2dc8a9fcc24 100644
--- a/src/plugins/mpi/none/Makefile.in
+++ b/src/plugins/mpi/none/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -170,9 +168,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -180,8 +176,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/mpi/openmpi/Makefile.in b/src/plugins/mpi/openmpi/Makefile.in
index dc0ce62a98df4354535ea5e967d6020c9dd4f25b..8a349c84609db5d722e759bcfa5d8a8b1101c6fd 100644
--- a/src/plugins/mpi/openmpi/Makefile.in
+++ b/src/plugins/mpi/openmpi/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -170,9 +168,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -180,8 +176,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/preempt/Makefile.in b/src/plugins/preempt/Makefile.in
index e7f37ba762629ad86bd8d0177c0a0fe199940a51..b5da19a9a7a67dffd5486c82f076e88821855246 100644
--- a/src/plugins/preempt/Makefile.in
+++ b/src/plugins/preempt/Makefile.in
@@ -55,9 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -165,9 +163,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -175,8 +171,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/preempt/none/Makefile.in b/src/plugins/preempt/none/Makefile.in
index 7b416f0e9916bc980f699e7274e3f5ad08390b42..8916c7a2502a1ceebdbb8e2d50226fc2bd1b86f6 100644
--- a/src/plugins/preempt/none/Makefile.in
+++ b/src/plugins/preempt/none/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -170,9 +168,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -180,8 +176,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/preempt/partition_prio/Makefile.in b/src/plugins/preempt/partition_prio/Makefile.in
index 8f7d8e2395ccd86730e396eaef6bb6e8169f083b..d771dbf2f5659a1de9330416b761e25542e19377 100644
--- a/src/plugins/preempt/partition_prio/Makefile.in
+++ b/src/plugins/preempt/partition_prio/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -172,9 +170,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -182,8 +178,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/preempt/qos/Makefile.in b/src/plugins/preempt/qos/Makefile.in
index 6b4c72090eb9c86e7b0687d5215a799b5260af51..f36e4dfa96a9d4d61072ceb770f61b1b12f0ad9a 100644
--- a/src/plugins/preempt/qos/Makefile.in
+++ b/src/plugins/preempt/qos/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -170,9 +168,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -180,8 +176,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/priority/Makefile.in b/src/plugins/priority/Makefile.in
index 3976ed4038cc5fd6b76970c7c719a706841062b2..adc8185fb65c101efaebdecbe18a0bb24c6ba768 100644
--- a/src/plugins/priority/Makefile.in
+++ b/src/plugins/priority/Makefile.in
@@ -53,9 +53,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -163,9 +161,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -173,8 +169,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/priority/basic/Makefile.in b/src/plugins/priority/basic/Makefile.in
index 952f33683962a88233d14a0ba81c7b7fc920f174..92773ce97e585dc84512bd294771ca33767728de 100644
--- a/src/plugins/priority/basic/Makefile.in
+++ b/src/plugins/priority/basic/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -170,9 +168,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -180,8 +176,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/priority/multifactor/Makefile.in b/src/plugins/priority/multifactor/Makefile.in
index caf1f62bc100ec3974003516cfe5e35a9d9d04d6..eafb83976537fd8a31a15b3aff0b56a71968ae96 100644
--- a/src/plugins/priority/multifactor/Makefile.in
+++ b/src/plugins/priority/multifactor/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -171,9 +169,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -181,8 +177,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/proctrack/Makefile.am b/src/plugins/proctrack/Makefile.am
index b08bac6b41d97926552de6470757270e198cbec8..dc470537149d3f56ed0df7533f46744581bb9e08 100644
--- a/src/plugins/proctrack/Makefile.am
+++ b/src/plugins/proctrack/Makefile.am
@@ -12,4 +12,4 @@ if HAVE_LUA
LUA = lua
endif
-SUBDIRS = $(AIX_PROCTRACK) $(SGI_JOB) $(LUA) pgid linuxproc rms cgroup
+SUBDIRS = $(AIX_PROCTRACK) $(SGI_JOB) $(LUA) pgid linuxproc cgroup
diff --git a/src/plugins/proctrack/Makefile.in b/src/plugins/proctrack/Makefile.in
index 0f111fef44c3f228ebc04560ffed805dc79d37f9..ec48168a10032ec4112cab6b93642cdf3fee5525 100644
--- a/src/plugins/proctrack/Makefile.in
+++ b/src/plugins/proctrack/Makefile.in
@@ -55,9 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -99,7 +97,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
distdir
ETAGS = etags
CTAGS = ctags
-DIST_SUBDIRS = aix sgi_job lua pgid linuxproc rms cgroup
+DIST_SUBDIRS = aix sgi_job lua pgid linuxproc cgroup
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
dir0=`pwd`; \
@@ -165,9 +163,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -175,8 +171,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
@@ -332,7 +326,7 @@ top_srcdir = @top_srcdir@
@HAVE_AIX_PROCTRACK_TRUE@AIX_PROCTRACK = aix
@HAVE_SGI_JOB_TRUE@SGI_JOB = sgi_job
@HAVE_LUA_TRUE@LUA = lua
-SUBDIRS = $(AIX_PROCTRACK) $(SGI_JOB) $(LUA) pgid linuxproc rms cgroup
+SUBDIRS = $(AIX_PROCTRACK) $(SGI_JOB) $(LUA) pgid linuxproc cgroup
all: all-recursive
.SUFFIXES:
diff --git a/src/plugins/proctrack/aix/Makefile.in b/src/plugins/proctrack/aix/Makefile.in
index 0f593f2bb807bbf8d44b444c7464c726e791c597..243e13aa02ba3c5ca802e9a051abb6a540c6153f 100644
--- a/src/plugins/proctrack/aix/Makefile.in
+++ b/src/plugins/proctrack/aix/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -170,9 +168,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -180,8 +176,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/proctrack/cgroup/Makefile.in b/src/plugins/proctrack/cgroup/Makefile.in
index 1ed20cb9f927c8a256fda4557f8dc3f7e27c18c1..71abfc691efd27a03f0a7a225f77fe9382fd41f5 100644
--- a/src/plugins/proctrack/cgroup/Makefile.in
+++ b/src/plugins/proctrack/cgroup/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -170,9 +168,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -180,8 +176,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/proctrack/linuxproc/Makefile.in b/src/plugins/proctrack/linuxproc/Makefile.in
index 2fb83382b5d22c666cb91bbb5fe96923c68c7a37..815bdcf054452cab75abb19c95c80d8ac1b04fe4 100644
--- a/src/plugins/proctrack/linuxproc/Makefile.in
+++ b/src/plugins/proctrack/linuxproc/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -171,9 +169,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -181,8 +177,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/proctrack/lua/Makefile.in b/src/plugins/proctrack/lua/Makefile.in
index 64bb1e9b3bdd73fe136443be44a888ceac14dcdb..5c9286a7dcdc1e2b12b283a44f0ec4d7b8c34480 100644
--- a/src/plugins/proctrack/lua/Makefile.in
+++ b/src/plugins/proctrack/lua/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -170,9 +168,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -180,8 +176,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/proctrack/pgid/Makefile.in b/src/plugins/proctrack/pgid/Makefile.in
index 643a6433b3479601e9f90264593e66ac42ec5c34..914a94466c1ba20396cb9780cdfada649369004e 100644
--- a/src/plugins/proctrack/pgid/Makefile.in
+++ b/src/plugins/proctrack/pgid/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -170,9 +168,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -180,8 +176,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/proctrack/rms/Makefile.am b/src/plugins/proctrack/rms/Makefile.am
deleted file mode 100644
index 4dc679c0115e133c1e907e68e5a4bc759f414824..0000000000000000000000000000000000000000
--- a/src/plugins/proctrack/rms/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-# Makefile for proctrack/aix plugin
-
-AUTOMAKE_OPTIONS = foreign
-
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
-
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
-
-if HAVE_ELAN
-pkglib_LTLIBRARIES = proctrack_rms.la
-else
-pkglib_LTLIBRARIES =
-endif
-
-proctrack_rms_la_SOURCES = proctrack_rms.c
-proctrack_rms_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
-proctrack_rms_la_LIBADD = -lrmscall
diff --git a/src/plugins/proctrack/rms/Makefile.in b/src/plugins/proctrack/rms/Makefile.in
deleted file mode 100644
index fa22855a80610e18170298ccc903dd59fad5e6cc..0000000000000000000000000000000000000000
--- a/src/plugins/proctrack/rms/Makefile.in
+++ /dev/null
@@ -1,653 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# Makefile for proctrack/aix plugin
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-subdir = src/plugins/proctrack/rms
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
- $(top_srcdir)/auxdir/libtool.m4 \
- $(top_srcdir)/auxdir/ltoptions.m4 \
- $(top_srcdir)/auxdir/ltsugar.m4 \
- $(top_srcdir)/auxdir/ltversion.m4 \
- $(top_srcdir)/auxdir/lt~obsolete.m4 \
- $(top_srcdir)/auxdir/slurm.m4 \
- $(top_srcdir)/auxdir/x_ac__system_configuration.m4 \
- $(top_srcdir)/auxdir/x_ac_affinity.m4 \
- $(top_srcdir)/auxdir/x_ac_aix.m4 \
- $(top_srcdir)/auxdir/x_ac_blcr.m4 \
- $(top_srcdir)/auxdir/x_ac_bluegene.m4 \
- $(top_srcdir)/auxdir/x_ac_cflags.m4 \
- $(top_srcdir)/auxdir/x_ac_cray.m4 \
- $(top_srcdir)/auxdir/x_ac_databases.m4 \
- $(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
- $(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
- $(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
- $(top_srcdir)/auxdir/x_ac_hwloc.m4 \
- $(top_srcdir)/auxdir/x_ac_iso.m4 \
- $(top_srcdir)/auxdir/x_ac_lua.m4 \
- $(top_srcdir)/auxdir/x_ac_man2html.m4 \
- $(top_srcdir)/auxdir/x_ac_munge.m4 \
- $(top_srcdir)/auxdir/x_ac_ncurses.m4 \
- $(top_srcdir)/auxdir/x_ac_nrt.m4 \
- $(top_srcdir)/auxdir/x_ac_pam.m4 \
- $(top_srcdir)/auxdir/x_ac_printf_null.m4 \
- $(top_srcdir)/auxdir/x_ac_ptrace.m4 \
- $(top_srcdir)/auxdir/x_ac_readline.m4 \
- $(top_srcdir)/auxdir/x_ac_setpgrp.m4 \
- $(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
- $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
- $(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
- $(top_srcdir)/auxdir/x_ac_srun.m4 \
- $(top_srcdir)/auxdir/x_ac_sun_const.m4 \
- $(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/slurm/slurm.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
- for p in $$list; do echo "$$p $$p"; done | \
- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
- if (++n[$$2] == $(am__install_max)) \
- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
- END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(pkglibdir)"
-LTLIBRARIES = $(pkglib_LTLIBRARIES)
-proctrack_rms_la_DEPENDENCIES =
-am_proctrack_rms_la_OBJECTS = proctrack_rms.lo
-proctrack_rms_la_OBJECTS = $(am_proctrack_rms_la_OBJECTS)
-proctrack_rms_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(proctrack_rms_la_LDFLAGS) $(LDFLAGS) -o $@
-@HAVE_ELAN_TRUE@am_proctrack_rms_la_rpath = -rpath $(pkglibdir)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/slurm
-depcomp = $(SHELL) $(top_srcdir)/auxdir/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
-SOURCES = $(proctrack_rms_la_SOURCES)
-DIST_SOURCES = $(proctrack_rms_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTHD_CFLAGS = @AUTHD_CFLAGS@
-AUTHD_LIBS = @AUTHD_LIBS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BGL_LOADED = @BGL_LOADED@
-BGQ_LOADED = @BGQ_LOADED@
-BG_INCLUDES = @BG_INCLUDES@
-BG_LDFLAGS = @BG_LDFLAGS@
-BG_L_P_LOADED = @BG_L_P_LOADED@
-BLCR_CPPFLAGS = @BLCR_CPPFLAGS@
-BLCR_HOME = @BLCR_HOME@
-BLCR_LDFLAGS = @BLCR_LDFLAGS@
-BLCR_LIBS = @BLCR_LIBS@
-BLUEGENE_LOADED = @BLUEGENE_LOADED@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CMD_LDFLAGS = @CMD_LDFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
-EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
-FGREP = @FGREP@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
-HAVEPGCONFIG = @HAVEPGCONFIG@
-HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
-HAVE_MAN2HTML = @HAVE_MAN2HTML@
-HAVE_NRT = @HAVE_NRT@
-HAVE_OPENSSL = @HAVE_OPENSSL@
-HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
-HWLOC_CPPFLAGS = @HWLOC_CPPFLAGS@
-HWLOC_LDFLAGS = @HWLOC_LDFLAGS@
-HWLOC_LIBS = @HWLOC_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIB_LDFLAGS = @LIB_LDFLAGS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
-MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
-MUNGE_LIBS = @MUNGE_LIBS@
-MYSQL_CFLAGS = @MYSQL_CFLAGS@
-MYSQL_LIBS = @MYSQL_LIBS@
-NCURSES = @NCURSES@
-NM = @NM@
-NMEDIT = @NMEDIT@
-NRT_CPPFLAGS = @NRT_CPPFLAGS@
-NRT_LDFLAGS = @NRT_LDFLAGS@
-NUMA_LIBS = @NUMA_LIBS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PAM_DIR = @PAM_DIR@
-PAM_LIBS = @PAM_LIBS@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PGSQL_CFLAGS = @PGSQL_CFLAGS@
-PGSQL_LIBS = @PGSQL_LIBS@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PROCTRACKDIR = @PROCTRACKDIR@
-PROJECT = @PROJECT@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-READLINE_LIBS = @READLINE_LIBS@
-REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
-RELEASE = @RELEASE@
-RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
-SED = @SED@
-SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
-SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SLURMCTLD_PORT = @SLURMCTLD_PORT@
-SLURMCTLD_PORT_COUNT = @SLURMCTLD_PORT_COUNT@
-SLURMDBD_PORT = @SLURMDBD_PORT@
-SLURMD_PORT = @SLURMD_PORT@
-SLURM_API_AGE = @SLURM_API_AGE@
-SLURM_API_CURRENT = @SLURM_API_CURRENT@
-SLURM_API_MAJOR = @SLURM_API_MAJOR@
-SLURM_API_REVISION = @SLURM_API_REVISION@
-SLURM_API_VERSION = @SLURM_API_VERSION@
-SLURM_MAJOR = @SLURM_MAJOR@
-SLURM_MICRO = @SLURM_MICRO@
-SLURM_MINOR = @SLURM_MINOR@
-SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
-SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
-SO_LDFLAGS = @SO_LDFLAGS@
-SSL_CPPFLAGS = @SSL_CPPFLAGS@
-SSL_LDFLAGS = @SSL_LDFLAGS@
-SSL_LIBS = @SSL_LIBS@
-STRIP = @STRIP@
-UTIL_LIBS = @UTIL_LIBS@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_have_man2html = @ac_have_man2html@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lua_CFLAGS = @lua_CFLAGS@
-lua_LIBS = @lua_LIBS@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
-@HAVE_ELAN_FALSE@pkglib_LTLIBRARIES =
-@HAVE_ELAN_TRUE@pkglib_LTLIBRARIES = proctrack_rms.la
-proctrack_rms_la_SOURCES = proctrack_rms.c
-proctrack_rms_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
-proctrack_rms_la_LIBADD = -lrmscall
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
- && { if test -f $@; then exit 0; else break; fi; }; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/proctrack/rms/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/plugins/proctrack/rms/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
- @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
- list2=; for p in $$list; do \
- if test -f $$p; then \
- list2="$$list2 $$p"; \
- else :; fi; \
- done; \
- test -z "$$list2" || { \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
- }
-
-uninstall-pkglibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
- @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
- for p in $$list; do \
- $(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
- done
-
-clean-pkglibLTLIBRARIES:
- -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
-proctrack_rms.la: $(proctrack_rms_la_OBJECTS) $(proctrack_rms_la_DEPENDENCIES)
- $(proctrack_rms_la_LINK) $(am_proctrack_rms_la_rpath) $(proctrack_rms_la_OBJECTS) $(proctrack_rms_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
- -rm -f *.$(OBJEXT)
-
-distclean-compile:
- -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proctrack_rms.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
- fi
-ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
-
-GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d "$(distdir)/$$file"; then \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
- for dir in "$(DESTDIR)$(pkglibdir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
- mostlyclean-am
-
-distclean: distclean-am
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
- distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-pkglibLTLIBRARIES
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-pkglibLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkglibLTLIBRARIES \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/src/plugins/proctrack/rms/proctrack_rms.c b/src/plugins/proctrack/rms/proctrack_rms.c
deleted file mode 100644
index 6a95962f172029c7dd585cd97d317bac9603b293..0000000000000000000000000000000000000000
--- a/src/plugins/proctrack/rms/proctrack_rms.c
+++ /dev/null
@@ -1,383 +0,0 @@
-/*****************************************************************************\
- * proctrack_rms.c - process tracking via QsNet rms kernel module
- *****************************************************************************
- * Copyright (C) 2005 The Regents of the University of California.
- * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
- * CODE-OCEC-09-009. All rights reserved.
- *
- * This file is part of SLURM, a resource management program.
- * For details, see <http://www.schedmd.com/slurmdocs/>.
- * Please also read the included file: DISCLAIMER.
- *
- * SLURM is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * In addition, as a special exception, the copyright holders give permission
- * to link the code of portions of this program with the OpenSSL library under
- * certain conditions as described in each individual source file, and
- * distribute linked combinations including the two. You must obey the GNU
- * General Public License in all respects for all of the code used other than
- * OpenSSL. If you modify file(s) with this exception, you may extend this
- * exception to your version of the file(s), but you are not obligated to do
- * so. If you do not wish to do so, delete this exception statement from your
- * version. If you delete this exception statement from all source files in
- * the program, then also delete it here.
- *
- * SLURM is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along
- * with SLURM; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-\*****************************************************************************/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#if HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-
-#include <rms/rmscall.h>
-
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include "slurm/slurm.h"
-#include "slurm/slurm_errno.h"
-#include "src/common/log.h"
-#include "src/slurmd/common/proctrack.h"
-
-const char plugin_name[] = "Process tracking for QsNet via the rms module";
-const char plugin_type[] = "proctrack/rms";
-const uint32_t plugin_version = 91;
-
-static int _prg_destructor_fork(void);
-static void _prg_destructor_send(int fd, int prgid);
-
-#define MAX_IDS 512
-
-extern int init (void)
-{
- /* close librmscall's internal fd to /proc/rms/control */
- pthread_atfork(NULL, NULL, rmsmod_fini);
- return SLURM_SUCCESS;
-}
-
-extern int fini (void)
-{
- return SLURM_SUCCESS;
-}
-
-
-/*
- * When proctrack/rms is used in conjunction with switch/elan,
- * slurm_container_plugin_create will not normally create the program
- * description. It just retrieves the prgid created in switch/elan.
- *
- * When the program description cannot be retrieved (switch/elan is not
- * being used, the job step is a batch script, etc.) then rms_prgcreate()
- * is called here.
- */
-extern int slurm_container_plugin_create (slurmd_job_t *job)
-{
- int prgid;
- /*
- * Return a handle to an existing prgid or create a new one
- */
- if (rms_getprgid ((int) job->jmgr_pid, &prgid) < 0) {
- int fd = _prg_destructor_fork();
- /* Use slurmd job-step manager's pid as a unique identifier */
- prgid = job->jmgr_pid;
- if ((rms_prgcreate (prgid, job->uid, 1)) < 0) {
- error ("ptrack/rms: rms_prgcreate: %m");
- _prg_destructor_send(fd, -1);
- return SLURM_ERROR;
- }
- _prg_destructor_send(fd, prgid);
- }
- debug3("proctrack/rms: prgid = %d", prgid);
-
- job->cont_id = (uint64_t)prgid;
- return SLURM_SUCCESS;
-}
-
-extern int slurm_container_plugin_add (slurmd_job_t *job, pid_t pid)
-{
- return SLURM_SUCCESS;
-}
-
-/*
- * slurm_container_plugin_signal assumes that the slurmd jobstep manager
- * is always the last process in the rms program description.
- * No signals are sent to the last process.
- */
-extern int slurm_container_plugin_signal (uint64_t id, int signal)
-{
- pid_t *pids;
- int nids = 0;
- int i;
- int rc;
-
- if (id <= 0)
- return -1;
-
- pids = malloc(MAX_IDS * sizeof(pid_t));
- if (!pids) {
- error("proctrack/rms container signal: malloc failed: %m");
- return -1;
- }
- if ((rc = rms_prginfo((int)id, MAX_IDS, pids, &nids)) < 0) {
- error("proctrack/rms rms_prginfo failed %d: %m", rc);
- free(pids);
- /*
- * Ignore errors, program desc has probably already
- * been cleaned up.
- */
- return -1;
- }
-
- rc = -1;
- for (i = nids-2; i >= 0 ; i--) {
- debug2("proctrack/rms(pid %d) Sending signal %d to process %d",
- getpid(), signal, pids[i]);
- rc &= kill(pids[i], signal);
- debug2(" rc = %d", rc);
- }
- free(pids);
- debug3("proctrack/rms signal container returning %d", rc);
- return rc;
-}
-
-
-/*
- * The switch/elan plugin is really responsible for creating and
- * destroying rms program descriptions. slurm_destroy_container simply
- * returns SLURM_SUCCESS when the program description contains one and
- * only one process, assumed to be the slurmd jobstep manager.
- */
-extern int slurm_container_plugin_destroy (uint64_t id)
-{
- debug2("proctrack/rms: destroying container %"PRIu64"", id);
- if (id == 0)
- return SLURM_SUCCESS;
-
- if (slurm_container_plugin_signal(id, 0) == -1)
- return SLURM_SUCCESS;
-
- return SLURM_ERROR;
-}
-
-
-extern uint64_t slurm_container_plugin_find (pid_t pid)
-{
- int prgid = 0;
-
- if (rms_getprgid ((int) pid, &prgid) < 0)
- return (uint64_t) 0;
- return (uint64_t) prgid;
-}
-
-extern bool slurm_container_plugin_has_pid (uint64_t cont_id, pid_t pid)
-{
- int prgid = 0;
-
- if (rms_getprgid ((int) pid, &prgid) < 0)
- return false;
- if ((uint64_t)prgid != cont_id)
- return false;
-
- return true;
-}
-
-extern int
-slurm_container_plugin_wait(uint64_t cont_id)
-{
- int delay = 1;
-
- if (cont_id == 0 || cont_id == 1) {
- errno = EINVAL;
- return SLURM_ERROR;
- }
-
- /* Spin until the container is empty */
- while (slurm_container_plugin_signal(cont_id, 0) != -1) {
- slurm_container_plugin_signal(cont_id, SIGKILL);
- sleep(delay);
- if (delay < 120) {
- delay *= 2;
- } else {
- error("Unable to destroy container %"PRIu64"", cont_id);
- }
- }
-
- return SLURM_SUCCESS;
-}
-
-/*
- * This module assumes that the slurmstepd (running as root) is always the
- * last process in the rms program description. We do not include
- * the slurmstepd in the list of pids that we return.
- */
-extern int
-slurm_container_plugin_get_pids(uint64_t cont_id, pid_t **pids, int *npids)
-{
- pid_t *p;
- int np;
- int len = 32;
-
- p = xmalloc(len * sizeof(pid_t));
- while(rms_prginfo((int)cont_id, len, p, &np) == -1) {
- if (errno == EINVAL) {
- /* array is too short, double its length */
- len *= 2;
- xrealloc(p, len);
- } else {
- xfree(p);
- *pids = NULL;
- *npids = 0;
- return SLURM_ERROR;
- }
- }
-
- /* Don't include the last pid (slurmstepd) in the list */
- if (np > 0) {
- p[np-1] = 0;
- np--;
- }
-
- *npids = np;
- *pids = p;
-
- return SLURM_SUCCESS;
-}
-
-static void
-_close_all_fd_except(int fd)
-{
- int openmax;
- int i;
-
- openmax = sysconf(_SC_OPEN_MAX);
- for (i = 0; i <= openmax; i++) {
- if (i != fd)
- close(i);
- }
-}
-
-
-/*
- * Fork a child process that waits for a pipe to close, signalling that the
- * parent process has exited. Then call rms_prgdestroy.
- */
-static int
-_prg_destructor_fork(void)
-{
- pid_t pid;
- int fdpair[2];
- int prgid;
- int i;
- int dummy;
-
- if (pipe(fdpair) < 0) {
- error("_prg_destructor_fork: failed creating pipe");
- return -1;
- }
-
- pid = fork();
- if (pid < 0) {
- error("_prg_destructor_fork: failed to fork program destructor");
- } else if (pid > 0) {
- /* parent */
- close(fdpair[0]);
- waitpid(pid, (int *)NULL, 0);
- return fdpair[1];
- }
-
- /****************************************/
- /* fork again so the destructor process
- * will not be a child of the slurmd
- */
- pid = fork();
- if (pid < 0) {
- error("_prg_destructor_fork: second fork failed");
- } else if (pid > 0) {
- exit(0);
- }
-
- /* child */
- close(fdpair[1]);
-
- /* close librmscall's internal fd to /proc/rms/control */
- rmsmod_fini();
-
- _close_all_fd_except(fdpair[0]);
- /* Wait for the program description id from the child */
- if (read(fdpair[0], &prgid, sizeof(prgid)) != sizeof(prgid)) {
- error("_prg_destructor_fork read failed: %m");
- exit(1);
- }
-
- if (prgid == -1)
- exit(1);
-
- /*
- * Wait for the pipe to close, signalling that the parent
- * has exited.
- */
- while (read(fdpair[0], &dummy, sizeof(dummy)) > 0) {}
-
- /*
- * Verify that program description is empty. If not, send a SIGKILL.
- */
- for (i = 0; i < 30; i++) {
- int maxids = 8;
- pid_t pids[8];
- int nids = 0;
-
- if (rms_prginfo(prgid, maxids, pids, &nids) < 0) {
- error("_prg_destructor_fork: rms_prginfo: %m");
- }
- if (nids == 0)
- break;
- if (rms_prgsignal(prgid, SIGKILL) < 0) {
- error("_prg_destructor_fork: rms_prgsignal: %m");
- }
- sleep(1);
- }
-
- if (rms_prgdestroy(prgid) < 0) {
- error("rms_prgdestroy");
- }
- exit(0);
-}
-
-
-
-/*
- * Send the prgid of the newly created program description to the process
- * forked earlier by _prg_destructor_fork(), using the file descriptor
- * "fd" which was returned by the call to _prg_destructor_fork().
- */
-static void
-_prg_destructor_send(int fd, int prgid)
-{
- debug3("_prg_destructor_send %d", prgid);
- if (write (fd, &prgid, sizeof(prgid)) != sizeof(prgid)) {
- error ("_prg_destructor_send failed: %m");
- }
- /* Deliberately avoid closing fd. When this process exits, it
- will close fd signalling to the child process that it is
- time to call rms_prgdestroy */
- /*close(fd);*/
-}
diff --git a/src/plugins/proctrack/sgi_job/Makefile.in b/src/plugins/proctrack/sgi_job/Makefile.in
index 2c270d50bb10122219eb9ebcb8e4e4824dacc425..1eb6efb28928241e9886e68b53338c17cd4dae26 100644
--- a/src/plugins/proctrack/sgi_job/Makefile.in
+++ b/src/plugins/proctrack/sgi_job/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -170,9 +168,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -180,8 +176,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/sched/Makefile.in b/src/plugins/sched/Makefile.in
index d611f18c73a2933b83466ad7431b79ff9bd1c72c..1627fcba054e8541f9cdc7496cd402c4cbec8ac7 100644
--- a/src/plugins/sched/Makefile.in
+++ b/src/plugins/sched/Makefile.in
@@ -55,9 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -165,9 +163,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -175,8 +171,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/sched/backfill/Makefile.in b/src/plugins/sched/backfill/Makefile.in
index 2e1eed8aab231095f52a7890154248ebd824b389..c12dfb9724b85ecd951e9d075d6090f664f82bcd 100644
--- a/src/plugins/sched/backfill/Makefile.in
+++ b/src/plugins/sched/backfill/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -170,9 +168,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -180,8 +176,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/sched/builtin/Makefile.in b/src/plugins/sched/builtin/Makefile.in
index 3258e06dbcfe3eec42ef036d14462984764c94ed..1ab9d45dd760ba7ebf008c8aa2faa86e2c1861ac 100644
--- a/src/plugins/sched/builtin/Makefile.in
+++ b/src/plugins/sched/builtin/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -170,9 +168,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -180,8 +176,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/sched/hold/Makefile.in b/src/plugins/sched/hold/Makefile.in
index c75dd7a005cd87a4b46f4f67ecf772d2fdff148e..1d12a690ac69c7e9b2e14e5ad4b1ea79c1e259e5 100644
--- a/src/plugins/sched/hold/Makefile.in
+++ b/src/plugins/sched/hold/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -170,9 +168,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -180,8 +176,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/sched/wiki/Makefile.in b/src/plugins/sched/wiki/Makefile.in
index 6ee40a57419614dab1e18f97ab2801bc8899ac82..43bbaee9aa49f9d14416026f254896078d089fae 100644
--- a/src/plugins/sched/wiki/Makefile.in
+++ b/src/plugins/sched/wiki/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -172,9 +170,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -182,8 +178,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/sched/wiki2/Makefile.in b/src/plugins/sched/wiki2/Makefile.in
index 4fc4f586b3d4214a42cd1b26324781878a739f5a..32fc041f23103908aed8e2812f9a7110b2894d35 100644
--- a/src/plugins/sched/wiki2/Makefile.in
+++ b/src/plugins/sched/wiki2/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -175,9 +173,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -185,8 +181,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/select/Makefile.in b/src/plugins/select/Makefile.in
index a49af4ded470a883417e249989d04bbaac2c74e0..37ecffea2de552d6457a953f0a519065b7c401e0 100644
--- a/src/plugins/select/Makefile.in
+++ b/src/plugins/select/Makefile.in
@@ -55,9 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -165,9 +163,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -175,8 +171,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/select/bluegene/Makefile.in b/src/plugins/select/bluegene/Makefile.in
index 089369a73137fb18c3bfcdae0c845a2578b7af48..d3a1230d8e7613004192734c129df5654bd027a3 100644
--- a/src/plugins/select/bluegene/Makefile.in
+++ b/src/plugins/select/bluegene/Makefile.in
@@ -88,9 +88,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -332,9 +330,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -342,8 +338,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/select/bluegene/ba/Makefile.in b/src/plugins/select/bluegene/ba/Makefile.in
index 9b944ccbc0481f4602d5a8489ebe1c7e1b60df3f..aad67e8ffd9df5248d15aff8fefb40bd5da58e53 100644
--- a/src/plugins/select/bluegene/ba/Makefile.in
+++ b/src/plugins/select/bluegene/ba/Makefile.in
@@ -58,9 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -158,9 +156,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -168,8 +164,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/select/bluegene/ba_bgq/Makefile.in b/src/plugins/select/bluegene/ba_bgq/Makefile.in
index 239974855b9ea3be602731995291badb8eb8ac8d..e55c6f277beac30bc3e49ffe9c4cf30ea98a94e4 100644
--- a/src/plugins/select/bluegene/ba_bgq/Makefile.in
+++ b/src/plugins/select/bluegene/ba_bgq/Makefile.in
@@ -58,9 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -168,9 +166,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -178,8 +174,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/select/bluegene/bl/Makefile.in b/src/plugins/select/bluegene/bl/Makefile.in
index e8a69c069362dbb4107e8d5270cb941b0cbc52d9..baa33c28129ac7487d6b8b588a6c0abcc8fe1e27 100644
--- a/src/plugins/select/bluegene/bl/Makefile.in
+++ b/src/plugins/select/bluegene/bl/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -149,9 +147,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -159,8 +155,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/select/bluegene/bl_bgq/Makefile.in b/src/plugins/select/bluegene/bl_bgq/Makefile.in
index de69325fb0138b9d99609753dbc6026a320edc79..b95a076f0eea77b53e8550dfabbdb80fb47b4c17 100644
--- a/src/plugins/select/bluegene/bl_bgq/Makefile.in
+++ b/src/plugins/select/bluegene/bl_bgq/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -158,9 +156,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -168,8 +164,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/select/bluegene/sfree/Makefile.in b/src/plugins/select/bluegene/sfree/Makefile.in
index 72ed5cbbf49aac0d692765157c52eb0c482fcf6a..d79cd3a52fd9728127a3e13a36de2f3587e51832 100644
--- a/src/plugins/select/bluegene/sfree/Makefile.in
+++ b/src/plugins/select/bluegene/sfree/Makefile.in
@@ -57,9 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -150,9 +148,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -160,8 +156,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/select/cons_res/Makefile.in b/src/plugins/select/cons_res/Makefile.in
index f320c3aa63386704f83e72828477ee98bdd3397d..31489182b36bad8ae0cbdb1e666ed68aa37ee060 100644
--- a/src/plugins/select/cons_res/Makefile.in
+++ b/src/plugins/select/cons_res/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -171,9 +169,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -181,8 +177,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/select/cray/Makefile.in b/src/plugins/select/cray/Makefile.in
index ddcc9f678eb0930f291c8271543f120bb3f28f90..17a01701a414bc02e43d22571007ad13cf6feb34 100644
--- a/src/plugins/select/cray/Makefile.in
+++ b/src/plugins/select/cray/Makefile.in
@@ -57,9 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -217,9 +215,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -227,8 +223,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/select/cray/libalps/Makefile.in b/src/plugins/select/cray/libalps/Makefile.in
index 6a2ba2b1caefd84f5cb0e8c821ec754ba9938bbc..11697b6367a432e802175c3514a5a7c4044833f9 100644
--- a/src/plugins/select/cray/libalps/Makefile.in
+++ b/src/plugins/select/cray/libalps/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -156,9 +154,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -166,8 +162,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/select/cray/libemulate/Makefile.in b/src/plugins/select/cray/libemulate/Makefile.in
index 88c5c52af78d21d0d3479acb35912885f5fcaed7..c77b7444689ad23f916353f1dd36e95d51a013d0 100644
--- a/src/plugins/select/cray/libemulate/Makefile.in
+++ b/src/plugins/select/cray/libemulate/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -150,9 +148,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -160,8 +156,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/select/linear/Makefile.in b/src/plugins/select/linear/Makefile.in
index 1f4a08785e32bc9b2ba057858db63c8991f194f5..8e6d484ec97e8157d9ed83bd7c9308cc099a9625 100644
--- a/src/plugins/select/linear/Makefile.in
+++ b/src/plugins/select/linear/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -170,9 +168,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -180,8 +176,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/switch/Makefile.am b/src/plugins/switch/Makefile.am
index 4c24989539ecbc0296a172c6498fca5b114c6ed3..7610a2d2af51d4627b3976a50cb9aef8f34522e6 100644
--- a/src/plugins/switch/Makefile.am
+++ b/src/plugins/switch/Makefile.am
@@ -1,3 +1,3 @@
# Makefile for switch plugins
-SUBDIRS = elan federation none nrt
+SUBDIRS = none nrt
diff --git a/src/plugins/switch/Makefile.in b/src/plugins/switch/Makefile.in
index 44ad7df04066964cec1ed060c416d27135faa93f..b5e86506122e996f4376ab8ec36816e00534d935 100644
--- a/src/plugins/switch/Makefile.in
+++ b/src/plugins/switch/Makefile.in
@@ -55,9 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -165,9 +163,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -175,8 +171,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
@@ -329,7 +323,7 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = elan federation none nrt
+SUBDIRS = none nrt
all: all-recursive
.SUFFIXES:
diff --git a/src/plugins/switch/elan/Makefile.am b/src/plugins/switch/elan/Makefile.am
deleted file mode 100644
index 5717122e358c68fa8d2a7fc0cb8e7cf3ca735f4b..0000000000000000000000000000000000000000
--- a/src/plugins/switch/elan/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-# Makefile for switch/elan plugin
-
-AUTOMAKE_OPTIONS = foreign
-
-if HAVE_ELAN
-elan_lib = switch_elan.la
-else
-elan_lib =
-endif
-
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
-
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
-
-pkglib_LTLIBRARIES = $(elan_lib)
-
-if HAVE_ELAN
-# Quadrics elan3 or elan4 switch plugin.
-switch_elan_la_SOURCES = \
- switch_elan.c \
- qsw.c qsw.h
-
-# Add libslurm to switch_elan to provide some symbols that are not
-# available in slurmctld (slurm_setenvpf)
-
-switch_elan_la_LIBADD = $(ELAN_LIBS) \
- $(top_builddir)/src/api/libslurm.la
-
-switch_elan_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
-
-else
-EXTRA_switch_elan_la_SOURCES = \
- switch_elan.c \
- qsw.c qsw.h
-endif
diff --git a/src/plugins/switch/elan/Makefile.in b/src/plugins/switch/elan/Makefile.in
deleted file mode 100644
index 5f4c94aa9ea53d033535dc19f6378116a0392b0b..0000000000000000000000000000000000000000
--- a/src/plugins/switch/elan/Makefile.in
+++ /dev/null
@@ -1,674 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# Makefile for switch/elan plugin
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-subdir = src/plugins/switch/elan
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
- $(top_srcdir)/auxdir/libtool.m4 \
- $(top_srcdir)/auxdir/ltoptions.m4 \
- $(top_srcdir)/auxdir/ltsugar.m4 \
- $(top_srcdir)/auxdir/ltversion.m4 \
- $(top_srcdir)/auxdir/lt~obsolete.m4 \
- $(top_srcdir)/auxdir/slurm.m4 \
- $(top_srcdir)/auxdir/x_ac__system_configuration.m4 \
- $(top_srcdir)/auxdir/x_ac_affinity.m4 \
- $(top_srcdir)/auxdir/x_ac_aix.m4 \
- $(top_srcdir)/auxdir/x_ac_blcr.m4 \
- $(top_srcdir)/auxdir/x_ac_bluegene.m4 \
- $(top_srcdir)/auxdir/x_ac_cflags.m4 \
- $(top_srcdir)/auxdir/x_ac_cray.m4 \
- $(top_srcdir)/auxdir/x_ac_databases.m4 \
- $(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
- $(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
- $(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
- $(top_srcdir)/auxdir/x_ac_hwloc.m4 \
- $(top_srcdir)/auxdir/x_ac_iso.m4 \
- $(top_srcdir)/auxdir/x_ac_lua.m4 \
- $(top_srcdir)/auxdir/x_ac_man2html.m4 \
- $(top_srcdir)/auxdir/x_ac_munge.m4 \
- $(top_srcdir)/auxdir/x_ac_ncurses.m4 \
- $(top_srcdir)/auxdir/x_ac_nrt.m4 \
- $(top_srcdir)/auxdir/x_ac_pam.m4 \
- $(top_srcdir)/auxdir/x_ac_printf_null.m4 \
- $(top_srcdir)/auxdir/x_ac_ptrace.m4 \
- $(top_srcdir)/auxdir/x_ac_readline.m4 \
- $(top_srcdir)/auxdir/x_ac_setpgrp.m4 \
- $(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
- $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
- $(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
- $(top_srcdir)/auxdir/x_ac_srun.m4 \
- $(top_srcdir)/auxdir/x_ac_sun_const.m4 \
- $(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/slurm/slurm.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
- for p in $$list; do echo "$$p $$p"; done | \
- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
- if (++n[$$2] == $(am__install_max)) \
- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
- END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(pkglibdir)"
-LTLIBRARIES = $(pkglib_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-@HAVE_ELAN_TRUE@switch_elan_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-@HAVE_ELAN_TRUE@ $(top_builddir)/src/api/libslurm.la
-am__switch_elan_la_SOURCES_DIST = switch_elan.c qsw.c qsw.h
-@HAVE_ELAN_TRUE@am_switch_elan_la_OBJECTS = switch_elan.lo qsw.lo
-am__EXTRA_switch_elan_la_SOURCES_DIST = switch_elan.c qsw.c qsw.h
-switch_elan_la_OBJECTS = $(am_switch_elan_la_OBJECTS)
-switch_elan_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(switch_elan_la_LDFLAGS) $(LDFLAGS) -o $@
-@HAVE_ELAN_TRUE@am_switch_elan_la_rpath = -rpath $(pkglibdir)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/slurm
-depcomp = $(SHELL) $(top_srcdir)/auxdir/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
-SOURCES = $(switch_elan_la_SOURCES) $(EXTRA_switch_elan_la_SOURCES)
-DIST_SOURCES = $(am__switch_elan_la_SOURCES_DIST) \
- $(am__EXTRA_switch_elan_la_SOURCES_DIST)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTHD_CFLAGS = @AUTHD_CFLAGS@
-AUTHD_LIBS = @AUTHD_LIBS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BGL_LOADED = @BGL_LOADED@
-BGQ_LOADED = @BGQ_LOADED@
-BG_INCLUDES = @BG_INCLUDES@
-BG_LDFLAGS = @BG_LDFLAGS@
-BG_L_P_LOADED = @BG_L_P_LOADED@
-BLCR_CPPFLAGS = @BLCR_CPPFLAGS@
-BLCR_HOME = @BLCR_HOME@
-BLCR_LDFLAGS = @BLCR_LDFLAGS@
-BLCR_LIBS = @BLCR_LIBS@
-BLUEGENE_LOADED = @BLUEGENE_LOADED@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CMD_LDFLAGS = @CMD_LDFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
-EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
-FGREP = @FGREP@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
-HAVEPGCONFIG = @HAVEPGCONFIG@
-HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
-HAVE_MAN2HTML = @HAVE_MAN2HTML@
-HAVE_NRT = @HAVE_NRT@
-HAVE_OPENSSL = @HAVE_OPENSSL@
-HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
-HWLOC_CPPFLAGS = @HWLOC_CPPFLAGS@
-HWLOC_LDFLAGS = @HWLOC_LDFLAGS@
-HWLOC_LIBS = @HWLOC_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIB_LDFLAGS = @LIB_LDFLAGS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
-MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
-MUNGE_LIBS = @MUNGE_LIBS@
-MYSQL_CFLAGS = @MYSQL_CFLAGS@
-MYSQL_LIBS = @MYSQL_LIBS@
-NCURSES = @NCURSES@
-NM = @NM@
-NMEDIT = @NMEDIT@
-NRT_CPPFLAGS = @NRT_CPPFLAGS@
-NRT_LDFLAGS = @NRT_LDFLAGS@
-NUMA_LIBS = @NUMA_LIBS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PAM_DIR = @PAM_DIR@
-PAM_LIBS = @PAM_LIBS@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PGSQL_CFLAGS = @PGSQL_CFLAGS@
-PGSQL_LIBS = @PGSQL_LIBS@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PROCTRACKDIR = @PROCTRACKDIR@
-PROJECT = @PROJECT@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-READLINE_LIBS = @READLINE_LIBS@
-REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
-RELEASE = @RELEASE@
-RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
-SED = @SED@
-SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
-SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SLURMCTLD_PORT = @SLURMCTLD_PORT@
-SLURMCTLD_PORT_COUNT = @SLURMCTLD_PORT_COUNT@
-SLURMDBD_PORT = @SLURMDBD_PORT@
-SLURMD_PORT = @SLURMD_PORT@
-SLURM_API_AGE = @SLURM_API_AGE@
-SLURM_API_CURRENT = @SLURM_API_CURRENT@
-SLURM_API_MAJOR = @SLURM_API_MAJOR@
-SLURM_API_REVISION = @SLURM_API_REVISION@
-SLURM_API_VERSION = @SLURM_API_VERSION@
-SLURM_MAJOR = @SLURM_MAJOR@
-SLURM_MICRO = @SLURM_MICRO@
-SLURM_MINOR = @SLURM_MINOR@
-SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
-SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
-SO_LDFLAGS = @SO_LDFLAGS@
-SSL_CPPFLAGS = @SSL_CPPFLAGS@
-SSL_LDFLAGS = @SSL_LDFLAGS@
-SSL_LIBS = @SSL_LIBS@
-STRIP = @STRIP@
-UTIL_LIBS = @UTIL_LIBS@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_have_man2html = @ac_have_man2html@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lua_CFLAGS = @lua_CFLAGS@
-lua_LIBS = @lua_LIBS@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-AUTOMAKE_OPTIONS = foreign
-@HAVE_ELAN_FALSE@elan_lib =
-@HAVE_ELAN_TRUE@elan_lib = switch_elan.la
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
-pkglib_LTLIBRARIES = $(elan_lib)
-
-# Quadrics elan3 or elan4 switch plugin.
-@HAVE_ELAN_TRUE@switch_elan_la_SOURCES = \
-@HAVE_ELAN_TRUE@ switch_elan.c \
-@HAVE_ELAN_TRUE@ qsw.c qsw.h
-
-
-# Add libslurm to switch_elan to provide some symbols that are not
-# available in slurmctld (slurm_setenvpf)
-@HAVE_ELAN_TRUE@switch_elan_la_LIBADD = $(ELAN_LIBS) \
-@HAVE_ELAN_TRUE@ $(top_builddir)/src/api/libslurm.la
-
-@HAVE_ELAN_TRUE@switch_elan_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
-@HAVE_ELAN_FALSE@EXTRA_switch_elan_la_SOURCES = \
-@HAVE_ELAN_FALSE@ switch_elan.c \
-@HAVE_ELAN_FALSE@ qsw.c qsw.h
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
- && { if test -f $@; then exit 0; else break; fi; }; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/switch/elan/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/plugins/switch/elan/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
- @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
- list2=; for p in $$list; do \
- if test -f $$p; then \
- list2="$$list2 $$p"; \
- else :; fi; \
- done; \
- test -z "$$list2" || { \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
- }
-
-uninstall-pkglibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
- @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
- for p in $$list; do \
- $(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
- done
-
-clean-pkglibLTLIBRARIES:
- -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
-switch_elan.la: $(switch_elan_la_OBJECTS) $(switch_elan_la_DEPENDENCIES)
- $(switch_elan_la_LINK) $(am_switch_elan_la_rpath) $(switch_elan_la_OBJECTS) $(switch_elan_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
- -rm -f *.$(OBJEXT)
-
-distclean-compile:
- -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qsw.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/switch_elan.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
- fi
-ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
-
-GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d "$(distdir)/$$file"; then \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
- for dir in "$(DESTDIR)$(pkglibdir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
- mostlyclean-am
-
-distclean: distclean-am
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
- distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-pkglibLTLIBRARIES
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-pkglibLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkglibLTLIBRARIES \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/src/plugins/switch/elan/qsw.c b/src/plugins/switch/elan/qsw.c
deleted file mode 100644
index 6516f2719b952fbfb15ffce2e3940b905ff4c6d8..0000000000000000000000000000000000000000
--- a/src/plugins/switch/elan/qsw.c
+++ /dev/null
@@ -1,1507 +0,0 @@
-/*****************************************************************************\
- * qsw.c - Library routines for initiating jobs on QsNet.
- * $Id$
- *****************************************************************************
- * Copyright (C) 2002 The Regents of the University of California.
- * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
- * Written by Jim Garlick <garlick@llnl.gov>
- * CODE-OCEC-09-009. All rights reserved.
- *
- * This file is part of SLURM, a resource management program.
- * For details, see <http://www.schedmd.com/slurmdocs/>.
- * Please also read the included file: DISCLAIMER.
- *
- * SLURM is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * In addition, as a special exception, the copyright holders give permission
- * to link the code of portions of this program with the OpenSSL library under
- * certain conditions as described in each individual source file, and
- * distribute linked combinations including the two. You must obey the GNU
- * General Public License in all respects for all of the code used other than
- * OpenSSL. If you modify file(s) with this exception, you may extend this
- * exception to your version of the file(s), but you are not obligated to do
- * so. If you do not wish to do so, delete this exception statement from your
- * version. If you delete this exception statement from all source files in
- * the program, then also delete it here.
- *
- * SLURM is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along
- * with SLURM; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-\*****************************************************************************/
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#ifdef WITH_PTHREADS
-# include <pthread.h>
-#endif /* WITH_PTHREADS */
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#include <syslog.h>
-#include <errno.h>
-#include <string.h>
-#include <paths.h>
-#include <stdarg.h>
-#include <ctype.h>
-#include <assert.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <limits.h> /* INT_MAX */
-#include <stdio.h>
-
-#if HAVE_LIBELANCTRL
-# include <elan/elanctrl.h>
-# include <elan/capability.h>
-
-/* These are taken from elan3/elanvp.h, which we don't
- * want to include here since we are using the new
- * version-nonspecific libelanctrl.
- * (XXX: What is the equivalent in libelanctrl?)
- *
- * slurm/482: the elan USER context range is now split
- * into two segments, regular user context and RMS
- * context ranges. Do not allow a context range
- * (lowcontext -- highcontext) to span these two segments,
- * as this will generate and elan initialization error
- * when MPI tries to attach to the capability. For now,
- * restrict SLURM's range to the RMS one (starting at 0x400)
- *
- */
-# define ELAN_USER_BASE_CONTEXT_NUM 0x400 /* act. RMS_BASE_CONTEXT_NUM */
-# define ELAN_USER_TOP_CONTEXT_NUM 0x7ff
-
-# define Version cap_version
-# define HighNode cap_highnode
-# define LowNode cap_lownode
-# define HighContext cap_highcontext
-# define LowContext cap_lowcontext
-# define MyContext cap_mycontext
-# define Bitmap cap_bitmap
-# define Type cap_type
-# define UserKey cap_userkey
-# define RailMask cap_railmask
-# define Values key_values
-#elif HAVE_LIBELAN3
-# include <elan3/elan3.h>
-# include <elan3/elanvp.h>
-#else
-# error "Must have either libelan3 or libelanctrl to compile this module!"
-#endif /* HAVE_LIBELANCTRL */
-
-#include <rms/rmscall.h>
-#include <elanhosts.h>
-
-#include "slurm/slurm_errno.h"
-
-#include "src/common/slurm_xlator.h"
-
-#include "src/plugins/switch/elan/qsw.h"
-
-/*
- * Definitions local to this module.
- */
-#define _DEBUG 0
-#define QSW_JOBINFO_MAGIC 0xf00ff00e
-#define QSW_LIBSTATE_MAGIC 0xf00ff00f
-
-/* we will allocate program descriptions in this range */
-/* XXX note: do not start at zero as libelan shifts to get unique shm id */
-#define QSW_PRG_START 1
-#define QSW_PRG_END INT_MAX
-#define QSW_PRG_INVAL (-1)
-
-/* we allocate elan hardware context numbers in this range */
-#define QSW_CTX_START ELAN_USER_BASE_CONTEXT_NUM
-
-/* XXX: Temporary workaround for slurm/222 (qws sw-kernel/5478)
- * (sys_validate_cap does not allow ELAN_USER_TOP_CONTEXT_NUM)
- */
-#define QSW_CTX_END ELAN_USER_TOP_CONTEXT_NUM - 1
-#define QSW_CTX_INVAL (-1)
-
-
-/*
- * We are going to some trouble to keep these defs private so slurm
- * hackers not interested in the interconnect details can just pass around
- * the opaque types. All use of the data structure internals is local to this
- * module.
- */
-struct step_ctx {
- uint32_t st_prognum;
- uint32_t st_low;
- uint32_t st_high;
- uint16_t st_low_node;
- uint16_t st_high_node;
-};
-
-struct qsw_libstate {
- uint32_t ls_magic;
- uint32_t ls_prognum;
- List step_ctx_list;
-};
-
-struct qsw_jobinfo {
- uint32_t j_magic;
- uint32_t j_prognum;
- ELAN_CAPABILITY j_cap;
-};
-
-/* Lock on library state */
-#define _lock_qsw() do { \
- int err; \
- err = pthread_mutex_lock(&qsw_lock); \
- assert(err == 0); \
-} while (0)
-#define _unlock_qsw() do { \
- int err; \
- err = pthread_mutex_unlock(&qsw_lock); \
- assert(err == 0); \
-} while (0)
-
-/*
- * Globals
- */
-static inline void _dump_step_ctx(const char *head,
- struct step_ctx *step_ctx_p);
-static qsw_libstate_t qsw_internal_state = NULL;
-static pthread_mutex_t qsw_lock = PTHREAD_MUTEX_INITIALIZER;
-static elanhost_config_t elanconf = NULL;
-static int shmid = -1;
-
-
-static inline void _step_ctx_del(void *ptr)
-{
- struct step_ctx *step_ctx_p = (struct step_ctx *) ptr;
-
- xfree(step_ctx_p);
-}
-
-/*
- * Allocate a qsw_libstate_t.
- * lsp (IN) store pointer to new instantiation here
- * RETURN 0 on success, -1 on failure (sets errno)
- */
-int
-qsw_alloc_libstate(qsw_libstate_t *lsp)
-{
- qsw_libstate_t new;
-
- assert(lsp != NULL);
- new = (qsw_libstate_t)xmalloc(sizeof(struct qsw_libstate));
- if (!new)
- slurm_seterrno_ret(ENOMEM);
- new->ls_magic = QSW_LIBSTATE_MAGIC;
- new->step_ctx_list = list_create(_step_ctx_del);
- if (!new->step_ctx_list) {
- qsw_free_libstate(new);
- slurm_seterrno_ret(ENOMEM);
- }
- *lsp = new;
- return 0;
-}
-
-/*
- * Free a qsw_libstate_t.
- * ls (IN) qsw_libstate_t to free
- */
-void
-qsw_free_libstate(qsw_libstate_t ls)
-{
- assert(ls->ls_magic == QSW_LIBSTATE_MAGIC);
- if (ls->step_ctx_list)
- list_destroy(ls->step_ctx_list);
- ls->ls_magic = 0;
- xfree(ls);
-}
-
-static inline void _dump_step_ctx(const char *head, struct step_ctx *step_ctx_p)
-{
-#if _DEBUG
- info("%s: prog:%u context:%u:%u nodes:%u:%u", head,
- step_ctx_p->st_prognum, step_ctx_p->st_low, step_ctx_p->st_high,
- step_ctx_p->st_low_node, step_ctx_p->st_high_node);
-#endif
-}
-
-static void
-_pack_step_ctx(struct step_ctx *step_ctx_p, Buf buffer)
-{
- _dump_step_ctx("_pack_step_ctx", step_ctx_p);
- pack32(step_ctx_p->st_prognum, buffer);
- pack32(step_ctx_p->st_low, buffer);
- pack32(step_ctx_p->st_high, buffer);
- pack16(step_ctx_p->st_low_node, buffer);
- pack16(step_ctx_p->st_high_node,buffer);
-}
-
-/*
- * Pack libstate structure in a format that can be shipped over the
- * network and unpacked on a different architecture.
- * ls (IN) libstate structure to be packed
- * buffer (IN/OUT) where to store packed data
- * RETURN #bytes unused in 'data'
- */
-int
-qsw_pack_libstate(qsw_libstate_t ls, Buf buffer)
-{
- int offset;
- uint16_t step_ctx_cnt;
- ListIterator iter;
- struct step_ctx *step_ctx_p;
-
- assert(ls->ls_magic == QSW_LIBSTATE_MAGIC);
- offset = get_buf_offset(buffer);
-
- pack32(ls->ls_magic, buffer);
- pack32(ls->ls_prognum, buffer);
-
- if (ls->step_ctx_list)
- step_ctx_cnt = list_count(ls->step_ctx_list);
- else
- step_ctx_cnt = 0;
- pack16(step_ctx_cnt, buffer);
- if (step_ctx_cnt) {
- iter = list_iterator_create(ls->step_ctx_list);
- while ((step_ctx_p = list_next(iter)))
- _pack_step_ctx(step_ctx_p, buffer);
- list_iterator_destroy(iter);
- }
-
- return (get_buf_offset(buffer) - offset);
-}
-
-
-static int
-_unpack_step_ctx(struct step_ctx *step_ctx_p, Buf buffer)
-{
- safe_unpack32(&step_ctx_p->st_prognum, buffer);
- safe_unpack32(&step_ctx_p->st_low, buffer);
- safe_unpack32(&step_ctx_p->st_high, buffer);
- safe_unpack16(&step_ctx_p->st_low_node, buffer);
- safe_unpack16(&step_ctx_p->st_high_node, buffer);
- _dump_step_ctx("_unpack_step_ctx", step_ctx_p);
- return 0;
-unpack_error:
- return -1;
-}
-
-
-/*
- * Unpack libstate packed by qsw_pack_libstate.
- * ls (IN/OUT) where to put libstate structure
- * buffer (IN/OUT) where to get packed data
- * RETURN #bytes unused or -1 on error (sets errno)
- */
-int
-qsw_unpack_libstate(qsw_libstate_t ls, Buf buffer)
-{
- int offset, i;
- uint16_t step_ctx_cnt;
- struct step_ctx *step_ctx_p;
-
- assert(ls->ls_magic == QSW_LIBSTATE_MAGIC);
- offset = get_buf_offset(buffer);
-
- safe_unpack32(&ls->ls_magic, buffer);
- safe_unpack32(&ls->ls_prognum, buffer);
- safe_unpack16(&step_ctx_cnt, buffer);
-
- for (i=0; i<step_ctx_cnt; i++) {
- step_ctx_p = xmalloc(sizeof(struct step_ctx));
- if (_unpack_step_ctx(step_ctx_p, buffer) == -1) {
- _step_ctx_del(step_ctx_p);
- goto unpack_error;
- }
- list_push(ls->step_ctx_list, step_ctx_p);
- }
-
- if (ls->ls_magic != QSW_LIBSTATE_MAGIC)
- goto unpack_error;
-
- return SLURM_SUCCESS;
-
- unpack_error:
- slurm_seterrno_ret(EBADMAGIC_QSWLIBSTATE); /* corrupted libstate */
- return SLURM_ERROR;
-}
-
-/*
- * Seed the random number generator. This can be called multiple times,
- * but srand48 will only be called once per program invocation.
- */
-static void
-_srand_if_needed(void)
-{
- static int done = 0;
-
- if (!done) {
- srand48(getpid());
- done = 1;
- }
-}
-
-static void
-_copy_libstate(qsw_libstate_t dest, qsw_libstate_t src)
-{
- ListIterator iter;
- struct step_ctx *src_step_ctx_p, *dest_step_ctx_p;
-
- assert(src->ls_magic == QSW_LIBSTATE_MAGIC);
- assert(dest->ls_magic == QSW_LIBSTATE_MAGIC);
- dest->ls_prognum = src->ls_prognum;
- iter = list_iterator_create(src->step_ctx_list);
- while ((src_step_ctx_p = list_next(iter))) {
- dest_step_ctx_p = xmalloc(sizeof(struct step_ctx));
- dest_step_ctx_p->st_prognum = src_step_ctx_p->st_prognum;
- dest_step_ctx_p->st_low = src_step_ctx_p->st_low;
- dest_step_ctx_p->st_high = src_step_ctx_p->st_high;
- dest_step_ctx_p->st_low_node = src_step_ctx_p->st_low_node;
- dest_step_ctx_p->st_high_node = src_step_ctx_p->st_high_node;
- list_push(dest->step_ctx_list, dest_step_ctx_p);
- }
- list_iterator_destroy(iter);
-}
-
-/*
- * Initialize this library, optionally restoring a previously saved state.
- * oldstate (IN) old state retrieved from qsw_fini() or NULL
- * RETURN 0 on success, -1 on failure (sets errno)
- */
-int
-qsw_init(qsw_libstate_t oldstate)
-{
- qsw_libstate_t new;
-
- assert(qsw_internal_state == NULL);
- _srand_if_needed();
- if (qsw_alloc_libstate(&new) < 0)
- return -1; /* errno set by qsw_alloc_libstate */
- if (oldstate)
- _copy_libstate(new, oldstate);
- else {
- new->ls_prognum = QSW_PRG_START +
- (lrand48() % (QSW_PRG_END - QSW_PRG_START + 1));
- }
- qsw_internal_state = new;
- return 0;
-}
-
-/*
- * Finalize use of this library. If 'savestate' is non-NULL, final
- * state is copied there before it is destroyed.
- * savestate (OUT) place to put state
- */
-void
-qsw_fini(qsw_libstate_t savestate)
-{
- assert(qsw_internal_state != NULL);
- _lock_qsw();
- if (savestate)
- _copy_libstate(savestate, qsw_internal_state);
- qsw_free_libstate(qsw_internal_state);
- qsw_internal_state = NULL;
- if (elanconf) {
- elanhost_config_destroy(elanconf);
- elanconf = NULL;
- }
- _unlock_qsw();
-}
-
-int
-qsw_clear(void)
-{
- int rc = 0;
-
- _lock_qsw();
- assert(qsw_internal_state);
- assert(qsw_internal_state->ls_magic == QSW_LIBSTATE_MAGIC);
- if (qsw_internal_state->step_ctx_list)
- list_destroy(qsw_internal_state->step_ctx_list);
- qsw_internal_state->step_ctx_list = list_create(_step_ctx_del);
- if (elanconf)
- elanhost_config_destroy(elanconf);
- if (!(elanconf = elanhost_config_create ())) {
- rc = -1;
- goto done;
- }
- qsw_internal_state->ls_prognum = QSW_PRG_START +
- (lrand48() % (QSW_PRG_END - QSW_PRG_START + 1));
-done: _unlock_qsw();
- return rc;
-}
-
-/*
- * Allocate a qsw_jobinfo_t.
- * jp (IN) store pointer to new instantiation here
- * RETURN 0 on success, -1 on failure (sets errno)
- */
-int
-qsw_alloc_jobinfo(qsw_jobinfo_t *jp)
-{
- qsw_jobinfo_t new;
-
- assert(jp != NULL);
- new = (qsw_jobinfo_t)xmalloc(sizeof(struct qsw_jobinfo));
- if (!new)
- slurm_seterrno_ret(ENOMEM);
- new->j_magic = QSW_JOBINFO_MAGIC;
-
- *jp = new;
- return 0;
-}
-
-/*
- * Make a copy of a qsw_jobinfo_t.
- * j (IN) qsw_jobinfo_t to be copied
- * RETURN qsw_jobinfo_t on success, NULL on failure
- */
-qsw_jobinfo_t
-qsw_copy_jobinfo(qsw_jobinfo_t j)
-{
- qsw_jobinfo_t new;
- if (qsw_alloc_jobinfo(&new))
- return NULL;
- memcpy(new, j, sizeof(struct qsw_jobinfo));
-
- return new;
-}
-
-/*
- * Free a qsw_jobinfo_t.
- * ls (IN) qsw_jobinfo_t to free
- */
-void
-qsw_free_jobinfo(qsw_jobinfo_t j)
-{
- if (j == NULL)
- return;
- assert(j->j_magic == QSW_JOBINFO_MAGIC);
- j->j_magic = 0;
- xfree(j);
-}
-
-/*
- * Pack jobinfo structure in a format that can be shipped over the
- * network and unpacked on a different architecture.
- * j (IN) jobinfo structure to be packed
- * buffer (OUT) where to store packed data
- * RETURN #bytes unused in 'data' or -1 on error (sets errno)
- * NOTE: Keep in sync with QSW_PACK_SIZE above
- */
-int
-qsw_pack_jobinfo(qsw_jobinfo_t j, Buf buffer)
-{
- int i, offset;
-
- assert(j->j_magic == QSW_JOBINFO_MAGIC);
- offset = get_buf_offset(buffer);
-
- pack32(j->j_magic, buffer);
- pack32(j->j_prognum, buffer);
- for (i = 0; i < 4; i++)
- pack32(j->j_cap.UserKey.Values[i], buffer);
- pack16(j->j_cap.Type, buffer);
-#if HAVE_LIBELANCTRL
-# ifdef ELAN_CAP_ELAN3
- pack16(j->j_cap.cap_elan_type, buffer);
-# else
- j->j_cap.cap_spare = ELAN_CAP_UNINITIALISED;
- pack16(j->j_cap.cap_spare, buffer);
-# endif
-#endif
-#if HAVE_LIBELAN3
- pack16(j->j_cap.padding, buffer);
-#endif
- pack32(j->j_cap.Version, buffer);
- pack32(j->j_cap.LowContext, buffer);
- pack32(j->j_cap.HighContext, buffer);
- pack32(j->j_cap.MyContext, buffer);
- pack32(j->j_cap.LowNode, buffer);
- pack32(j->j_cap.HighNode, buffer);
-#if HAVE_LIBELAN3
- pack32(j->j_cap.Entries, buffer);
-#endif
- pack32(j->j_cap.RailMask, buffer);
- for (i = 0; i < ELAN_BITMAPSIZE; i++)
- pack32(j->j_cap.Bitmap[i], buffer);
-
- return (get_buf_offset(buffer) - offset);
-}
-
-/*
- * Unpack jobinfo structure packed by qsw_pack_jobinfo.
- * j (IN/OUT) where to store libstate structure
- * buffer (OUT) where to load packed data
- * RETURN #bytes unused in 'data' or -1 on error (sets errno)
- */
-int
-qsw_unpack_jobinfo(qsw_jobinfo_t j, Buf buffer)
-{
- int i, offset;
-
- assert(j->j_magic == QSW_JOBINFO_MAGIC);
- offset = get_buf_offset(buffer);
-
- safe_unpack32(&j->j_magic, buffer);
- safe_unpack32(&j->j_prognum, buffer);
- for (i = 0; i < 4; i++)
- safe_unpack32(&j->j_cap.UserKey.Values[i], buffer);
- safe_unpack16(&j->j_cap.Type, buffer);
-#if HAVE_LIBELANCTRL
-# ifdef ELAN_CAP_ELAN3
- safe_unpack16(&j->j_cap.cap_elan_type, buffer);
-# else
- safe_unpack16(&j->j_cap.cap_spare, buffer);
-# endif
-#endif
-#if HAVE_LIBELAN3
- safe_unpack16(&j->j_cap.padding, buffer);
-#endif
-{
- uint32_t tmp32;
- safe_unpack32(&tmp32, buffer);
- j->j_cap.Version = (int) tmp32;
- safe_unpack32(&tmp32, buffer);
- j->j_cap.LowContext = (int) tmp32;
- safe_unpack32(&tmp32, buffer);
- j->j_cap.HighContext = (int) tmp32;
- safe_unpack32(&tmp32, buffer);
- j->j_cap.MyContext = (int) tmp32;
- safe_unpack32(&tmp32, buffer);
- j->j_cap.LowNode = (int) tmp32;
- safe_unpack32(&tmp32, buffer);
- j->j_cap.HighNode = (int) tmp32;
-}
-#if HAVE_LIBELAN3
- safe_unpack32(&j->j_cap.Entries, buffer);
-#endif
- safe_unpack32(&j->j_cap.RailMask, buffer);
- for (i = 0; i < ELAN_BITMAPSIZE; i++)
- safe_unpack32(&j->j_cap.Bitmap[i], buffer);
-
- if (j->j_magic != QSW_JOBINFO_MAGIC)
- goto unpack_error;
-
- return SLURM_SUCCESS;
-
- unpack_error:
- slurm_seterrno_ret(EBADMAGIC_QSWJOBINFO);
- return SLURM_ERROR;
-}
-
-/*
- * Allocate a program description number. Program descriptions, which are the
- * key abstraction maintained by the rms.o kernel module, must not be used
- * more than once simultaneously on a single node. We allocate one to each
- * parallel job which more than meets this requirement. A program description
- * can be compared to a process group, except there is no way for a process to
- * disassociate itself or its children from the program description.
- * If the library is initialized, we allocate these consecutively, otherwise
- * we generate a random one, assuming we are being called by a transient
- * program like pdsh. Ref: rms_prgcreate(3).
- */
-static int
-_generate_prognum(void)
-{
- int new;
-
- if (qsw_internal_state) {
- _lock_qsw();
- new = qsw_internal_state->ls_prognum;
- if (new == QSW_PRG_END)
- qsw_internal_state->ls_prognum = QSW_PRG_START;
- else
- qsw_internal_state->ls_prognum++;
- _unlock_qsw();
- } else {
- _srand_if_needed();
- new = lrand48() % (QSW_PRG_END - QSW_PRG_START + 1);
- new += QSW_PRG_START;
- }
- return new;
-}
-
-/*
- * Elan hardware context numbers are an adapter resource that must not be used
- * more than once on a single node. One is allocated to each process on the
- * node that will be communicating over Elan. In order for processes on the
- * same node to communicate with one another and with other nodes across QsNet,
- * they must use contexts in the hi-lo range of a common capability.
- * If the library state is initialized, we allocate/free these, otherwise
- * we generate a random one, assuming we are being called by a transient
- * program like pdsh. Ref: rms_setcap(3).
- *
- * Returns -1 on allocation error.
- */
-static int
-_alloc_hwcontext(bitstr_t *nodeset, uint32_t prognum, int num)
-{
- int new = -1;
- static int seed = 0;
-
- assert(nodeset);
- if (qsw_internal_state) {
- bitoff_t bit;
- ListIterator iter;
- uint16_t low_node = bit_ffs(nodeset);
- uint16_t high_node = bit_fls(nodeset);
- struct step_ctx *step_ctx_p;
- bitstr_t *busy_context = bit_alloc(QSW_CTX_END -
- QSW_CTX_START + 1);
-
- assert(busy_context);
- _lock_qsw();
- iter = list_iterator_create(qsw_internal_state->step_ctx_list);
- while ((step_ctx_p = list_next(iter))) {
- if ((high_node < step_ctx_p->st_low_node)
- || (low_node > step_ctx_p->st_high_node))
- continue;
- bit_nset(busy_context, step_ctx_p->st_low,
- step_ctx_p->st_high);
- }
- list_iterator_destroy(iter);
- bit = bit_noc(busy_context, num, seed);
- if (bit != -1) {
- seed = bit + num;
- step_ctx_p = xmalloc(sizeof(struct step_ctx));
- step_ctx_p->st_prognum = prognum;
- step_ctx_p->st_low = bit;
- step_ctx_p->st_high = bit + num - 1;
- step_ctx_p->st_low_node = low_node;
- step_ctx_p->st_high_node = high_node;
- _dump_step_ctx("_alloc_hwcontext", step_ctx_p);
- list_push(qsw_internal_state->step_ctx_list, step_ctx_p);
- new = bit + QSW_CTX_START;
- }
- _unlock_qsw();
- FREE_NULL_BITMAP(busy_context);
- } else {
- _srand_if_needed();
- new = lrand48() %
- (QSW_CTX_END - (QSW_CTX_START + num - 1) - 1);
- new += QSW_CTX_START;
- }
- assert(new == -1 || (new >= QSW_CTX_START && new <= QSW_CTX_END));
- return new;
-}
-
-extern int qsw_restore_jobinfo(struct qsw_jobinfo *jobinfo)
-{
- struct step_ctx *step_ctx_p;
- ListIterator iter;
- int duplicate = 0;
-
- assert(qsw_internal_state);
- if (!jobinfo)
- return 0;
-
- assert(jobinfo->j_magic == QSW_JOBINFO_MAGIC);
- _lock_qsw();
-
- /* check for duplicate */
- iter = list_iterator_create(qsw_internal_state->step_ctx_list);
- while ((step_ctx_p = list_next(iter))) {
- if (jobinfo->j_prognum == step_ctx_p->st_prognum) {
- duplicate = 1;
- break;
- }
- }
- list_iterator_destroy(iter);
- if (!duplicate) { /* need new record */
- step_ctx_p = xmalloc(sizeof(struct step_ctx));
- step_ctx_p->st_prognum = jobinfo->j_prognum;
- }
- step_ctx_p->st_low = jobinfo->j_cap.LowContext - QSW_CTX_START;
- step_ctx_p->st_high = jobinfo->j_cap.HighContext - QSW_CTX_START;
- step_ctx_p->st_low_node = jobinfo->j_cap.LowNode;
- step_ctx_p->st_high_node = jobinfo->j_cap.HighNode;
- _dump_step_ctx("qsw_restore_jobinfo", step_ctx_p);
- if (!duplicate)
- list_push(qsw_internal_state->step_ctx_list, step_ctx_p);
- _unlock_qsw();
- return 0;
-}
-
-static void
-_free_hwcontext(uint32_t prog_num)
-{
- ListIterator iter;
- struct step_ctx *step_ctx_p;
-
- if (qsw_internal_state) {
- _lock_qsw();
- iter = list_iterator_create(qsw_internal_state->step_ctx_list);
- while ((step_ctx_p = list_next(iter))) {
- if (prog_num != step_ctx_p->st_prognum)
- continue;
- _dump_step_ctx("_free_hwcontext", step_ctx_p);
- list_delete_item(iter);
- break;
- }
- if (!step_ctx_p) {
- error("_free_hwcontext could not find prognum %u",
- prog_num);
- }
- list_iterator_destroy(iter);
- _unlock_qsw();
- }
-}
-
-/*
- * Initialize the elan capability for this job.
- * Returns -1 on failure to allocate hw context.
- */
-static int
-_init_elan_capability(ELAN_CAPABILITY *cap, uint32_t prognum, int ntasks,
- int nnodes, bitstr_t *nodeset, uint16_t *tasks_per_node,
- int cyclic_alloc, int max_tasks_per_node)
-{
- int i, node_index;
-
- _srand_if_needed();
-
- /* start with a clean slate */
-#if HAVE_LIBELANCTRL
- elan_nullcap(cap);
-#else
- elan3_nullcap(cap);
-#endif
-
- /* initialize for single rail and either block or cyclic allocation */
- if (cyclic_alloc)
- cap->Type = ELAN_CAP_TYPE_CYCLIC;
- else
- cap->Type = ELAN_CAP_TYPE_BLOCK;
- cap->Type |= ELAN_CAP_TYPE_MULTI_RAIL;
- cap->RailMask = 1;
-
-#if HAVE_LIBELANCTRL
-# ifdef ELAN_CAP_ELAN3
- cap->cap_elan_type = ELAN_CAP_ELAN3;
-# else
- cap->cap_spare = ELAN_CAP_UNINITIALISED;
-# endif
-#endif
-
- /* UserKey is 128 bits of randomness which should be kept private */
- for (i = 0; i < 4; i++)
- cap->UserKey.Values[i] = lrand48();
-
- /* set up hardware context range */
- cap->LowContext = _alloc_hwcontext(nodeset, prognum, max_tasks_per_node);
- if (cap->LowContext == -1)
- return -1;
- cap->HighContext = cap->LowContext + max_tasks_per_node - 1;
- /* Note: not necessary to initialize cap->MyContext */
-
- /* set the range of nodes to be used and number of processes */
- cap->LowNode = bit_ffs(nodeset);
- assert(cap->LowNode != -1);
- cap->HighNode = bit_fls(nodeset);
- assert(cap->HighNode != -1);
-
-#if HAVE_LIBELAN3
- cap->Entries = ntasks;
-#endif
-
-#if USE_OLD_LIBELAN
- /* set the hw broadcast bit if consecutive nodes */
- if (abs(cap->HighNode - cap->LowNode) == nnodes - 1)
- cap->Type |= ELAN_CAP_TYPE_BROADCASTABLE;
-#else
- /* set unconditionally per qsw gnat sw-elan/4334 */
- /* only time we don't want this is unsupported rev A hardware */
- cap->Type |= ELAN_CAP_TYPE_BROADCASTABLE;
-#endif
- /*
- * Set up cap->Bitmap, which describes the mapping of processes to
- * the nodes in the range of cap->LowNode - cap->Highnode.
- * There are (ntasks * nnodes) significant bits in the mask, each
- * representing a process slot. Bits are off for process slots
- * corresponding to unallocated nodes. For example, if nodes 4 and 6
- * are running two processes per node, bits 0,1 (corresponding to the
- * two processes on node 4) and bits 4,5 (corresponding to the two
- * processes running on node 6) are set.
- */
- node_index = 0;
- for (i = cap->LowNode; i <= cap->HighNode; i++) {
- if (bit_test(nodeset, i)) {
- int j, bit, task_cnt;
- task_cnt = tasks_per_node[node_index++];
-
- for (j = 0; j < task_cnt; j++) {
- if (cyclic_alloc)
- bit = (i-cap->LowNode) + ( j *
- (cap->HighNode - cap->LowNode + 1));
- else
- bit = ((i-cap->LowNode)
- * max_tasks_per_node) + j;
-
- assert(bit < (sizeof(cap->Bitmap) * 8));
- BT_SET(cap->Bitmap, bit);
- }
- }
- }
-
- return 0;
-}
-
-/*
- * Create all the QsNet related information needed to set up a QsNet parallel
- * program and store it in the qsw_jobinfo struct.
- * Call this on the "client" process, e.g. pdsh, srun, slurmctld, etc..
- */
-int
-qsw_setup_jobinfo(qsw_jobinfo_t j, int ntasks, bitstr_t *nodeset,
- uint16_t *tasks_per_node, int cyclic_alloc)
-{
- int i, max_tasks_per_node = 0;
- int nnodes = bit_set_count(nodeset);
-
- assert(j != NULL);
- assert(j->j_magic == QSW_JOBINFO_MAGIC);
- assert(nodeset);
- assert(tasks_per_node);
-
- /* sanity check on args */
- if ((ntasks <= 0) || (nnodes <= 0))
- slurm_seterrno_ret(EINVAL);
- for (i = 0; i < nnodes; i++) {
- if (tasks_per_node[i] > max_tasks_per_node)
- max_tasks_per_node = tasks_per_node[i];
- }
- /* Note: ELAN_MAX_VPS is 512 on "old" Elan driver, 16384 on new. */
- if ((max_tasks_per_node * nnodes) > ELAN_MAX_VPS)
- slurm_seterrno_ret(EINVAL);
-
- /* initialize jobinfo */
- j->j_prognum = _generate_prognum();
- if (_init_elan_capability(&j->j_cap, j->j_prognum, ntasks, nnodes,
- nodeset, tasks_per_node, cyclic_alloc,
- max_tasks_per_node) == -1) {
- slurm_seterrno_ret(EAGAIN); /* failed to allocate hw ctx */
- }
-
- return 0;
-}
-
-void
-qsw_teardown_jobinfo(qsw_jobinfo_t j)
-{
- if (j)
- _free_hwcontext(j->j_prognum);
-}
-
-/*
- * Here are the necessary steps to set up to run an Elan MPI parallel program
- * (set of processes) on a node (possibly one of many allocated to the prog):
- *
- * Process 1 Process 2 | Process 3
- * read args |
- * fork ------- rms_prgcreate |
- * waitpid elan3_create |
- * rms_prgaddcap |
- * fork N procs ---+------ rms_setcap
- * wait all | setup RMS_ env
- * | setuid, etc.
- * | exec mpi process
- * |
- * exit |
- * rms_prgdestroy |
- * exit | (one pair of processes per mpi proc!)
- *
- * - The first fork is required because rms_prgdestroy can't occur in the
- * process that calls rms_prgcreate (since it is a member, ECHILD).
- * - The second fork is required when running multiple processes per node
- * because each process must announce its use of one of the hw contexts
- * in the range allocated in the capability.
- */
-
-void
-qsw_prog_fini(qsw_jobinfo_t jobinfo)
-{
- if (shmid >= 0) {
- debug2("qsw_prog_fini");
- shmctl (shmid, IPC_RMID, NULL);
- debug2("qsw_prog_fini shmctl IPC_RMID complete");
- }
- /* Do nothing... apparently this will be handled by
- * callbacks in the kernel exit handlers ...
- */
-#if 0
- if (jobinfo->j_ctx) {
- elan3_control_close(jobinfo->j_ctx);
- jobinfo->j_ctx = NULL;
- }
-#endif
-}
-
-/* Key for Elan stats shared memory segment is the
- * rms.o program description number, left shifted 9 less 1
- * to avoid conflicts with MPI shared memory
- */
-static int elan_statkey (int prgid)
-{
- return ((prgid << 9) - 1);
-}
-
-/*
- * Return the statkey to caller in keyp if shared memory was created
- * Return -1 if shared memory creation failed.
- */
-int qsw_statkey (qsw_jobinfo_t jobinfo, int *keyp)
-{
- if (shmid < 0)
- return (-1);
- *keyp = elan_statkey (jobinfo->j_prognum);
- return (0);
-}
-
-/*
- * Create shared memory segment for Elan stats use
- * (ELAN_STATKEY env var is set in switch_elan.c)
- */
-static int
-_qsw_shmem_create (qsw_jobinfo_t jobinfo, uid_t uid)
-{
- struct shmid_ds shm;
- ELAN_CAPABILITY *cap = &jobinfo->j_cap;
- key_t key = elan_statkey (jobinfo->j_prognum);
- int maxLocal = cap->HighContext - cap->LowContext + 1;
- int pgsize = getpagesize ();
-
- /* 8KB minimum stats page size */
- if (pgsize < 8192)
- pgsize = 8192;
-
- if ((shmid = shmget (key, pgsize * (maxLocal + 1), IPC_CREAT|IPC_EXCL))
- < 0)
- return (error ("Failed to create Elan state shmem: %m"));
-
- /* Ensure permissions on segment allow user read/write access
- */
- shm.shm_perm.uid = uid;
- shm.shm_perm.mode = 0600;
-
- if (shmctl (shmid, IPC_SET, &shm) < 0)
- return (error ("Failed to set perms on Elan state shm: %m"));
-
- return (0);
-}
-
-
-static void
-_close_all_fd_except(int fd)
-{
- int openmax;
- int i;
-
- openmax = sysconf(_SC_OPEN_MAX);
- for (i = 0; i <= openmax; i++) {
- if (i != fd)
- close(i);
- }
-}
-
-
-/*
- * Process 1: After the fork, the child process is process 1,
- * and will call rms_prgdestroy when the parent (slurmd job
- * manager) exits.
- */
-static int
-_prg_destructor_fork()
-{
- pid_t pid;
- int fdpair[2];
- int prgid;
- int i;
- int dummy;
-
- if (pipe(fdpair) < 0) {
- error("switch/elan: failed creating pipe");
- return -1;
- }
-
- pid = fork();
- if (pid < 0) {
- error("switch/elan: failed to fork program destructor");
- } else if (pid > 0) {
- /* parent */
- close(fdpair[0]);
- waitpid(pid, (int *)NULL, 0);
- return fdpair[1];
- }
-
- /****************************************/
- /*
- * fork again so the destructor process
- * will not be a child of the slurmd
- */
- pid = fork();
- if (pid < 0) {
- error("switch/elan: second fork failed");
- } else if (pid > 0) {
- exit(0);
- }
-
- /* child */
- close(fdpair[1]);
-
- /* close librmscall's internal fd to /proc/rms/control */
- rmsmod_fini();
-
- _close_all_fd_except(fdpair[0]);
- /* Wait for the program description id from the child */
- if (read(fdpair[0], &prgid, sizeof(prgid)) != sizeof(prgid)) {
- error("_prg_destructor_fork read failed: %m");
- exit(1);
- }
-
- if (prgid == -1)
- exit(1);
-
- /*
- * Wait for the pipe to close, signalling that the parent
- * has exited.
- */
- while (read(fdpair[0], &dummy, sizeof(dummy)) > 0) {}
-
- /*
- * Verify that program description is empty. If not, send a SIGKILL.
- */
- for (i = 0; i < 30; i++) {
- int maxids = 8;
- pid_t pids[8];
- int nids = 0;
-
- if (rms_prginfo(prgid, maxids, pids, &nids) < 0) {
- error("switch/elan: rms_prginfo: %m");
- }
- if (nids == 0)
- break;
- if (rms_prgsignal(prgid, SIGKILL) < 0) {
- error("switch/elan: rms_prgsignal: %m");
- }
- sleep(1);
- }
-
- if (rms_prgdestroy(prgid) < 0) {
- error("rms_prgdestroy");
- }
- exit(0);
-}
-
-
-
-/*
- * Send the prgid of the newly created program description to the process
- * forked earlier by _prg_destructor_fork(), using the file descriptor
- * "fd" which was returned by the call to _prg_destructor_fork().
- */
-static void
-_prg_destructor_send(int fd, int prgid)
-{
- debug3("_prg_destructor_send %d", prgid);
- if (write (fd, &prgid, sizeof(prgid)) != sizeof(prgid)) {
- error ("_prg_destructor_send failed: %m");
- }
- /* Deliberately avoid closing fd. When this process exits, it
- will close fd signalling to the child process that it is
- time to call rms_prgdestroy */
- /*close(fd);*/
-}
-
-/*
- * Process 2: Create the context and make capability available to children.
- */
-int
-qsw_prog_init(qsw_jobinfo_t jobinfo, uid_t uid)
-
-{
- int err;
- int i, nrails;
- int fd;
-
- if ((fd = _prg_destructor_fork()) == -1)
- goto fail;
-#if HAVE_LIBELANCTRL
- nrails = elan_nrails(&jobinfo->j_cap);
-
- for (i = 0; i < nrails; i++) {
- ELANCTRL_HANDLE handle;
- /*
- * Open up the Elan control device so we can create
- * a new capability.
- */
- if (elanctrl_open(&handle) != 0) {
- slurm_seterrno(EELAN3CONTROL);
- _prg_destructor_send(fd, -1);
- goto fail;
- }
-
- /* Push capability into device driver */
- if (elanctrl_create_cap(handle, &jobinfo->j_cap) < 0) {
- error("elanctrl_create_cap: %m");
- slurm_seterrno(EELAN3CREATE);
- /* elanctrl_close(handle); */
- _prg_destructor_send(fd, -1);
- goto fail;
- }
-
- /* elanctrl_close (handle); */
- }
-
-#else /* !HAVE_LIBELANCTRL */
- nrails = elan3_nrails(&jobinfo->j_cap);
-
- for (i = 0; i < nrails; i++) {
-
- ELAN3_CTX *ctx;
-
- /* see qsw gnat sw-elan/4334: elan3_control_open can ret -1 */
- if ((ctx = elan3_control_open(i)) == NULL
- || ctx == (void *)-1) {
- slurm_seterrno(EELAN3CONTROL);
- _prg_destructor_send(fd, -1);
- goto fail;
- }
-
-
- /* make cap known via rms_getcap/rms_ncaps to members
- * of this prgnum */
- if (elan3_create(ctx, &jobinfo->j_cap) < 0) {
- /* XXX masking errno value better than not knowing
- * which function failed? */
- error("elan3_create(%d): %m", i);
- slurm_seterrno(EELAN3CREATE);
- _prg_destructor_send(fd, -1);
- goto fail;
- }
- }
-#endif
- /* associate this process and its children with prgnum */
- if (rms_prgcreate(jobinfo->j_prognum, uid, 1) < 0) {
- /* translate errno values to more descriptive ones */
- switch (errno) {
- case EINVAL:
- slurm_seterrno(EINVAL_PRGCREATE);
- break;
- default:
- break;
- }
- _prg_destructor_send(fd, -1);
- goto fail;
- }
- _prg_destructor_send(fd, jobinfo->j_prognum);
-
- if (rms_prgaddcap(jobinfo->j_prognum, 0, &jobinfo->j_cap) < 0) {
- /* translate errno values to more descriptive ones */
- switch (errno) {
- case ESRCH:
- slurm_seterrno(ESRCH_PRGADDCAP);
- break;
- case EFAULT:
- slurm_seterrno(EFAULT_PRGADDCAP);
- break;
- default:
- break;
- }
- goto fail;
- }
-
-
- /*
- * Create shared memory for libelan state
- * Failure to create shared memory is not a fatal error.
- */
- _qsw_shmem_create (jobinfo, uid);
-
-
- /* note: _elan3_fini() destroys context and makes capability unavail */
- /* do it in qsw_prog_fini() after app terminates */
- return 0;
-fail:
- err = errno; /* presrve errno in case _elan3_fini touches it */
- qsw_prog_fini(jobinfo);
- slurm_seterrno(err);
- return -1;
-}
-
-/*
- * Process 3: Do the rms_setcap.
- */
-int
-qsw_setcap(qsw_jobinfo_t jobinfo, int procnum)
-{
- /*
- * Assign elan hardware context to current process.
- * - arg1 (0 below) is an index into the kernel's list of caps for this
- * program desc (added by rms_prgaddcap). There will be
- * one per rail.
- * - arg2 indexes the hw ctxt range in the capability
- * [cap->LowContext, cap->HighContext]
- */
- if (rms_setcap(0, procnum) < 0) {
- /* translate errno values to more descriptive ones */
- switch (errno) {
- case EINVAL:
- slurm_seterrno(EINVAL_SETCAP);
- break;
- case EFAULT:
- slurm_seterrno(EFAULT_SETCAP);
- break;
- default:
- break;
- }
- return -1;
- }
- return 0;
-}
-
-
-/*
- * Return the local elan address (for rail 0) or -1 on failure.
- */
-int
-qsw_getnodeid(void)
-{
- int nodeid = -1;
-#if HAVE_LIBELANCTRL
- ELAN_DEV_IDX devidx = 0;
- ELANCTRL_HANDLE handle;
- ELAN_POSITION position;
-
- if (elanctrl_open(&handle) != 0)
- slurm_seterrno_ret(EGETNODEID);
-
- if (elanctrl_get_position(handle, devidx, &position) != 0) {
- elanctrl_close (handle);
- slurm_seterrno_ret(EGETNODEID);
- }
-
- nodeid = position.pos_nodeid;
-
- elanctrl_close (handle);
-#else
- ELAN3_CTX *ctx = _elan3_init(0); /* rail 0 */
- if (ctx) {
- nodeid = ctx->devinfo.Position.NodeId;
- elan3_control_close(ctx);
- }
-#endif
- if (nodeid == -1)
- slurm_seterrno(EGETNODEID);
- return nodeid;
-
-}
-
-static int
-_read_elanhost_config (void)
-{
- int rc;
-
- if (!(elanconf = elanhost_config_create ()))
- return (-1);
-
- if ((rc = elanhost_config_read (elanconf, NULL)) < 0) {
- error ("Unable to read Elan config: %s",
- elanhost_config_err (elanconf));
- elanhost_config_destroy (elanconf);
- elanconf = NULL;
- return (-1);
- }
-
- return (0);
-}
-
-int
-qsw_maxnodeid(void)
-{
- int maxid = -1;
-
- _lock_qsw();
- if (!elanconf && (_read_elanhost_config() < 0))
- goto done;
-
- maxid = elanhost_config_maxid (elanconf);
-
- done:
- _unlock_qsw();
- return maxid;
-}
-
-/*
- * Given a hostname, return the elanid or -1 on error.
- * Initializes the elanconfig from the default /etc/elanhosts
- * config file.
- */
-int
-qsw_getnodeid_byhost(char *host)
-{
- int id = -1;
-
- if (host == NULL)
- return (-1);
-
- _lock_qsw();
- if (!elanconf && (_read_elanhost_config() < 0))
- goto done;
-
- xassert (elanconf != NULL);
-
- id = elanhost_host2elanid (elanconf, host);
-
- done:
- _unlock_qsw();
- return id;
-}
-
-/*
- * Given an elanid, determine the hostname. Returns -1 on error or the number
- * of characters copied on success.
- * XXX - assumes RMS style hostnames (see above)
- */
-int
-qsw_gethost_bynodeid(char *buf, int len, int id)
-{
- int rc = -1;
- char *hostp;
-
- if (id < 0) slurm_seterrno_ret(EGETHOST_BYNODEID);
-
- _lock_qsw();
- if (!elanconf && (_read_elanhost_config() < 0))
- goto done;
-
- if (!(hostp = elanhost_elanid2host (elanconf, ELANHOST_EIP, id))) {
- slurm_seterrno (EGETHOST_BYNODEID);
- goto done;
- }
-
- rc = slurm_strlcpy (buf, hostp, len);
-
- done:
- _unlock_qsw();
- return (rc);
-}
-
-/*
- * Send the specified signal to all members of a program description.
- * Returns -1 on failure and sets errno. Ref: rms_prgsignal(3).
- */
-int
-qsw_prgsignal(qsw_jobinfo_t jobinfo, int signum)
-{
- if (rms_prgsignal(jobinfo->j_prognum, signum) < 0) {
- /* translate errno values to more descriptive ones */
- switch (errno) {
- case EINVAL:
- slurm_seterrno(EINVAL_PRGSIGNAL);
- break;
- case ESRCH:
- slurm_seterrno(ESRCH_PRGSIGNAL);
- break;
- default:
- break;
- }
- return -1;
- }
- return 0;
-}
-
-#define _USE_ELAN3_CAPABILITY_STRING 1
-
-#ifndef _USE_ELAN3_CAPABILITY_STRING
-#define TRUNC_BITMAP 1
-static void
-_print_capbitmap(FILE *fp, ELAN_CAPABILITY *cap)
-{
- int bit_max = sizeof(cap->Bitmap)*8 - 1;
- int bit;
-#if TRUNC_BITMAP
- bit_max = bit_max >= 64 ? 64 : bit_max;
-#endif
- for (bit = bit_max; bit >= 0; bit--)
- fprintf(fp, "%c", BT_TEST(cap->Bitmap, bit) ? '1' : '0');
- fprintf(fp, "\n");
-}
-#endif /* !_USE_ELAN3_CAPABILITY_STRING */
-
-char *
-qsw_capability_string(struct qsw_jobinfo *j, char *buf, size_t size)
-{
- ELAN_CAPABILITY *cap;
-
- assert(buf != NULL);
- assert(j->j_magic == QSW_JOBINFO_MAGIC);
-
- cap = &j->j_cap;
-
-#if HAVE_LIBELANCTRL
- snprintf(buf, size, "prg=%d ctx=%x.%x nodes=%d.%d",
- j->j_prognum, cap->LowContext, cap->HighContext,
- cap->LowNode, cap->HighNode);
-#else
- snprintf(buf, size, "prg=%d ctx=%x.%x nodes=%d.%d entries=%d",
- j->j_prognum, cap->LowContext, cap->HighContext,
- cap->LowNode, cap->HighNode,
- cap->Entries);
-#endif
-
- return buf;
-}
-
-void
-qsw_print_jobinfo(FILE *fp, struct qsw_jobinfo *jobinfo)
-{
- ELAN_CAPABILITY *cap;
- char str[8192];
-
- assert(jobinfo->j_magic == QSW_JOBINFO_MAGIC);
-
- fprintf(fp, "__________________\n");
- fprintf(fp, "prognum=%d\n", jobinfo->j_prognum);
-
- cap = &jobinfo->j_cap;
- /* use elan3_capability_string as a shorter alternative for now */
-#if _USE_ELAN3_CAPABILITY_STRING
-# if HAVE_LIBELANCTRL
- fprintf(fp, "%s\n", elan_capability_string(cap, str));
-# else
- fprintf(fp, "%s\n", elan3_capability_string(cap, str));
-# endif
-#else
- fprintf(fp, "cap.UserKey=%8.8x.%8.8x.%8.8x.%8.8x\n",
- cap->UserKey.Values[0], cap->UserKey.Values[1],
- cap->UserKey.Values[2], cap->UserKey.Values[3]);
- /*fprintf(fp, "cap.Version=%d\n", cap->Version);*/
- fprintf(fp, "cap.Type=0x%hx\n", cap->Type);
- fprintf(fp, "cap.LowContext=%d\n", cap->LowContext);
- fprintf(fp, "cap.HighContext=%d\n", cap->HighContext);
- fprintf(fp, "cap.MyContext=%d\n", cap->MyContext);
- fprintf(fp, "cap.LowNode=%d\n", cap->LowNode);
- fprintf(fp, "cap.HighNode=%d\n", cap->HighNode);
-#if HAVE_LIBELAN3
- fprintf(fp, "cap.padding=%hd\n", cap->padding);
- fprintf(fp, "cap.Entries=%d\n", cap->Entries);
-#endif
- fprintf(fp, "cap.Railmask=0x%x\n", cap->RailMask);
- fprintf(fp, "cap.Bitmap=");
- _print_capbitmap(fp, cap);
-#endif
- fprintf(fp, "\n------------------\n");
-}
diff --git a/src/plugins/switch/elan/qsw.h b/src/plugins/switch/elan/qsw.h
deleted file mode 100644
index d488ec067473cb2502585f16c7b0cc0649633ad6..0000000000000000000000000000000000000000
--- a/src/plugins/switch/elan/qsw.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/*****************************************************************************\
- * qsw.h - Library routines for initiating jobs on QsNet.
- *****************************************************************************
- * Copyright (C) 2002 The Regents of the University of California.
- * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
- * Written by Jim Garlick <garlick@llnl.gov>
- * CODE-OCEC-09-009. All rights reserved.
- *
- * This file is part of SLURM, a resource management program.
- * For details, see <http://www.schedmd.com/slurmdocs/>.
- * Please also read the included file: DISCLAIMER.
- *
- * SLURM is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * In addition, as a special exception, the copyright holders give permission
- * to link the code of portions of this program with the OpenSSL library under
- * certain conditions as described in each individual source file, and
- * distribute linked combinations including the two. You must obey the GNU
- * General Public License in all respects for all of the code used other than
- * OpenSSL. If you modify file(s) with this exception, you may extend this
- * exception to your version of the file(s), but you are not obligated to do
- * so. If you do not wish to do so, delete this exception statement from your
- * version. If you delete this exception statement from all source files in
- * the program, then also delete it here.
- *
- * SLURM is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along
- * with SLURM; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-\*****************************************************************************/
-
-#include <stdio.h>
-#include <sys/types.h>
-
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include "src/common/slurm_xlator.h"
-
-#ifndef _QSW_INCLUDED
-#define _QSW_INCLUDED
-
-#if HAVE_LIBELANCTRL
-# include <elan/capability.h>
-#elif HAVE_LIBELAN3
-# include <elan3/elanvp.h>
-#else
-# error "Don't have either libelanctrl or libelan3!"
-#endif
-
-/* opaque data structures - no peeking! */
-typedef struct qsw_libstate *qsw_libstate_t;
-#ifndef __qsw_jobinfo_t_defined
-# define __qsw_jobinfo_t_defined
- typedef struct qsw_jobinfo *qsw_jobinfo_t; /* opaque data type */
-#endif
-
-#define QSW_LIBSTATE_PACK_MAX 12
-#define QSW_JOBINFO_PACK_MAX 120
-#define QSW_MAX_TASKS ELAN_MAX_VPS
-#define QSW_PACK_SIZE (4 * (2+4+1+8+ELAN_BITMAPSIZE))
-
-/* NOTE: error codes should be between ESLURM_SWITCH_MIN and
- * ESLURM_SWITCH MAX as defined in slurm/slurm_errno.h */
-enum {
- /* Quadrics Elan specific error codes */
- ENOSLURM = 3000,
- EBADMAGIC_QSWLIBSTATE,
- EBADMAGIC_QSWJOBINFO,
- EINVAL_PRGCREATE,
- ECHILD_PRGDESTROY,
- EEXIST_PRGDESTROY,
- EELAN3INIT,
- EELAN3CONTROL,
- EELAN3CREATE,
- ESRCH_PRGADDCAP,
- EFAULT_PRGADDCAP,
- EINVAL_SETCAP,
- EFAULT_SETCAP,
- EGETNODEID,
- EGETNODEID_BYHOST,
- EGETHOST_BYNODEID,
- ESRCH_PRGSIGNAL,
- EINVAL_PRGSIGNAL
-};
-
-int qsw_alloc_libstate(qsw_libstate_t *lsp);
-void qsw_free_libstate(qsw_libstate_t ls);
-
-int qsw_pack_libstate(qsw_libstate_t ls, Buf buffer);
-int qsw_unpack_libstate(qsw_libstate_t ls, Buf buffer);
-
-int qsw_init(qsw_libstate_t restorestate);
-void qsw_fini(qsw_libstate_t savestate);
-int qsw_clear(void);
-
-int qsw_alloc_jobinfo(qsw_jobinfo_t *jp);
-qsw_jobinfo_t qsw_copy_jobinfo(qsw_jobinfo_t j);
-void qsw_free_jobinfo(qsw_jobinfo_t j);
-int qsw_restore_jobinfo(struct qsw_jobinfo *jobinfo);
-
-int qsw_pack_jobinfo(qsw_jobinfo_t j, Buf buffer);
-int qsw_unpack_jobinfo(qsw_jobinfo_t j, Buf buffer);
-
-int qsw_setup_jobinfo(qsw_jobinfo_t j, int ntasks,
- bitstr_t *nodeset, uint16_t *tasks_per_node,
- int cyclic_alloc);
-void qsw_teardown_jobinfo(qsw_jobinfo_t j);
-
-int qsw_prog_init(qsw_jobinfo_t jobinfo, uid_t uid);
-void qsw_prog_fini(qsw_jobinfo_t jobinfo);
-
-int qsw_prgdestroy(qsw_jobinfo_t jobinfo); /* was qsw_prog_reap */
-
-int qsw_setcap(qsw_jobinfo_t jobinfo, int procnum);
- /* was qsw_attach */
-
-int qsw_prgsignal(qsw_jobinfo_t jobinfo, int signum);
- /* was qsw_signal_job */
-
- /* return max ElanID in configuration */
-int qsw_maxnodeid(void);
-
-int qsw_getnodeid(void);
-int qsw_getnodeid_byhost(char *host);
-int qsw_gethost_bynodeid(char *host, int len, int elanid);
-
-char * qsw_capability_string(qsw_jobinfo_t j, char *buf, size_t len);
-void qsw_print_jobinfo(FILE *fp, struct qsw_jobinfo *jobinfo);
-
- /* Return Elan shared memory state key */
-int qsw_statkey (qsw_jobinfo_t jobinfo, int *keyp);
-
-#endif /* _QSW_INCLUDED */
diff --git a/src/plugins/switch/elan/switch_elan.c b/src/plugins/switch/elan/switch_elan.c
deleted file mode 100644
index 6b7ea0138cc8c5c971b6cc878ff18b1a7454179b..0000000000000000000000000000000000000000
--- a/src/plugins/switch/elan/switch_elan.c
+++ /dev/null
@@ -1,842 +0,0 @@
-/*****************************************************************************\
- * switch_elan.c - Library routines for initiating jobs on QsNet.
- *****************************************************************************
- * Copyright (C) 2003-2007 The Regents of the University of California.
- * Copyright (C) 2008 Lawrence Livermore National Security.
- * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
- * Written by Kevin Tew <tew1@llnl.gov>, et. al.
- * CODE-OCEC-09-009. All rights reserved.
- *
- * This file is part of SLURM, a resource management program.
- * For details, see <http://www.schedmd.com/slurmdocs/>.
- * Please also read the included file: DISCLAIMER.
- *
- * SLURM is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * In addition, as a special exception, the copyright holders give permission
- * to link the code of portions of this program with the OpenSSL library under
- * certain conditions as described in each individual source file, and
- * distribute linked combinations including the two. You must obey the GNU
- * General Public License in all respects for all of the code used other than
- * OpenSSL. If you modify file(s) with this exception, you may extend this
- * exception to your version of the file(s), but you are not obligated to do
- * so. If you do not wish to do so, delete this exception statement from your
- * version. If you delete this exception statement from all source files in
- * the program, then also delete it here.
- *
- * SLURM is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along
- * with SLURM; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-\*****************************************************************************/
-
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#ifdef WITH_PTHREADS
-# include <pthread.h>
-#endif /* WITH_PTHREADS */
-
-#include <fcntl.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <dlfcn.h>
-
-#include "slurm/slurm_errno.h"
-
-#include "src/common/slurm_xlator.h"
-
-#include "src/plugins/switch/elan/qsw.h"
-
-#define BUFFER_SIZE 1024
-#define QSW_STATE_VERSION "VER001"
-
-/*
- * Static prototypes for network error resolver creation:
- */
-static int _set_elan_ids(void);
-static void *_neterr_thr(void *arg);
-
-static int neterr_retval = 0;
-static pthread_t neterr_tid = 0;
-static pthread_mutex_t neterr_mutex = PTHREAD_MUTEX_INITIALIZER;
-static pthread_cond_t neterr_cond = PTHREAD_COND_INITIALIZER;
-
-/* Type for error string table entries */
-typedef struct {
- int xe_number;
- char *xe_message;
-} slurm_errtab_t;
-
-static slurm_errtab_t slurm_errtab[] = {
- {0, "No error"},
- {-1, "Unspecified error"},
-
- /* Quadrics Elan routine error codes */
-
- { ENOSLURM, /* oh no! */
- "Out of slurm" },
- { EBADMAGIC_QSWLIBSTATE,
- "Bad magic in QSW libstate" },
- { EBADMAGIC_QSWJOBINFO,
- "Bad magic in QSW jobinfo" },
- { EINVAL_PRGCREATE,
- "Program identifier in use or CPU count invalid, try again" },
- { ECHILD_PRGDESTROY,
- "Processes belonging to this program are still running" },
- { EEXIST_PRGDESTROY,
- "Program identifier does not exist" },
- { EELAN3INIT,
- "Too many processes using Elan or mapping failure" },
- { EELAN3CONTROL,
- "Could not open elan3 control device" },
- { EELAN3CREATE,
- "Could not create elan capability" },
- { ESRCH_PRGADDCAP,
- "Program does not exist (addcap)" },
- { EFAULT_PRGADDCAP,
- "Capability has invalid address (addcap)" },
- { EINVAL_SETCAP,
- "Invalid context number (setcap)" },
- { EFAULT_SETCAP,
- "Capability has invalid address (setcap)" },
- { EGETNODEID,
- "Cannot determine local elan address" },
- { EGETNODEID_BYHOST,
- "Cannot translate hostname to elan address" },
- { EGETHOST_BYNODEID,
- "Cannot translate elan address to hostname" },
- { ESRCH_PRGSIGNAL,
- "No such program identifier" },
- { EINVAL_PRGSIGNAL,
- "Invalid signal number" }
-};
-
-/*
- * These variables are required by the generic plugin interface. If they
- * are not found in the plugin, the plugin loader will ignore it.
- *
- * plugin_name - a string giving a human-readable description of the
- * plugin. There is no maximum length, but the symbol must refer to
- * a valid string.
- *
- * plugin_type - a string suggesting the type of the plugin or its
- * applicability to a particular form of data or method of data handling.
- * If the low-level plugin API is used, the contents of this string are
- * unimportant and may be anything. SLURM uses the higher-level plugin
- * interface which requires this string to be of the form
- *
- * <application>/<method>
- *
- * where <application> is a description of the intended application of
- * the plugin (e.g., "switch" for SLURM switch) and <method> is a description
- * of how this plugin satisfies that application. SLURM will only load
- * a switch plugin if the plugin_type string has a prefix of "switch/".
- *
- * plugin_version - an unsigned 32-bit integer giving the version number
- * of the plugin. If major and minor revisions are desired, the major
- * version number may be multiplied by a suitable magnitude constant such
- * as 100 or 1000. Various SLURM versions will likely require a certain
- * minimum version for their plugins as this API matures.
- */
-const char plugin_name[] = "switch Quadrics Elan3 or Elan4 plugin";
-const char plugin_type[] = "switch/elan";
-const uint32_t plugin_version = 90;
-
-/*
- * init() is called when the plugin is loaded, before any other functions
- * are called. Put global initialization here.
- */
-int init ( void )
-{
-#ifdef HAVE_FRONT_END
- fatal("Plugin switch/elan is incompatible with front-end configuration");
-#endif
- verbose("%s loaded", plugin_name);
- return SLURM_SUCCESS;
-}
-
-int fini ( void )
-{
- return SLURM_SUCCESS;
-}
-
-/*
- * switch functions for global state save/restore
- */
-int switch_p_libstate_save (char *dir_name)
-{
- int error_code = SLURM_SUCCESS;
- qsw_libstate_t old_state = NULL;
- Buf buffer = NULL;
- int state_fd;
- char *file_name;
-
- if (qsw_alloc_libstate(&old_state))
- return SLURM_ERROR;
- qsw_fini(old_state);
- buffer = init_buf(1024);
- packstr(QSW_STATE_VERSION, buffer);
- (void) qsw_pack_libstate(old_state, buffer);
- file_name = xstrdup(dir_name);
- xstrcat(file_name, "/qsw_state");
- (void) unlink(file_name);
- state_fd = creat (file_name, 0600);
- if (state_fd < 0) {
- error ("Can't save state, error creating file %s %m",
- file_name);
- error_code = SLURM_ERROR;
- } else {
- char *buf = get_buf_data(buffer);
- size_t len = get_buf_offset(buffer);
- while(1) {
- int wrote = write (state_fd, buf, len);
- if ((wrote < 0) && (errno == EINTR))
- continue;
- if (wrote == 0)
- break;
- if (wrote < 0) {
- error ("Can't save switch state: %m");
- error_code = SLURM_ERROR;
- break;
- }
- buf += wrote;
- len -= wrote;
- }
- close (state_fd);
- }
- xfree(file_name);
-
- if (buffer)
- free_buf(buffer);
- if (old_state)
- qsw_free_libstate(old_state);
-
- return error_code;
-}
-
-int switch_p_libstate_restore (char *dir_name, bool recover)
-{
- char *data = NULL, *file_name;
- qsw_libstate_t old_state = NULL;
- Buf buffer = NULL;
- int error_code = SLURM_SUCCESS;
- int state_fd, data_allocated = 0, data_read = 0, data_size = 0;
- char *ver_str = NULL;
- uint32_t ver_str_len;
-
- if (!recover) /* clean start, no recovery */
- return qsw_init(NULL);
-
- file_name = xstrdup(dir_name);
- xstrcat(file_name, "/qsw_state");
- state_fd = open (file_name, O_RDONLY);
- if (state_fd >= 0) {
- data_allocated = BUFFER_SIZE;
- data = xmalloc(data_allocated);
- while (1) {
- data_read = read (state_fd, &data[data_size],
- BUFFER_SIZE);
- if ((data_read < 0) && (errno == EINTR))
- continue;
- if (data_read < 0) {
- error ("Read error on %s, %m", file_name);
- error_code = SLURM_ERROR;
- break;
- } else if (data_read == 0)
- break;
- data_size += data_read;
- data_allocated += data_read;
- xrealloc(data, data_allocated);
- }
- close (state_fd);
- xfree(file_name);
- } else {
- error("No %s file for QSW state recovery", file_name);
- error("Starting QSW with clean state");
- xfree(file_name);
- return qsw_init(NULL);
- }
-
- if (error_code == SLURM_SUCCESS) {
- buffer = create_buf (data, data_size);
- data = NULL; /* now in buffer, don't xfree() */
- if (buffer && (size_buf(buffer) >= sizeof(uint32_t) +
- strlen(QSW_STATE_VERSION))) {
- char *ptr = get_buf_data(buffer);
-
- if (!memcmp(&ptr[sizeof(uint32_t)],
- QSW_STATE_VERSION, 3)) {
- unpackstr_xmalloc(&ver_str, &ver_str_len,
- buffer);
- debug3("qsw_state file version: %s", ver_str);
- }
- }
- }
-
- if (ver_str && (strcmp(ver_str, QSW_STATE_VERSION) == 0)) {
- if ((qsw_alloc_libstate(&old_state))
- || (qsw_unpack_libstate(old_state, buffer) < 0))
- error_code = SLURM_ERROR;
- } else
- error("qsw_state file is in an unsupported format, ignored");
-
- if (buffer)
- free_buf(buffer);
- xfree(data);
- xfree(ver_str);
-
- if (error_code == SLURM_SUCCESS)
- error_code = qsw_init(old_state);
- if (old_state)
- qsw_free_libstate(old_state);
-
- return error_code;
-}
-
-int switch_p_libstate_clear ( void )
-{
- return qsw_clear();
-}
-
-/*
- * switch functions for job step specific credential
- */
-int switch_p_alloc_jobinfo(switch_jobinfo_t **jp)
-{
- return qsw_alloc_jobinfo((qsw_jobinfo_t *)jp);
-}
-
-int switch_p_build_jobinfo ( switch_jobinfo_t *switch_job, char *nodelist,
- uint16_t *tasks_per_node, int cyclic_alloc, char *network)
-{
- int node_set_size = QSW_MAX_TASKS; /* overkill but safe */
- hostlist_t host_list;
- char *this_node_name;
- bitstr_t *nodeset;
- int node_id, error_code = SLURM_SUCCESS;
- int i, nnodes, ntasks = 0;
-
- if (!tasks_per_node) {
- slurm_seterrno(ENOMEM);
- return SLURM_ERROR;
- }
-
- if ((host_list = hostlist_create(nodelist)) == NULL)
- fatal("hostlist_create(%s): %m", nodelist);
-
- nnodes = hostlist_count(host_list);
- for (i = 0; i < nnodes; i++)
- ntasks += tasks_per_node[i];
-
- if (ntasks > node_set_size) {
- slurm_seterrno(ESLURM_BAD_TASK_COUNT);
- hostlist_destroy(host_list);
- return SLURM_ERROR;
- }
-
- if ((nodeset = bit_alloc (node_set_size)) == NULL)
- fatal("bit_alloc: %m");
-
- while ((this_node_name = hostlist_shift(host_list))) {
- node_id = qsw_getnodeid_byhost(this_node_name);
- if (node_id >= 0)
- bit_set(nodeset, node_id);
- else {
- error("qsw_getnodeid_byhost(%s) failure",
- this_node_name);
- slurm_seterrno(ESLURM_INTERCONNECT_FAILURE);
- error_code = SLURM_ERROR;
- }
- free(this_node_name);
- }
- hostlist_destroy(host_list);
-
- if (error_code == SLURM_SUCCESS) {
- qsw_jobinfo_t j = (qsw_jobinfo_t) switch_job;
- error_code = qsw_setup_jobinfo(j, ntasks, nodeset,
- tasks_per_node, cyclic_alloc);
- /* allocs hw context */
- }
-
- FREE_NULL_BITMAP(nodeset);
- return error_code;
-}
-
-switch_jobinfo_t *switch_p_copy_jobinfo(switch_jobinfo_t *j)
-{
- return (switch_jobinfo_t) qsw_copy_jobinfo((qsw_jobinfo_t) j);
-}
-
-void switch_p_free_jobinfo(switch_jobinfo_t *k)
-{
- qsw_free_jobinfo((qsw_jobinfo_t) k);
-}
-
-int switch_p_pack_jobinfo(switch_jobinfo_t *k, Buf buffer)
-{
- return qsw_pack_jobinfo((qsw_jobinfo_t) k, buffer);
-}
-
-int switch_p_unpack_jobinfo(switch_jobinfo_t *k, Buf buffer)
-{
- return qsw_unpack_jobinfo((qsw_jobinfo_t) k, buffer);
-}
-
-void switch_p_print_jobinfo(FILE *fp, switch_jobinfo_t *jobinfo)
-{
- qsw_print_jobinfo(fp, (qsw_jobinfo_t) jobinfo);
-}
-
-char *switch_p_sprint_jobinfo(switch_jobinfo_t *switch_jobinfo, char *buf,
- size_t size)
-{
- return qsw_capability_string((struct qsw_jobinfo *) switch_jobinfo,
- buf, size);
-}
-
-/*
- * switch functions for job initiation
- */
-
-static int _have_elan3 (void)
-{
-#if HAVE_LIBELAN3
- return (1);
-#else
- struct stat st;
-
- if (stat ("/proc/qsnet/elan3/device0", &st) < 0)
- return (0);
-
- return (1);
-#endif /* HAVE_LIBELAN3 */
- return (0);
-}
-
-/* Initialize node for use of the Elan interconnect by loading
- * elanid/hostname pairs then spawning the Elan network error
- * resolver thread.
- *
- * Main thread waits for neterr thread to successfully start before
- * continuing.
- */
-int switch_p_node_init ( void )
-{
- pthread_attr_t attr;
-
- /*
- * Only need to run neterr resolver thread on Elan3 systems.
- */
- if (!_have_elan3 ()) return SLURM_SUCCESS;
-
- /*
- * Load neterr elanid/hostname values into kernel
- */
- if (_set_elan_ids() < 0)
- return SLURM_ERROR;
-
- slurm_attr_init(&attr);
- if (pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED))
- error("pthread_attr_setdetachstate: %m");
-
- slurm_mutex_lock(&neterr_mutex);
-
- if (pthread_create(&neterr_tid, &attr, _neterr_thr, NULL)) {
- error("pthread_create: %m");
- slurm_attr_destroy(&attr);
- return SLURM_ERROR;
- }
- slurm_attr_destroy(&attr);
-
- /*
- * Wait for successful startup of neterr thread before
- * returning control to slurmd.
- */
- pthread_cond_wait(&neterr_cond, &neterr_mutex);
- pthread_mutex_unlock(&neterr_mutex);
-
- return neterr_retval;
-
-
- return SLURM_SUCCESS;
-}
-
-/*
- * Use dlopen(3) for libelan3.so (when needed)
- * This allows us to build a single version of the elan plugin
- * for Elan3 and Elan4 on QsNetII systems.
- */
-static void *elan3h = NULL;
-
-/*
- * * Wrapper functions for needed libelan3 functions
- * */
-static int _elan3_init_neterr_svc (int dbglvl)
-{
- static int (*init_svc) (int);
-
- if (!(init_svc = dlsym (elan3h, "elan3_init_neterr_svc")))
- return (0);
-
- return (init_svc (dbglvl));
-}
-
-
-static int _elan3_register_neterr_svc (void)
-{
- static int (*reg_svc) (void);
-
- if (!(reg_svc = dlsym (elan3h, "elan3_register_neterr_svc")))
- return (0);
-
- return (reg_svc ());
-}
-
-static int _elan3_run_neterr_svc (void)
-{
- static int (*run_svc) ();
-
- if (!(run_svc = dlsym (elan3h, "elan3_run_neterr_svc")))
- return (0);
-
- return (run_svc ());
-}
-
-
-static int _elan3_load_neterr_svc (int i, char *host)
-{
- static int (*load_svc) (int, char *);
-
- if (!(load_svc = dlsym (elan3h, "elan3_load_neterr_svc")))
- return (0);
-
- return (load_svc (i, host));
-}
-
-static void *_neterr_thr(void *arg)
-{
- debug3("Starting Elan network error resolver thread");
-
- if (!(elan3h = dlopen ("libelan3.so", RTLD_LAZY))) {
- error ("Unable to open libelan3.so: %s", dlerror ());
- goto fail;
- }
-
- if (!_elan3_init_neterr_svc(0)) {
- error("elan3_init_neterr_svc: %m");
- goto fail;
- }
-
- /*
- * Attempt to register the neterr svc thread. If the address
- * cannot be bound, then there is already a thread running, and
- * we should just exit with success.
- */
- if (!_elan3_register_neterr_svc()) {
- if (errno != EADDRINUSE) {
- error("elan3_register_neterr_svc: %m");
- goto fail;
- }
- info("Warning: Elan error resolver thread already running");
- }
-
- /*
- * Signal main thread that we've successfully initialized
- */
- slurm_mutex_lock(&neterr_mutex);
- neterr_retval = 0;
- pthread_cond_signal(&neterr_cond);
- slurm_mutex_unlock(&neterr_mutex);
-
- /*
- * Run the network error resolver thread. This should
- * never return. If it does, there's not much we can do
- * about it.
- */
- _elan3_run_neterr_svc();
-
- return NULL;
-
- fail:
- slurm_mutex_lock(&neterr_mutex);
- neterr_retval = SLURM_FAILURE;
- pthread_cond_signal(&neterr_cond);
- slurm_mutex_unlock(&neterr_mutex);
-
- return NULL;
-}
-
-/*
- * Called from slurmd just before termination.
- * We don't really need to do anything special for Elan, but
- * we'll call pthread_cancel() on the neterr resolver thread anyhow.
- */
-extern int switch_p_node_fini ( void )
-{
-#if HAVE_LIBELAN3
- int i;
-
- if (!neterr_tid)
- return SLURM_SUCCESS;
-
- for (i=0; i<4; i++) {
- if (pthread_cancel(neterr_tid)) {
- neterr_tid = 0;
- return SLURM_SUCCESS;
- }
- usleep(1000);
- }
- error("Could not kill switch elan pthread");
- return SLURM_ERROR;
-#else /* !HAVE_LIBELAN3 */
-
- return SLURM_SUCCESS;
-#endif /* HAVE_LIBELAN3 */
-}
-
-int switch_p_job_preinit ( switch_jobinfo_t *jobinfo )
-{
- return SLURM_SUCCESS;
-}
-
-/*
- * prepare node for interconnect use
- */
-extern int switch_p_job_init (switch_jobinfo_t *jobinfo, uid_t uid,
- char *job_name)
-{
- char buf[4096];
-
- debug2("calling qsw_prog_init from process %lu",
- (unsigned long) getpid());
- verbose("ELAN: %s", qsw_capability_string(
- (qsw_jobinfo_t)jobinfo, buf, 4096));
-
- if (qsw_prog_init((qsw_jobinfo_t)jobinfo, uid) < 0) {
- /*
- * Check for EBADF, which probably means the rms
- * kernel module is not loaded.
- */
- if (errno == EBADF)
- error("Initializing interconnect: "
- "is the rms kernel module loaded?");
- else
- error ("qsw_prog_init: %m");
-
- qsw_print_jobinfo(log_fp(), (qsw_jobinfo_t)jobinfo);
- return SLURM_ERROR;
- }
-
- return SLURM_SUCCESS;
-}
-
-int switch_p_job_fini ( switch_jobinfo_t *jobinfo )
-{
- qsw_prog_fini((qsw_jobinfo_t)jobinfo);
- return SLURM_SUCCESS;
-}
-
-int switch_p_job_postfini ( switch_jobinfo_t *jobinfo, uid_t pgid,
- uint32_t job_id, uint32_t step_id )
-{
- return SLURM_SUCCESS;
-}
-
-int switch_p_job_attach ( switch_jobinfo_t *jobinfo, char ***env,
- uint32_t nodeid, uint32_t procid, uint32_t nnodes,
- uint32_t nprocs, uint32_t rank )
-{
- int id = -1;
- debug3("nodeid=%lu nnodes=%lu procid=%lu nprocs=%lu rank=%lu",
- (unsigned long) nodeid, (unsigned long) nnodes,
- (unsigned long) procid, (unsigned long) nprocs,
- (unsigned long) rank);
- debug3("setting capability in process %lu",
- (unsigned long) getpid());
- if (qsw_setcap((qsw_jobinfo_t) jobinfo, (int) procid) < 0) {
- error("qsw_setcap: %m");
- return SLURM_ERROR;
- }
-
- if (slurm_setenvpf(env, "RMS_RANK", "%lu", (unsigned long) rank )
- < 0)
- return SLURM_ERROR;
- if (slurm_setenvpf(env, "RMS_NODEID", "%lu", (unsigned long) nodeid)
- < 0)
- return SLURM_ERROR;
- if (slurm_setenvpf(env, "RMS_PROCID", "%lu", (unsigned long) rank )
- < 0)
- return SLURM_ERROR;
- if (slurm_setenvpf(env, "RMS_NNODES", "%lu", (unsigned long) nnodes)
- < 0)
- return SLURM_ERROR;
- if (slurm_setenvpf(env, "RMS_NPROCS", "%lu", (unsigned long) nprocs)
- < 0)
- return SLURM_ERROR;
-
- /*
- * Tell libelan the key to use for Elan state shmem segment
- */
- if (qsw_statkey ((qsw_jobinfo_t) jobinfo, &id) >= 0)
- slurm_setenvpf (env, "ELAN_STATKEY", "%d", id);
-
- return SLURM_SUCCESS;
-}
-
-extern int switch_p_get_jobinfo(switch_jobinfo_t *switch_job,
- int key, void *resulting_data)
-{
- slurm_seterrno(EINVAL);
- return SLURM_ERROR;
-}
-
-static int
-_set_elan_ids(void)
-{
- int i;
-
- for (i = 0; i <= qsw_maxnodeid(); i++) {
- char host[256];
- if (qsw_gethost_bynodeid(host, 256, i) < 0)
- continue;
-
- if (_elan3_load_neterr_svc(i, host) < 0)
- error("elan3_load_neterr_svc(%d, %s): %m", i, host);
- }
-
- return SLURM_SUCCESS;
-}
-
-
-/*
- * Linear search through table of errno values and strings,
- * returns NULL on error, string on success.
- */
-static char *_lookup_slurm_api_errtab(int errnum)
-{
- char *res = NULL;
- int i;
-
- for (i = 0; i < sizeof(slurm_errtab) / sizeof(slurm_errtab_t); i++) {
- if (slurm_errtab[i].xe_number == errnum) {
- res = slurm_errtab[i].xe_message;
- break;
- }
- }
- return res;
-}
-
-extern int switch_p_get_errno(void)
-{
- int err = slurm_get_errno();
-
- if ((err >= ESLURM_SWITCH_MIN) && (err <= ESLURM_SWITCH_MAX))
- return err;
-
- return SLURM_SUCCESS;
-}
-
-extern char *switch_p_strerror(int errnum)
-{
- char *res = _lookup_slurm_api_errtab(errnum);
- return (res ? res : strerror(errnum));
-}
-
-/*
- * node switch state monitoring functions
- * required for IBM Federation switch
- */
-extern int switch_p_clear_node_state(void)
-{
- return SLURM_SUCCESS;
-}
-
-extern int switch_p_alloc_node_info(switch_node_info_t *switch_node)
-{
- return SLURM_SUCCESS;
-}
-
-extern int switch_p_build_node_info(switch_node_info_t switch_node)
-{
- return SLURM_SUCCESS;
-}
-
-extern int switch_p_pack_node_info(switch_node_info_t switch_node,
- Buf buffer)
-{
- return SLURM_SUCCESS;
-}
-
-extern int switch_p_unpack_node_info(switch_node_info_t switch_node,
- Buf buffer)
-{
- return SLURM_SUCCESS;
-}
-
-extern int switch_p_free_node_info(switch_node_info_t *switch_node)
-{
- return SLURM_SUCCESS;
-}
-
-extern char*switch_p_sprintf_node_info(switch_node_info_t switch_node,
- char *buf, size_t size)
-{
- if ((buf != NULL) && size) {
- buf[0] = '\0';
- return buf;
- }
-
- return NULL;
-}
-
-extern int switch_p_job_step_complete(switch_jobinfo_t *jobinfo,
- char *nodelist)
-{
- qsw_teardown_jobinfo((qsw_jobinfo_t) jobinfo); /* frees hw context */
-
- return SLURM_SUCCESS;
-}
-
-extern int switch_p_job_step_part_comp(switch_jobinfo_t *jobinfo,
- char *nodelist)
-{
- return SLURM_SUCCESS;
-}
-
-extern bool switch_p_part_comp(void)
-{
- return false;
-}
-
-extern int switch_p_job_step_allocated(switch_jobinfo_t *jobinfo,
- char *nodelist)
-{
- return qsw_restore_jobinfo((qsw_jobinfo_t) jobinfo);
-}
-
-extern int switch_p_slurmctld_init( void )
-{
- return SLURM_SUCCESS;
-}
-
-extern int switch_p_slurmd_init( void )
-{
- return SLURM_SUCCESS;
-}
-
-extern int switch_p_slurmd_step_init( void )
-{
- return SLURM_SUCCESS;
-}
diff --git a/src/plugins/switch/federation/Makefile.am b/src/plugins/switch/federation/Makefile.am
deleted file mode 100644
index d90112c816d3904331b49141316820fc42c5148d..0000000000000000000000000000000000000000
--- a/src/plugins/switch/federation/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-# Makefile for switch/federation plugin
-
-CPPFLAGS = -DFEDERATION_CONFIG_FILE=\"$(sysconfdir)/federation.conf\"
-AUTOMAKE_OPTIONS = foreign
-
-if HAVE_FEDERATION
-federation_lib = switch_federation.la
-else
-federation_lib =
-endif
-
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
-
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
-
-pkglib_LTLIBRARIES = $(federation_lib)
-
-if HAVE_FEDERATION
-# Federation switch plugin.
-switch_federation_la_SOURCES = \
- federation.c federation.h \
- federation_keys.h \
- switch_federation.c
-switch_federation_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) \
- $(FEDERATION_LDFLAGS)
-
-else
-EXTRA_switch_federation_la_SOURCES = \
- federation.c federation.h \
- federation_keys.h \
- switch_federation.c
-endif
diff --git a/src/plugins/switch/federation/Makefile.in b/src/plugins/switch/federation/Makefile.in
deleted file mode 100644
index 7ff088e86d0f5a9d2a6f9ec1f941fa4de8cd4090..0000000000000000000000000000000000000000
--- a/src/plugins/switch/federation/Makefile.in
+++ /dev/null
@@ -1,675 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# Makefile for switch/federation plugin
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-subdir = src/plugins/switch/federation
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
- $(top_srcdir)/auxdir/libtool.m4 \
- $(top_srcdir)/auxdir/ltoptions.m4 \
- $(top_srcdir)/auxdir/ltsugar.m4 \
- $(top_srcdir)/auxdir/ltversion.m4 \
- $(top_srcdir)/auxdir/lt~obsolete.m4 \
- $(top_srcdir)/auxdir/slurm.m4 \
- $(top_srcdir)/auxdir/x_ac__system_configuration.m4 \
- $(top_srcdir)/auxdir/x_ac_affinity.m4 \
- $(top_srcdir)/auxdir/x_ac_aix.m4 \
- $(top_srcdir)/auxdir/x_ac_blcr.m4 \
- $(top_srcdir)/auxdir/x_ac_bluegene.m4 \
- $(top_srcdir)/auxdir/x_ac_cflags.m4 \
- $(top_srcdir)/auxdir/x_ac_cray.m4 \
- $(top_srcdir)/auxdir/x_ac_databases.m4 \
- $(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
- $(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
- $(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
- $(top_srcdir)/auxdir/x_ac_hwloc.m4 \
- $(top_srcdir)/auxdir/x_ac_iso.m4 \
- $(top_srcdir)/auxdir/x_ac_lua.m4 \
- $(top_srcdir)/auxdir/x_ac_man2html.m4 \
- $(top_srcdir)/auxdir/x_ac_munge.m4 \
- $(top_srcdir)/auxdir/x_ac_ncurses.m4 \
- $(top_srcdir)/auxdir/x_ac_nrt.m4 \
- $(top_srcdir)/auxdir/x_ac_pam.m4 \
- $(top_srcdir)/auxdir/x_ac_printf_null.m4 \
- $(top_srcdir)/auxdir/x_ac_ptrace.m4 \
- $(top_srcdir)/auxdir/x_ac_readline.m4 \
- $(top_srcdir)/auxdir/x_ac_setpgrp.m4 \
- $(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
- $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
- $(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
- $(top_srcdir)/auxdir/x_ac_srun.m4 \
- $(top_srcdir)/auxdir/x_ac_sun_const.m4 \
- $(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/slurm/slurm.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
- for p in $$list; do echo "$$p $$p"; done | \
- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
- if (++n[$$2] == $(am__install_max)) \
- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
- END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(pkglibdir)"
-LTLIBRARIES = $(pkglib_LTLIBRARIES)
-switch_federation_la_LIBADD =
-am__switch_federation_la_SOURCES_DIST = federation.c federation.h \
- federation_keys.h switch_federation.c
-@HAVE_FEDERATION_TRUE@am_switch_federation_la_OBJECTS = federation.lo \
-@HAVE_FEDERATION_TRUE@ switch_federation.lo
-am__EXTRA_switch_federation_la_SOURCES_DIST = federation.c \
- federation.h federation_keys.h switch_federation.c
-switch_federation_la_OBJECTS = $(am_switch_federation_la_OBJECTS)
-switch_federation_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(switch_federation_la_LDFLAGS) $(LDFLAGS) -o $@
-@HAVE_FEDERATION_TRUE@am_switch_federation_la_rpath = -rpath \
-@HAVE_FEDERATION_TRUE@ $(pkglibdir)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/slurm
-depcomp = $(SHELL) $(top_srcdir)/auxdir/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
-SOURCES = $(switch_federation_la_SOURCES) \
- $(EXTRA_switch_federation_la_SOURCES)
-DIST_SOURCES = $(am__switch_federation_la_SOURCES_DIST) \
- $(am__EXTRA_switch_federation_la_SOURCES_DIST)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTHD_CFLAGS = @AUTHD_CFLAGS@
-AUTHD_LIBS = @AUTHD_LIBS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BGL_LOADED = @BGL_LOADED@
-BGQ_LOADED = @BGQ_LOADED@
-BG_INCLUDES = @BG_INCLUDES@
-BG_LDFLAGS = @BG_LDFLAGS@
-BG_L_P_LOADED = @BG_L_P_LOADED@
-BLCR_CPPFLAGS = @BLCR_CPPFLAGS@
-BLCR_HOME = @BLCR_HOME@
-BLCR_LDFLAGS = @BLCR_LDFLAGS@
-BLCR_LIBS = @BLCR_LIBS@
-BLUEGENE_LOADED = @BLUEGENE_LOADED@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CMD_LDFLAGS = @CMD_LDFLAGS@
-CPP = @CPP@
-CPPFLAGS = -DFEDERATION_CONFIG_FILE=\"$(sysconfdir)/federation.conf\"
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
-EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
-FGREP = @FGREP@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
-HAVEPGCONFIG = @HAVEPGCONFIG@
-HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
-HAVE_MAN2HTML = @HAVE_MAN2HTML@
-HAVE_NRT = @HAVE_NRT@
-HAVE_OPENSSL = @HAVE_OPENSSL@
-HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
-HWLOC_CPPFLAGS = @HWLOC_CPPFLAGS@
-HWLOC_LDFLAGS = @HWLOC_LDFLAGS@
-HWLOC_LIBS = @HWLOC_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIB_LDFLAGS = @LIB_LDFLAGS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
-MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
-MUNGE_LIBS = @MUNGE_LIBS@
-MYSQL_CFLAGS = @MYSQL_CFLAGS@
-MYSQL_LIBS = @MYSQL_LIBS@
-NCURSES = @NCURSES@
-NM = @NM@
-NMEDIT = @NMEDIT@
-NRT_CPPFLAGS = @NRT_CPPFLAGS@
-NRT_LDFLAGS = @NRT_LDFLAGS@
-NUMA_LIBS = @NUMA_LIBS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PAM_DIR = @PAM_DIR@
-PAM_LIBS = @PAM_LIBS@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PGSQL_CFLAGS = @PGSQL_CFLAGS@
-PGSQL_LIBS = @PGSQL_LIBS@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PROCTRACKDIR = @PROCTRACKDIR@
-PROJECT = @PROJECT@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-READLINE_LIBS = @READLINE_LIBS@
-REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
-RELEASE = @RELEASE@
-RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
-SED = @SED@
-SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
-SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SLURMCTLD_PORT = @SLURMCTLD_PORT@
-SLURMCTLD_PORT_COUNT = @SLURMCTLD_PORT_COUNT@
-SLURMDBD_PORT = @SLURMDBD_PORT@
-SLURMD_PORT = @SLURMD_PORT@
-SLURM_API_AGE = @SLURM_API_AGE@
-SLURM_API_CURRENT = @SLURM_API_CURRENT@
-SLURM_API_MAJOR = @SLURM_API_MAJOR@
-SLURM_API_REVISION = @SLURM_API_REVISION@
-SLURM_API_VERSION = @SLURM_API_VERSION@
-SLURM_MAJOR = @SLURM_MAJOR@
-SLURM_MICRO = @SLURM_MICRO@
-SLURM_MINOR = @SLURM_MINOR@
-SLURM_PREFIX = @SLURM_PREFIX@
-SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
-SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
-SO_LDFLAGS = @SO_LDFLAGS@
-SSL_CPPFLAGS = @SSL_CPPFLAGS@
-SSL_LDFLAGS = @SSL_LDFLAGS@
-SSL_LIBS = @SSL_LIBS@
-STRIP = @STRIP@
-UTIL_LIBS = @UTIL_LIBS@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_have_man2html = @ac_have_man2html@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lua_CFLAGS = @lua_CFLAGS@
-lua_LIBS = @lua_LIBS@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-AUTOMAKE_OPTIONS = foreign
-@HAVE_FEDERATION_FALSE@federation_lib =
-@HAVE_FEDERATION_TRUE@federation_lib = switch_federation.la
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
-pkglib_LTLIBRARIES = $(federation_lib)
-
-# Federation switch plugin.
-@HAVE_FEDERATION_TRUE@switch_federation_la_SOURCES = \
-@HAVE_FEDERATION_TRUE@ federation.c federation.h \
-@HAVE_FEDERATION_TRUE@ federation_keys.h \
-@HAVE_FEDERATION_TRUE@ switch_federation.c
-
-@HAVE_FEDERATION_TRUE@switch_federation_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) \
-@HAVE_FEDERATION_TRUE@ $(FEDERATION_LDFLAGS)
-
-@HAVE_FEDERATION_FALSE@EXTRA_switch_federation_la_SOURCES = \
-@HAVE_FEDERATION_FALSE@ federation.c federation.h \
-@HAVE_FEDERATION_FALSE@ federation_keys.h \
-@HAVE_FEDERATION_FALSE@ switch_federation.c
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
- && { if test -f $@; then exit 0; else break; fi; }; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/switch/federation/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/plugins/switch/federation/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
- @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
- list2=; for p in $$list; do \
- if test -f $$p; then \
- list2="$$list2 $$p"; \
- else :; fi; \
- done; \
- test -z "$$list2" || { \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
- }
-
-uninstall-pkglibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
- @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
- for p in $$list; do \
- $(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
- done
-
-clean-pkglibLTLIBRARIES:
- -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
-switch_federation.la: $(switch_federation_la_OBJECTS) $(switch_federation_la_DEPENDENCIES)
- $(switch_federation_la_LINK) $(am_switch_federation_la_rpath) $(switch_federation_la_OBJECTS) $(switch_federation_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
- -rm -f *.$(OBJEXT)
-
-distclean-compile:
- -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/federation.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/switch_federation.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
- fi
-ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
-
-GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d "$(distdir)/$$file"; then \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
- for dir in "$(DESTDIR)$(pkglibdir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
- mostlyclean-am
-
-distclean: distclean-am
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
- distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-pkglibLTLIBRARIES
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-pkglibLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkglibLTLIBRARIES \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/src/plugins/switch/federation/federation.c b/src/plugins/switch/federation/federation.c
deleted file mode 100644
index 749b4469dfbbe8453d5408437bb3f863ea7e96c9..0000000000000000000000000000000000000000
--- a/src/plugins/switch/federation/federation.c
+++ /dev/null
@@ -1,2629 +0,0 @@
-/*****************************************************************************\
- * federation.c - Library routines for initiating jobs on IBM Federation
- *****************************************************************************
- * Copyright (C) 2004-2007 The Regents of the University of California.
- * Copyright (C) 2008 Lawrence Livermore National Security.
- * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
- * Written by Jason King <jking@llnl.gov>
- * CODE-OCEC-09-009. All rights reserved.
- *
- * This file is part of SLURM, a resource management program.
- * For details, see <http://www.schedmd.com/slurmdocs/>.
- * Please also read the included file: DISCLAIMER.
- *
- * SLURM is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * In addition, as a special exception, the copyright holders give permission
- * to link the code of portions of this program with the OpenSSL library under
- * certain conditions as described in each individual source file, and
- * distribute linked combinations including the two. You must obey the GNU
- * General Public License in all respects for all of the code used other than
- * OpenSSL. If you modify file(s) with this exception, you may extend this
- * exception to your version of the file(s), but you are not obligated to do
- * so. If you do not wish to do so, delete this exception statement from your
- * version. If you delete this exception statement from all source files in
- * the program, then also delete it here.
- *
- * SLURM is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along
- * with SLURM; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-\*****************************************************************************/
-
-#include <assert.h>
-#include <pthread.h>
-#include <stdlib.h>
-
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#if HAVE_LIBNTBL
-# include <ntbl.h>
-#else
-# error "Must have libntbl to compile this module!"
-#endif
-
-#include <sys/stat.h>
-
-#include "slurm/slurm_errno.h"
-#include "src/common/slurm_xlator.h"
-#include "src/common/read_config.h"
-#include "src/plugins/switch/federation/federation.h"
-#include "src/plugins/switch/federation/federation_keys.h"
-
-/*
- * Definitions local to this module
- */
-#define FED_NODEINFO_MAGIC 0xc00cc00d
-#define FED_JOBINFO_MAGIC 0xc00cc00e
-#define FED_LIBSTATE_MAGIC 0xc00cc00f
-
-#define FED_ADAPTERNAME_LEN 5
-#define FED_HOSTLEN 20
-#define FED_VERBOSE_PRINT 0
-#define FED_NODECOUNT 128
-#define FED_HASHCOUNT 128
-#define FED_AUTO_WINMEM 0
-#define FED_MAX_WIN 15
-#define FED_MIN_WIN 0
-#define FED_DEBUG 0
-
-#define BUFSIZE 4096
-
-char* fed_conf = NULL;
-extern bool fed_need_state_save;
-
-mode_t fed_umask;
-
-/*
- * Data structures specific to Federation
- *
- * We are going to some trouble to keep these defs private so slurm
- * hackers not interested in the interconnect details can just pass around
- * the opaque types. All use of the data structure internals is local to this
- * module.
- */
-
-typedef struct fed_window {
- uint16_t id;
- uint32_t status;
- uint16_t job_key;
-} fed_window_t;
-
-typedef struct fed_adapter {
- char name[FED_ADAPTERNAME_LEN];
- uint16_t lid;
- uint16_t network_id;
- uint32_t max_winmem;
- uint32_t min_winmem;
- uint32_t avail_mem;
- uint32_t window_count;
- fed_window_t *window_list;
-} fed_adapter_t;
-
-struct fed_nodeinfo {
- uint32_t magic;
- char name[FED_HOSTLEN];
- uint32_t adapter_count;
- fed_adapter_t *adapter_list;
- struct fed_nodeinfo *next;
-};
-
-struct fed_libstate {
- uint32_t magic;
- uint32_t node_count;
- uint32_t node_max;
- fed_nodeinfo_t *node_list;
- uint32_t hash_max;
- fed_nodeinfo_t **hash_table;
- uint16_t key_index;
-};
-
-struct fed_jobinfo {
- uint32_t magic;
- /* version from ntbl_version() */
- /* adapter from lid in table */
- /* network_id from lid in table */
- /* uid from getuid() */
- /* pid from getpid() */
- uint16_t job_key;
- char job_desc[DESCLEN];
- uint32_t window_memory;
- uint8_t bulk_xfer; /* flag */
- uint16_t tables_per_task;
- fed_tableinfo_t *tableinfo;
-
- hostlist_t nodenames;
- int num_tasks;
-};
-
-typedef struct {
- int status_number;
- char *status_msg;
-} fed_status_t;
-
-typedef struct {
- char name[FED_ADAPTERNAME_LEN];
- uint16_t lid;
- uint16_t network_id;
-} fed_cache_entry_t;
-
-/*
- * Globals
- */
-fed_libstate_t *fed_state = NULL;
-pthread_mutex_t global_lock = PTHREAD_MUTEX_INITIALIZER;
-
-/* slurmd/slurmstepd global variables */
-hostlist_t adapter_list;
-static fed_cache_entry_t lid_cache[FED_MAXADAPTERS];
-
-
-#define FED_STATUS_UNKNOWN 99
-static fed_status_t fed_status_tab[]= {
- {0, "NTBL_SUCCESS"},
- {1, "NTBL_EINVAL"},
- {2, "NTBL_EPERM"},
- {3, "NTBL_EIOCTL"},
- {4, "NTBL_EADAPTER"},
- {5, "NTBL_ESYSTEM"},
- {6, "NTBL_EMEM"},
- {7, "NTBL_ELID"},
- {8, "NTBL_EIO"},
- {9, "NTBL_UNLOADED_STATE"},
- {10, "NTBL_LOADED_STATE"},
- {11, "NTBL_DISABLED_STATE"},
- {12, "NTBL_ACTIVE_STATE"},
- {13, "NTBL_BUSY_STATE"},
- {14, "NTBL_NO_RDMA_AVAIL"},
- {FED_STATUS_UNKNOWN, "UNKNOWN_RESULT_CODE"}
-};
-
-static void _hash_rebuild(fed_libstate_t *state);
-static int _set_up_adapter(fed_adapter_t *fed_adapter, char *adapter_name);
-static int _parse_fed_file(hostlist_t *adapter_list);
-static void _init_adapter_cache(void);
-static int _fill_in_adapter_cache(void);
-
-/* The _lock() and _unlock() functions are used to lock/unlock a
- * global mutex. Used to serialize access to the global library
- * state variable fed_state.
- */
-static void
-_lock(void)
-{
- int err = 1;
-
- while(err) {
- err = pthread_mutex_lock(&global_lock);
- }
-}
-
-static void
-_unlock(void)
-{
- int err = 1;
-
- while(err) {
- err = pthread_mutex_unlock(&global_lock);
- }
-}
-
-int
-fed_slurmctld_init(void)
-{
- return SLURM_SUCCESS;
-}
-
-int
-fed_slurmd_init(void)
-{
- /*
- * This is a work-around for the ntbl_* functions calling umask(0)
- */
- fed_umask = umask(0077);
- umask(fed_umask);
-
- /*_init_adapter_cache();*/
-
- adapter_list = hostlist_create(NULL);
- if (_parse_fed_file(&adapter_list) != SLURM_SUCCESS)
- return SLURM_FAILURE;
- assert(hostlist_count(adapter_list) <= FED_MAXADAPTERS);
- return SLURM_SUCCESS;
-}
-
-int
-fed_slurmd_step_init(void)
-{
- /*
- * This is a work-around for the ntbl_* functions calling umask(0)
- */
- fed_umask = umask(0077);
- umask(fed_umask);
-
- _init_adapter_cache();
-
- adapter_list = hostlist_create(NULL);
- if (_parse_fed_file(&adapter_list) != SLURM_SUCCESS)
- return SLURM_FAILURE;
- assert(hostlist_count(adapter_list) <= FED_MAXADAPTERS);
-
- _fill_in_adapter_cache();
-
- return SLURM_SUCCESS;
-}
-
-static char *
-_lookup_fed_status_tab(int status)
-{
- char *res = NULL;
- int i;
-
- for(i = 0; i < sizeof(fed_status_tab) / sizeof(fed_status_t); i++) {
- if(fed_status_tab[i].status_number == status) {
- res = fed_status_tab[i].status_msg;
- break;
- }
- }
-
- if(!res)
- res = fed_status_tab[FED_STATUS_UNKNOWN].status_msg;
-
- return res;
-}
-
-/* Used by: slurmd, slurmctld */
-void fed_print_jobinfo(FILE *fp, fed_jobinfo_t *jobinfo)
-{
- assert(jobinfo->magic == FED_JOBINFO_MAGIC);
-
- /* stubbed out */
-}
-
-/* Used by: slurmd, slurmctld */
-char *fed_sprint_jobinfo(fed_jobinfo_t *j, char *buf,
- size_t size)
-{
- int count;
- char *tmp = buf;
- int remaining = size;
-
- assert(buf);
- assert(j);
- assert(j->magic == FED_JOBINFO_MAGIC);
-
- count = snprintf(tmp, remaining,
- "--Begin Jobinfo--\n"
- " job_key: %u\n"
- " job_desc: %s\n"
- " window_memory: %u\n"
- " table_size: %u\n"
- "--End Jobinfo--\n",
- j->job_key,
- j->job_desc,
- j->window_memory,
- j->tables_per_task);
- if(count < 0)
- return buf;
- remaining -= count;
- tmp += count;
- if(remaining < 1)
- return buf;
-
- return buf;
-}
-
-/* The lid caching functions were created to avoid unnecessary
- * function calls each time we need to load network tables on a node.
- * _init_cache() simply initializes the cache to sane values and
- * needs to be called before any other cache functions are called.
- *
- * Used by: slurmd/slurmstepd
- */
-static void
-_init_adapter_cache(void)
-{
- int i;
-
- for(i = 0; i < FED_MAXADAPTERS; i++) {
- lid_cache[i].name[0] = 0;
- lid_cache[i].lid = -1;
- lid_cache[i].network_id = -1;
- }
-}
-
-/* Use ntbl_adapter_resources to cache information about local adapters.
- *
- * Used by: slurmstepd
- */
-static int
-_fill_in_adapter_cache(void)
-{
- hostlist_iterator_t adapters;
- char *adapter_name = NULL;
- ADAPTER_RESOURCES res;
- int num;
- int rc;
- int i;
-
- adapters = hostlist_iterator_create(adapter_list);
- for (i = 0; (adapter_name = hostlist_next(adapters)); i++) {
- rc = ntbl_adapter_resources(NTBL_VERSION, adapter_name, &res);
- if (rc != NTBL_SUCCESS)
- return SLURM_ERROR;
-
- num = adapter_name[3] - (int)'0';
- assert(num < FED_MAXADAPTERS);
- lid_cache[num].lid = res.lid;
- lid_cache[num].network_id = res.network_id;
- strncpy(lid_cache[num].name, adapter_name, FED_ADAPTERNAME_LEN);
-
- free(res.window_list);
- free(adapter_name);
- }
- hostlist_iterator_destroy(adapters);
- umask(fed_umask);
-
- return SLURM_SUCCESS;
-}
-
-
-/* Cache the lid and network_id of a given adapter. Ex: sni0 with lid 10
- * gets cached in array index 0 with a lid = 10 and a name = sni0.
- *
- * Used by: slurmd
- */
-static void
-_cache_lid(fed_adapter_t *ap)
-{
- assert(ap);
-
- int adapter_num = ap->name[3] - (int) '0';
-
- lid_cache[adapter_num].lid = ap->lid;
- lid_cache[adapter_num].network_id = ap->network_id;
- strncpy(lid_cache[adapter_num].name, ap->name, FED_ADAPTERNAME_LEN);
-}
-
-
-/* Check lid cache for an adapter name and return the network id.
- *
- * Used by: slurmd
- */
-static uint16_t
-_get_network_id_from_adapter(char *adapter_name)
-{
- int i;
-
- for (i = 0; i < FED_MAXADAPTERS; i++) {
- if (!strncmp(adapter_name, lid_cache[i].name,
- FED_ADAPTERNAME_LEN))
- return lid_cache[i].network_id;
- }
-
- return (uint16_t) -1;
-}
-
-
-/* Check lid cache for an adapter name and return the lid.
- *
- * Used by: slurmd
- */
-static uint16_t
-_get_lid_from_adapter(char *adapter_name)
-{
- int i;
-
- for (i = 0; i < FED_MAXADAPTERS; i++) {
- if (!strncmp(adapter_name, lid_cache[i].name,
- FED_ADAPTERNAME_LEN))
- return lid_cache[i].lid;
- }
-
- return (uint16_t) -1;
-}
-
-
-static int _set_up_adapter(fed_adapter_t *fed_adapter, char *adapter_name)
-{
- ADAPTER_RESOURCES res;
- struct NTBL_STATUS *status = NULL;
- struct NTBL_STATUS *old = NULL;
- fed_window_t *tmp_winlist = NULL;
- int win_count = 0, i;
- int error_code;
-
- info("adapter_name is %s", adapter_name);
-
- error_code = ntbl_adapter_resources(NTBL_VERSION,
- adapter_name,
- &res);
- if(error_code != NTBL_SUCCESS)
- return SLURM_ERROR;
- strncpy(fed_adapter->name,
- adapter_name,
- FED_ADAPTERNAME_LEN);
- fed_adapter->lid = res.lid;
- fed_adapter->network_id = res.network_id;
- /* FUTURE: check that we don't lose information when converting
- * from 64 to 32 bit unsigned ints in the next three assignments.
- */
- fed_adapter->max_winmem = res.max_window_memory;
- fed_adapter->min_winmem = res.min_window_memory;
- fed_adapter->avail_mem = res.avail_adapter_memory;
- fed_adapter->window_count = res.window_count;
- free(res.window_list);
- _cache_lid(fed_adapter);
- error_code = ntbl_status_adapter(NTBL_VERSION,
- adapter_name,
- &win_count,
- &status);
- umask(fed_umask);
- if(error_code)
- slurm_seterrno_ret(ESTATUS);
- tmp_winlist = (fed_window_t *)xmalloc(sizeof(fed_window_t) *
- res.window_count);
- if(!tmp_winlist)
- slurm_seterrno_ret(ENOMEM);
- for(i = 0; i < res.window_count; i++) {
- tmp_winlist[i].id = status->window_id;
- tmp_winlist[i].status = status->rc;
- old = status;
- status = status->next;
- free(old);
- }
- fed_adapter->window_list = tmp_winlist;
- return SLURM_SUCCESS;
-}
-
-static char *_get_fed_conf(void)
-{
- char *val = getenv("SLURM_CONF");
- char *rc;
- int i;
-
- if (!val)
- return xstrdup(FEDERATION_CONFIG_FILE);
-
- /* Replace file name on end of path */
- i = strlen(val) - strlen("slurm.conf") + strlen("federation.conf") + 1;
- rc = xmalloc(i);
- strcpy(rc, val);
- val = strrchr(rc, (int)'/');
- if (val) /* absolute path */
- val++;
- else /* not absolute path */
- val = rc;
- strcpy(val, "federation.conf");
- return rc;
-}
-
-static int _parse_fed_file(hostlist_t *adapter_list)
-{
- s_p_options_t options[] = {{"AdapterName", S_P_STRING}, {NULL}};
- s_p_hashtbl_t *tbl;
- char *adapter_name;
-
- debug("Reading the federation.conf file");
- if (!fed_conf)
- fed_conf = _get_fed_conf();
-
- tbl = s_p_hashtbl_create(options);
- if(s_p_parse_file(tbl, NULL, fed_conf, false) == SLURM_ERROR)
- fatal("something wrong with opening/reading federation "
- "conf file");
-
- if (s_p_get_string(&adapter_name, "AdapterName", tbl)) {
- int rc;
- rc = hostlist_push(*adapter_list, adapter_name);
- if (rc == 0)
- error("Adapter name format is incorrect.");
- xfree(adapter_name);
- }
-
- s_p_hashtbl_destroy(tbl);
-
- return SLURM_SUCCESS;
-}
-
-/* Check for existence of sniX, where X is from 0 to FED_MAXADAPTERS.
- * For all that exist, record vital adapter info plus status for all windows
- * available on that adapter. Cache lid to adapter name mapping locally.
- *
- * Used by: slurmd
- */
-static int
-_get_adapters(fed_adapter_t *list, int *count)
-{
- hostlist_iterator_t adapter_iter;
- char *adapter = NULL;
- int i;
-
- assert(list != NULL);
- assert(adapter_list != NULL);
-
- adapter_iter = hostlist_iterator_create(adapter_list);
- for (i = 0; (adapter = hostlist_next(adapter_iter)); i++) {
- if(_set_up_adapter(list + i, adapter) == SLURM_ERROR)
- fatal("Failed to set up adapter %s.", adapter);
- free(adapter);
- }
- hostlist_iterator_destroy(adapter_iter);
-
- assert(i > 0);
- *count = i;
- info("Number of adapters is = %d", *count);
-
- if(!*count)
- slurm_seterrno_ret(ENOADAPTER);
-
- return 0;
-}
-
-/* Used by: slurmd, slurmctld */
-int
-fed_alloc_jobinfo(fed_jobinfo_t **j)
-{
- fed_jobinfo_t *new;
-
- assert(j != NULL);
- new = (fed_jobinfo_t *)xmalloc(sizeof(fed_jobinfo_t));
- if (!new)
- slurm_seterrno_ret(ENOMEM);
- new->magic = FED_JOBINFO_MAGIC;
- new->job_key = -1;
- new->window_memory = 0;
- new->tables_per_task = 0;
- new->tableinfo = NULL;
- *j = new;
-
- return 0;
-}
-
-/* Used by: slurmd, slurmctld */
-int
-fed_alloc_nodeinfo(fed_nodeinfo_t **n)
-{
- fed_nodeinfo_t *new;
-
- assert(n);
-
- new = (fed_nodeinfo_t *)xmalloc(sizeof(fed_nodeinfo_t));
- if(!new)
- slurm_seterrno_ret(ENOMEM);
- new->adapter_list = (fed_adapter_t *)xmalloc(sizeof(fed_adapter_t)
- * FED_MAXADAPTERS);
- if(!new->adapter_list) {
- xfree(new);
- slurm_seterrno_ret(ENOMEM);
- }
- new->magic = FED_NODEINFO_MAGIC;
- new->adapter_count = 0;
- new->next = NULL;
-
- *n = new;
-
- return 0;
-}
-
-/* Assumes a pre-allocated nodeinfo structure and uses _get_adapters
- * to do the dirty work. We probably collect more information about
- * the adapters on a give node than we need to but it was done
- * in the interest of being prepared for future requirements.
- *
- * Used by: slurmd
- */
-int
-fed_build_nodeinfo(fed_nodeinfo_t *n, char *name)
-{
- int count;
- int err;
-
- assert(n);
- assert(n->magic == FED_NODEINFO_MAGIC);
- assert(name);
-
- strncpy(n->name, name, FED_HOSTLEN);
- _lock();
- err = _get_adapters(n->adapter_list, &count);
- _unlock();
- if(err != 0)
- return err;
- n->adapter_count = count;
- return 0;
-}
-#if FED_DEBUG
-static int
-_print_adapter_resources(ADAPTER_RESOURCES *r, char *buf, size_t size)
-{
- int count;
-
- assert(r);
- assert(buf);
- assert(size > 0);
-
- count = snprintf(buf, size,
- "--Begin Adapter Resources--\n"
- " device_type = %x\n"
- " lid = %d\n"
- " network_id = %d\n"
- " max_window_memory = %lld\n"
- " min_window_memory = %lld\n"
- " avail_adapter_memory = %lld\n"
- " fifo_slot_size = %lld\n"
- " window_count = %d\n"
- " window_list = %d\n"
-#if NTBL_VERSION == 120
- " reserved = %lld\n"
-#else
- " rcontext_block_count = %lld\n"
-#endif
- "--End Adapter Resources--\n",
- r->device_type,
- r->lid,
- r->network_id,
- r->max_window_memory,
- r->min_window_memory,
- r->avail_adapter_memory,
- r->fifo_slot_size,
- r->window_count,
- r->window_list[0],
-#if NTBL_VERSION == 120
- r->reserved);
-#else
- r->rcontext_block_count);
-#endif
-
- return count;
-}
-
-static int
-_print_window_status(struct NTBL_STATUS *s, char *buf, size_t size)
-{
- int count;
-
- assert(s);
- assert(buf);
- assert(size > 0);
-
- switch(s->rc) {
- case NTBL_UNLOADED_STATE:
- count = snprintf(buf, size,
-#if FED_VERBOSE_PRINT
- "--Begin NTBL Status For Window %d on %s--\n"
- " window_id = %u\n"
- " adapter = %s\n"
- " return code = %s\n"
- "--End NTBL Status For Window %d on %s--\n",
- s->window_id, s->adapter,
- s->window_id,
- s->adapter,
- _lookup_fed_status_tab(s->rc),
- s->window_id, s->adapter);
-#else
- "window %u on %s: %s\n",
- s->window_id, s->adapter,
- _lookup_fed_status_tab(s->rc));
-#endif
- break;
- case NTBL_LOADED_STATE:
- case NTBL_DISABLED_STATE:
- case NTBL_ACTIVE_STATE:
- case NTBL_BUSY_STATE:
- count = snprintf(buf, size,
-#if FED_VERBOSE_PRINT
- "--Begin NTBL Status For Window %d on %s--\n"
- " user_name = %s\n"
- " client_pid = %d\n"
- " uid = %d\n"
- " window_id = %u\n"
- " adapter = %s\n"
- " memory_requested = %llu\n"
- " memory_allocated = %llu\n"
- " time_loaded = %s\n"
- " description = %s\n"
- " return code = %s\n"
- "--End NTBL Status For Window %d on %s--\n",
- s->window_id, s->adapter,
- s->user_name,
- s->client_pid,
- s->uid,
- s->window_id,
- s->adapter,
- s->memory_requested,
- s->memory_allocated,
- s->time_loaded,
- s->description,
- _lookup_fed_status_tab(s->rc),
- s->window_id, s->adapter);
-#else
- "window %u on %s: %s\n",
- s->window_id, s->adapter,
- _lookup_fed_status_tab(s->rc));
-#endif
- break;
- default:
- count = snprintf(buf, size,
- "Uknown NTBL Return Code For Window %d: %s\n",
- s->window_id,
- _lookup_fed_status_tab(s->rc));
- }
-
- return count;
-}
-#endif
-static int
-_print_window_struct(fed_window_t *w, char *buf, size_t size)
-{
- int count;
-
- assert(w);
- assert(buf);
- assert(size > 0);
-
-
- count = snprintf(buf, size,
- " Window %u: %s\n",
- w->id,
- _lookup_fed_status_tab(w->status));
-
- return count;
-}
-
-/* Writes out nodeinfo structure to a buffer. Maintains the
- * snprintf semantics by only filling the buffer up to the value
- * of size. If FED_VERBOSE_PRINT is defined this function will
- * dump the entire structure, otherwise only the "useful" part.
- *
- * Used by: slurmd, slurmctld
- */
-char *
-fed_print_nodeinfo(fed_nodeinfo_t *n, char *buf, size_t size)
-{
- fed_adapter_t *a;
- int i,j;
- fed_window_t *w;
- int remaining = size;
- int count;
- char *tmp = buf;
-
- assert(n);
- assert(buf);
- assert(size > 0);
- assert(n->magic == FED_NODEINFO_MAGIC);
-
- count = snprintf(tmp, remaining,
- "Node: %s\n",
- n->name);
- if(count < 0)
- return buf;
- remaining -= count;
- tmp += count;
- if(remaining < 1)
- return buf;
- for(i = 0; i < n->adapter_count; i++) {
- a = n->adapter_list + i;
- count = snprintf(tmp, remaining,
-#if FED_VERBOSE_PRINT
- " Adapter: %s\n"
- " lid: %u\n"
- " network_id: %u\n"
- " max_window_memory: %u\n"
- " min_window_memory: %u\n"
- " avail_adapter_memory: %u\n"
- " window_count: %u\n",
- a->name,
- a->lid,
- a->network_id,
- a->max_winmem,
- a->min_winmem,
- a->avail_mem,
- a->window_count);
-#else
- " Adapter: %s\n"
- " Window count: %d\n"
- " Active windows:\n",
- a->name,
- a->window_count);
-#endif
- if(count < 0)
- return buf;
- remaining -= count;
- tmp += count;
- if(remaining < 1)
- return buf;
-
- w = a->window_list;
- for(j = 0; j < a->window_count; j++) {
-#if FED_VERBOSE_PRINT
- count = _print_window_struct(&w[j], tmp, remaining);
-#else
-
- if(w[j].status != NTBL_UNLOADED_STATE)
- count = _print_window_struct(&w[j], tmp,
- remaining);
- else
- count = 0;
-#endif
- if(count < 0)
- return buf;
- remaining -= count;
- tmp += count;
- if(remaining < 1)
- return buf;
- }
- }
-
- return buf;
-}
-
-/* Note that when collecting max_winmem, min_winmem and avail_mem
- * we convert these values from 64 to 32 bit unisgned integers. This
- * was to make the pack/unpack implementation easier. I am taking a
- * chance here that IBM will not release Federation adapters with more
- * than 4GB of memory.
- *
- * Used by: all
- */
-int
-fed_pack_nodeinfo(fed_nodeinfo_t *n, Buf buf)
-{
- int i,j;
- fed_adapter_t *a;
- int offset;
-
- assert(n);
- assert(n->magic == FED_NODEINFO_MAGIC);
- assert(buf);
-
- offset = get_buf_offset(buf);
- pack32(n->magic, buf);
- packmem(n->name, FED_HOSTLEN, buf);
- pack32(n->adapter_count, buf);
- for(i = 0; i < n->adapter_count; i++) {
- a = n->adapter_list + i;
- packmem(a->name, FED_ADAPTERNAME_LEN, buf);
- pack16(a->lid, buf);
- pack16(a->network_id, buf);
- pack32(a->max_winmem, buf);
- pack32(a->min_winmem, buf);
- pack32(a->avail_mem, buf);
- pack32(a->window_count, buf);
- for(j = 0; j < a->window_count; j++) {
- pack16(a->window_list[j].id, buf);
- pack32(a->window_list[j].status, buf);
- pack16(a->window_list[j].job_key, buf);
- }
- }
-
- return(get_buf_offset(buf) - offset);
-}
-
-/* Used by: all */
-static int
-_copy_node(fed_nodeinfo_t *dest, fed_nodeinfo_t *src)
-{
- int i,j;
- fed_adapter_t *sa = NULL;
- fed_adapter_t *da = NULL;
-
- assert(dest);
- assert(src);
- assert(dest->magic == FED_NODEINFO_MAGIC);
- assert(src->magic == FED_NODEINFO_MAGIC);
-
- strncpy(dest->name, src->name, FED_HOSTLEN);
- dest->adapter_count = src->adapter_count;
- for(i = 0; i < dest->adapter_count; i++) {
- sa = src->adapter_list + i;
- da = dest->adapter_list +i;
- strncpy(da->name, sa->name, FED_ADAPTERNAME_LEN);
- da->lid = sa->lid;
- da->network_id = sa->network_id;
- da->max_winmem = sa->max_winmem;
- da->min_winmem = sa->min_winmem;
- da->avail_mem = sa->avail_mem;
- da->window_count = sa->window_count;
- da->window_list = (fed_window_t *)xmalloc(sizeof(fed_window_t) *
- da->window_count);
- if(!da->window_list) {
- slurm_seterrno_ret(ENOMEM);
- }
- for(j = 0; j < da->window_count; j++)
- da->window_list[j] = sa->window_list[j];
- }
-
- return SLURM_SUCCESS;
-}
-
-/* The idea behind keeping the hash table was to avoid a linear
- * search of the node list each time we want to retrieve or
- * modify a node's data. The _hash_index function translates
- * a node name to an index into the hash table.
- *
- * Used by: slurmctld
- */
-static int
-_hash_index (char *name)
-{
- int index = 0;
- int j;
-
- assert(name);
-
- /* Multiply each character by its numerical position in the
- * name string to add a bit of entropy, because host names such
- * as cluster[0001-1000] can cause excessive index collisions.
- */
- for (j = 1; *name; name++, j++)
- index += (int)*name * j;
- index %= fed_state->hash_max;
-
- return index;
-}
-
-/* Tries to find a node fast using the hash table
- *
- * Used by: slurmctld
- */
-static fed_nodeinfo_t *
-_find_node(fed_libstate_t *lp, char *name)
-{
- int i;
- fed_nodeinfo_t *n;
-
- assert(name);
- assert(lp);
-
- if (lp->node_count == 0)
- return NULL;
-
- if (lp->hash_table) {
- i = _hash_index(name);
- n = lp->hash_table[i];
- while(n) {
- assert(n->magic == FED_NODEINFO_MAGIC);
- if(!strncmp(n->name, name, FED_HOSTLEN))
- return n;
- n = n->next;
- }
- }
-
- return NULL;
-}
-
-/* Add the hash entry for a newly created fed_nodeinfo_t
- */
-static void
-_hash_add_nodeinfo(fed_libstate_t *state, fed_nodeinfo_t *node)
-{
- int index;
-
- assert(state);
- assert(state->hash_table);
- assert(state->hash_max >= state->node_count);
- if(!strlen(node->name))
- return;
- index = _hash_index(node->name);
- node->next = state->hash_table[index];
- state->hash_table[index] = node;
-}
-
-/* Recreates the hash table for the node list.
- *
- * Used by: slurmctld
- */
-static void
-_hash_rebuild(fed_libstate_t *state)
-{
- int i;
-
- assert(state);
-
- if(state->hash_table)
- xfree(state->hash_table);
- if (state->node_count > state->hash_max || state->hash_max == 0)
- state->hash_max += FED_HASHCOUNT;
- state->hash_table = (fed_nodeinfo_t **)
- xmalloc(sizeof(fed_nodeinfo_t *) * state->hash_max);
- memset(state->hash_table, 0,
- sizeof(fed_nodeinfo_t *) * state->hash_max);
- for(i = 0; i < state->node_count; i++)
- _hash_add_nodeinfo(state, &(state->node_list[i]));
-}
-
-/* If the node is already in the node list then simply return
- * a pointer to it, otherwise dynamically allocate memory to the
- * node list if necessary.
- *
- * Used by: slurmctld
- */
-static fed_nodeinfo_t *
-_alloc_node(fed_libstate_t *lp, char *name)
-{
- fed_nodeinfo_t *n = NULL;
- int new_bufsize;
- bool need_hash_rebuild = false;
-
- assert(lp);
-
- if(name != NULL) {
- n = _find_node(lp, name);
- if(n != NULL)
- return n;
- }
-
- fed_need_state_save = true;
-
- if(lp->node_count >= lp->node_max) {
- lp->node_max += FED_NODECOUNT;
- new_bufsize = lp->node_max * sizeof(fed_nodeinfo_t);
- if(lp->node_list == NULL)
- lp->node_list = (fed_nodeinfo_t *)xmalloc(new_bufsize);
- else
- lp->node_list = (fed_nodeinfo_t *)xrealloc(lp->node_list,
- new_bufsize);
- need_hash_rebuild = true;
- }
- if(lp->node_list == NULL) {
- slurm_seterrno(ENOMEM);
- return NULL;
- }
-
- n = lp->node_list + (lp->node_count++);
- n->magic = FED_NODEINFO_MAGIC;
- n->name[0] = '\0';
- n->adapter_list = (fed_adapter_t *)xmalloc(FED_MAXADAPTERS *
- sizeof(fed_adapter_t));
-
- if(name != NULL) {
- strncpy(n->name, name, FED_HOSTLEN);
- if (need_hash_rebuild || lp->node_count > lp->hash_max)
- _hash_rebuild(lp);
- else
- _hash_add_nodeinfo(lp, n);
- }
-
- return n;
-}
-#if FED_DEBUG
-/* Used by: slurmctld */
-static void
-_print_libstate(const fed_libstate_t *l)
-{
- int i;
- char buf[3000];
-
- assert(l);
-
- printf("--Begin libstate--\n");
- printf(" magic = %u\n", l->magic);
- printf(" node_count = %u\n", l->node_count);
- printf(" node_max = %u\n", l->node_max);
- printf(" hash_max = %u\n", l->hash_max);
- for(i = 0; i < l->node_count; i++) {
- memset(buf, 0, 3000);
- fed_print_nodeinfo(&l->node_list[i], buf, 3000);
- printf("%s", buf);
- }
- printf("--End libstate--\n");
-}
-#endif
-
-
-/* Throw away adapter portion of the nodeinfo.
- *
- * Used by: _unpack_nodeinfo
- */
-static int _fake_unpack_adapters(Buf buf)
-{
- uint32_t adapter_count;
- uint32_t window_count;
- uint32_t dummy32;
- uint16_t dummy16;
- char *dummyptr;
- int i, j;
-
- safe_unpack32(&adapter_count, buf);
- for (i = 0; i < adapter_count; i++) {
- /* no copy, just advances buf counters */
- safe_unpackmem_ptr(&dummyptr, &dummy32, buf);
- if (dummy32 != FED_ADAPTERNAME_LEN)
- goto unpack_error;
- safe_unpack16(&dummy16, buf);
- safe_unpack16(&dummy16, buf);
- safe_unpack32(&dummy32, buf);
- safe_unpack32(&dummy32, buf);
- safe_unpack32(&dummy32, buf);
- safe_unpack32(&window_count, buf);
- for (j = 0; j < window_count; j++) {
- safe_unpack16(&dummy16, buf);
- safe_unpack32(&dummy32, buf);
- safe_unpack16(&dummy16, buf);
- }
- }
-
- return SLURM_SUCCESS;
-
-unpack_error:
- return SLURM_ERROR;
-}
-
-
-/* Unpack nodeinfo and update persistent libstate.
- *
- * If believe_window_status is true, we honor the window status variables
- * from the packed fed_nodeinfo_t. If it is false we set the status of
- * all windows to NTBL_UNLOADED_STATE.
- *
- * Used by: slurmctld
- */
-static int
-_unpack_nodeinfo(fed_nodeinfo_t *n, Buf buf, bool believe_window_status)
-{
- int i, j;
- fed_adapter_t *tmp_a = NULL;
- fed_window_t *tmp_w = NULL;
- uint32_t size;
- fed_nodeinfo_t *tmp_n = NULL;
- char *name_ptr, name[FED_HOSTLEN];
- int magic;
-
- /* NOTE! We don't care at this point whether n is valid.
- * If it's NULL, we will just forego the copy at the end.
- */
- assert(buf);
-
- /* Extract node name from buffer
- */
- safe_unpack32(&magic, buf);
- if(magic != FED_NODEINFO_MAGIC)
- slurm_seterrno_ret(EBADMAGIC_FEDNODEINFO);
- safe_unpackmem_ptr(&name_ptr, &size, buf);
- if(size != FED_HOSTLEN)
- goto unpack_error;
- memcpy(name, name_ptr, size);
-
- /* When the slurmctld is in normal operating mode (NOT backup mode),
- * the global fed_state structure should NEVER be NULL at the time that
- * this function is called. Therefore, if fed_state is NULL here,
- * we assume that the controller is in backup mode. In backup mode,
- * the slurmctld only unpacks RPCs to find out their identity.
- * Most of the RPCs, including the one calling this function, are
- * simply ignored.
- *
- * So, here we just do a fake unpack to advance the buffer pointer.
- */
- if (fed_state == NULL) {
- if (_fake_unpack_adapters(buf) != SLURM_SUCCESS) {
- slurm_seterrno_ret(EUNPACK);
- } else {
- return SLURM_SUCCESS;
- }
- }
-
- /* If we already have nodeinfo for this node, we ignore this message.
- * The slurmctld's view of window allocation is always better than
- * the slurmd's view. We only need the slurmd's view if the slurmctld
- * has no nodeinfo at all for that node.
- */
- if (name != NULL) {
- tmp_n = _find_node(fed_state, name);
- if (tmp_n != NULL) {
- if (_fake_unpack_adapters(buf) != SLURM_SUCCESS) {
- slurm_seterrno_ret(EUNPACK);
- } else {
- goto copy_node;
- }
- }
- }
-
- /* Update global libstate with this nodes' info.
- */
- tmp_n = _alloc_node(fed_state, name);
- if(tmp_n == NULL)
- return SLURM_ERROR;
- tmp_n->magic = magic;
- safe_unpack32(&tmp_n->adapter_count, buf);
- for(i = 0; i < tmp_n->adapter_count; i++) {
- tmp_a = tmp_n->adapter_list + i;
- safe_unpackmem_ptr(&name_ptr, &size, buf);
- if(size != FED_ADAPTERNAME_LEN)
- goto unpack_error;
- memcpy(tmp_a->name, name_ptr, size);
- safe_unpack16(&tmp_a->lid, buf);
- safe_unpack16(&tmp_a->network_id, buf);
- safe_unpack32(&tmp_a->max_winmem, buf);
- safe_unpack32(&tmp_a->min_winmem, buf);
- safe_unpack32(&tmp_a->avail_mem, buf);
- safe_unpack32(&tmp_a->window_count, buf);
- tmp_w = (fed_window_t *)xmalloc(sizeof(fed_window_t) *
- tmp_a->window_count);
- if(!tmp_w)
- slurm_seterrno_ret(ENOMEM);
- for(j = 0; j < tmp_a->window_count; j++) {
- safe_unpack16(&tmp_w[j].id, buf);
- safe_unpack32(&tmp_w[j].status, buf);
- safe_unpack16(&tmp_w[j].job_key, buf);
- if (!believe_window_status) {
- tmp_w[j].status = NTBL_UNLOADED_STATE;
- tmp_w[j].job_key = 0;
- }
- }
- tmp_a->window_list = tmp_w;
- tmp_w = NULL; /* don't free on unpack error of next adapter */
- }
-
-copy_node:
- /* Only copy the node_info structure if the caller wants it */
- if(n != NULL)
- if(_copy_node(n, tmp_n) != SLURM_SUCCESS)
- return SLURM_ERROR;
-
-#if FED_DEBUG
- _print_libstate(fed_state);
-#endif
-
- return SLURM_SUCCESS;
-
-unpack_error:
- xfree(tmp_w);
- slurm_seterrno_ret(EUNPACK);
-}
-
-/* Unpack nodeinfo and update persistent libstate.
- *
- * Used by: slurmctld
- */
-int
-fed_unpack_nodeinfo(fed_nodeinfo_t *n, Buf buf)
-{
- int rc;
-
- _lock();
- rc = _unpack_nodeinfo(n, buf, false);
- _unlock();
- return rc;
-}
-
-
-/* Used by: slurmd, slurmctld */
-void
-fed_free_nodeinfo(fed_nodeinfo_t *n, bool ptr_into_array)
-{
- fed_adapter_t *adapter;
- int i;
-
- if(!n)
- return;
-
- assert(n->magic == FED_NODEINFO_MAGIC);
-
- if(n->adapter_list) {
- adapter = n->adapter_list;
- for (i = 0; i < n->adapter_count; i++) {
- xfree(adapter[i].window_list);
- }
- xfree(n->adapter_list);
- }
- if (!ptr_into_array)
- xfree(n);
-}
-
-/* Assign a unique key to each job. The key is used later to
- * gain access to the network table loaded on each node of a job.
- *
- * Federation documentation states that the job key must be greater
- * than 0 and less than 0xFFF0.
- *
- * Used by: slurmctld
- */
-static uint16_t
-_next_key(void)
-{
- uint16_t key;
-
- assert(fed_state);
-
- _lock();
- key = fed_state->key_index % 0xFFF0;
- if (key == 0)
- key++;
- fed_state->key_index = key + 1;
- _unlock();
-
- return key;
-}
-
-/* FIXME - this could be a little smarter than walking the whole list each time */
-static fed_window_t *
-_find_free_window(fed_adapter_t *adapter) {
- int i;
- fed_window_t *window;
-
- for (i = FED_MIN_WIN; i < adapter->window_count; i++) {
- window = &adapter->window_list[i];
- if (window->status == NTBL_UNLOADED_STATE)
- return window;
- }
-
- return (fed_window_t *) NULL;
-}
-
-
-static fed_window_t *
-_find_window(fed_adapter_t *adapter, int window_id) {
- int i;
- fed_window_t *window;
-
- for (i = FED_MIN_WIN; i < adapter->window_count; i++) {
- window = &adapter->window_list[i];
- if (window->id == window_id)
- return window;
- }
-
- debug3("Unable to _find_window %d on adapter %s",
- window_id, adapter->name);
- return (fed_window_t *) NULL;
-}
-
-
-/* For a given process, fill out an NTBL
- * struct (an array of these makes up the network table loaded
- * for each job). Assign adapters, lids and switch windows to
- * each task in a job.
- *
- * Used by: slurmctld
- */
-static int
-_allocate_windows_all(int adapter_cnt, fed_tableinfo_t *tableinfo,
- char *hostname, int task_id, uint16_t job_key)
-{
- fed_nodeinfo_t *node;
- fed_adapter_t *adapter;
- fed_window_t *window;
- NTBL *table;
- int i;
-
- assert(tableinfo);
- assert(hostname);
-
- node = _find_node(fed_state, hostname);
- if(node == NULL) {
- error("Failed to find node in node_list: %s", hostname);
- return SLURM_ERROR;
- }
-
- /* Reserve a window on each adapter for this task */
- for (i = 0; i < adapter_cnt; i++) {
- adapter = &node->adapter_list[i];
- window = _find_free_window(adapter);
- if (window == NULL) {
- error("No free windows on node %s adapter %s",
- node->name, adapter->name);
- return SLURM_ERROR;
- }
- window->status = NTBL_LOADED_STATE;
- window->job_key = job_key;
-
- table = tableinfo[i].table[task_id];
- table->task_id = task_id;
- table->lid = adapter->lid;
- table->window_id = window->id;
-
- strncpy(tableinfo[i].adapter_name, adapter->name,
- FED_ADAPTERNAME_LEN);
- }
-
- return SLURM_SUCCESS;
-}
-
-
-/* For a given process, fill out an NTBL
- * struct (an array of these makes up the network table loaded
- * for each job). Assign a single adapter, lid and switch window to
- * a task in a job.
- *
- * Used by: slurmctld
- */
-static int
-_allocate_window_single(char *adapter_name, fed_tableinfo_t *tableinfo,
- char *hostname, int task_id, uint16_t job_key)
-{
- fed_nodeinfo_t *node;
- fed_adapter_t *adapter = NULL;
- fed_window_t *window;
- NTBL *table;
- int i;
-
- assert(tableinfo);
- assert(hostname);
-
- debug("in _allocate_window_single");
- node = _find_node(fed_state, hostname);
- if(node == NULL) {
- error("Failed to find node in node_list: %s", hostname);
- return SLURM_ERROR;
- }
-
- /* find the adapter */
- for (i = 0; i < node->adapter_count; i++) {
- debug("adapter %s at index %d", node->adapter_list[i].name, i);
- if (strcasecmp(node->adapter_list[i].name, adapter_name)
- == 0) {
- adapter = &node->adapter_list[i];
- debug("Found adapter %s", adapter_name);
- break;
- }
- }
- if (adapter == NULL) {
- error("Failed to find adapter %s on node %s",
- adapter_name, hostname);
- return SLURM_ERROR;
- }
-
- /* Reserve a window on the adapter for this task */
- window = _find_free_window(adapter);
- if (window == NULL) {
- error("No free windows on node %s adapter %s",
- node->name, adapter->name);
- return SLURM_ERROR;
- }
- window->status = NTBL_LOADED_STATE;
- window->job_key = job_key;
-
- table = tableinfo[0].table[task_id];
- table->task_id = task_id;
- table->lid = adapter->lid;
- table->window_id = window->id;
-
- strncpy(tableinfo[0].adapter_name, adapter_name,
- FED_ADAPTERNAME_LEN);
-
- return SLURM_SUCCESS;
-}
-
-
-/* Find the correct NTBL structs and set the state
- * of the switch windows for the specified task_id.
- *
- * Used by: slurmctld
- */
-static int
-_window_state_set(int adapter_cnt, fed_tableinfo_t *tableinfo,
- char *hostname, int task_id, enum NTBL_RC state,
- uint16_t job_key)
-{
- fed_nodeinfo_t *node = NULL;
- fed_adapter_t *adapter = NULL;
- fed_window_t *window = NULL;
- NTBL *table = NULL;
- int i, j;
- bool adapter_found;
-
- assert(tableinfo);
- assert(hostname);
- assert(adapter_cnt <= FED_MAXADAPTERS);
-
- node = _find_node(fed_state, hostname);
- if (node == NULL) {
- error("Failed to find node in node_list: %s", hostname);
- return SLURM_ERROR;
- }
- if (node->adapter_list == NULL) {
- error("Found node, but adapter_list is NULL");
- return SLURM_ERROR;
- }
-
- for (i = 0; i < adapter_cnt; i++) {
- if (tableinfo[i].table == NULL) {
- error("tableinfo[%d].table is NULL", i);
- return SLURM_ERROR;
- }
- table = tableinfo[i].table[task_id];
- if (table == NULL) {
- error("tableinfo[%d].table[%d] is NULL", i, task_id);
- return SLURM_ERROR;
- }
-
- adapter_found = false;
- /* Find the adapter that matches the one in tableinfo */
- for (j = 0; j < node->adapter_count; j++) {
- adapter = &node->adapter_list[j];
- if (strcasecmp(adapter->name,
- tableinfo[i].adapter_name) == 0
- && adapter->lid == table->lid) {
- adapter_found = true;
- break;
- }
- }
- if (!adapter_found) {
- if (table->lid != 0)
- error("Did not find the correct adapter: "
- "%hu vs. %hu",
- adapter->lid, table->lid);
- return SLURM_ERROR;
- }
-
- debug3("Setting status %s adapter %s, "
- "lid %hu, window %hu for task %d",
- state == NTBL_UNLOADED_STATE ? "UNLOADED" : "LOADED",
- adapter->name,
- table->lid, table->window_id, task_id);
- window = _find_window(adapter, table->window_id);
- if (window) {
- window->status = state;
- window->job_key =
- (state == NTBL_UNLOADED_STATE) ? 0 : job_key;
- }
- }
-
- return SLURM_SUCCESS;
-}
-
-
-#if FED_DEBUG
-/* Used by: all */
-static void
-_print_table(NTBL **table, int size)
-{
- int i;
-
- assert(table);
- assert(size > 0);
-
- printf("--Begin NTBL table--\n");
- for(i = 0; i < size; i++) {
- printf(" task_id: %u\n", table[i]->task_id);
- printf(" window_id: %u\n", table[i]->window_id);
- printf(" lid: %u\n", table[i]->lid);
- }
- printf("--End NTBL table--\n");
-}
-
-/* Used by: all */
-static void
-_print_index(char *index, int size)
-{
- int i;
-
- assert(index);
- assert(size > 0);
-
- printf("--Begin lid index--\n");
- for(i = 0; i < size; i++) {
- printf(" task_id: %u\n", i);
- printf(" name: %s\n", index + (i * FED_ADAPTERNAME_LEN));
- }
- printf("--End lid index--\n");
-}
-#endif
-
-
-/* Find all of the windows used by this job step and set their
- * status to "state".
- *
- * Used by: slurmctld
- */
-static int
-_job_step_window_state(fed_jobinfo_t *jp, hostlist_t hl, enum NTBL_RC state)
-{
- hostlist_iterator_t hi;
- char *host;
- int proc_cnt;
- int nprocs;
- int nnodes;
- int i, j;
- int rc;
- int task_cnt;
- int full_node_cnt;
- int min_procs_per_node;
- int max_procs_per_node;
-
- xassert(!hostlist_is_empty(hl));
- xassert(jp);
- xassert(jp->magic == FED_JOBINFO_MAGIC);
-
- if ((jp == NULL)
- || (jp->magic != FED_JOBINFO_MAGIC)
- || (hostlist_is_empty(hl)))
- return SLURM_ERROR;
-
- if ((jp->tables_per_task == 0)
- || !jp->tableinfo
- || (jp->tableinfo[0].table_length == 0))
- return SLURM_SUCCESS;
-
- debug3("jp->tables_per_task = %d", jp->tables_per_task);
- nprocs = jp->tableinfo[0].table_length;
- hi = hostlist_iterator_create(hl);
-
- debug("Finding windows");
- nnodes = hostlist_count(hl);
- full_node_cnt = nprocs % nnodes;
- min_procs_per_node = nprocs / nnodes;
- max_procs_per_node = (nprocs + nnodes - 1) / nnodes;
-
- proc_cnt = 0;
- _lock();
- for (i = 0; i < nnodes; i++) {
- host = hostlist_next(hi);
- if(!host)
- error("Failed to get next host");
-
- if(i < full_node_cnt)
- task_cnt = max_procs_per_node;
- else
- task_cnt = min_procs_per_node;
-
- for (j = 0; j < task_cnt; j++) {
- rc = _window_state_set(jp->tables_per_task,
- jp->tableinfo,
- host, proc_cnt,
- state, jp->job_key);
- proc_cnt++;
- }
- free(host);
- }
- _unlock();
-
- hostlist_iterator_destroy(hi);
- return SLURM_SUCCESS;
-}
-
-/*
- * For one node, free all of the windows belonging to a particular
- * job step (as identified by the job_key).
- */
-static void inline
-_free_windows_by_job_key(uint16_t job_key, char *nodename)
-{
- fed_nodeinfo_t *node;
- fed_adapter_t *adapter;
- fed_window_t *window;
- int i, j;
-
- /* debug3("_free_windows_by_job_key(%hu, %s)", job_key, nodename); */
- if ((node = _find_node(fed_state, nodename)) == NULL)
- return;
-
- if (node->adapter_list == NULL) {
- error("_free_windows_by_job_key, "
- "adapter_list NULL for node %s", nodename);
- return;
- }
- for (i = 0; i < node->adapter_count; i++) {
- adapter = &node->adapter_list[i];
- if (adapter->window_list == NULL) {
- error("_free_windows_by_job_key, "
- "window_list NULL for node %s adapter %s",
- nodename, adapter->name);
- continue;
- }
- /* We could check here to see if this adapter's name
- * is in the fed_jobinfo tablinfo list to avoid the next
- * loop if the adapter isn't in use by the job step.
- * However, the added searching and string comparisons
- * probably aren't worth it, especially since MOST job
- * steps will use all of the adapters.
- */
- for (j = 0; j < adapter->window_count; j++) {
- window = &adapter->window_list[j];
-
- if (window->job_key == job_key) {
- /* debug3("Freeing adapter %s window %d",
- adapter->name, window->id); */
- window->status = NTBL_UNLOADED_STATE;
- window->job_key = 0;
- }
- }
- }
-}
-
-/* Find all of the windows used by job step "jp" on the hosts
- * designated in hostlist "hl" and mark their state NTBL_UNLOADED_STATE.
- *
- * Used by: slurmctld
- */
-int
-fed_job_step_complete(fed_jobinfo_t *jp, hostlist_t hl)
-{
- hostlist_t uniq_hl;
- hostlist_iterator_t hi;
- char *nodename;
-
- xassert(!hostlist_is_empty(hl));
- xassert(jp);
- xassert(jp->magic == FED_JOBINFO_MAGIC);
-
- if ((jp == NULL)
- || (jp->magic != FED_JOBINFO_MAGIC)
- || (hostlist_is_empty(hl)))
- return SLURM_ERROR;
-
- if ((jp->tables_per_task == 0)
- || !jp->tableinfo
- || (jp->tableinfo[0].table_length == 0))
- return SLURM_SUCCESS;
-
- /* The hl hostlist may contain duplicate nodenames (poe -hostfile
- * triggers duplicates in the hostlist). Since there
- * is no reason to call _free_windows_by_job_key more than once
- * per nodename, we create a new unique hostlist.
- */
- uniq_hl = hostlist_copy(hl);
- hostlist_uniq(uniq_hl);
- hi = hostlist_iterator_create(uniq_hl);
-
- _lock();
- if (fed_state != NULL) {
- while((nodename = hostlist_next(hi)) != NULL) {
- _free_windows_by_job_key(jp->job_key, nodename);
- free(nodename);
- }
- } else { /* fed_state == NULL */
- /* If there is no state at all, the job is already cleaned
- * up. :) This should really only happen when the backup
- * controller is calling job_fini() just before it takes over
- * the role of active controller.
- */
- debug("fed_job_step_complete called when fed_state == NULL");
- }
- _unlock();
-
- hostlist_iterator_destroy(hi);
- hostlist_destroy(uniq_hl);
- return SLURM_SUCCESS;
-}
-
-
-/* Find all of the windows used by job step "jp" and mark their
- * state NTBL_LOADED_STATE.
- *
- * Used by the slurmctld at startup time to restore the allocation
- * status of any job steps that were running at the time the previous
- * slurmctld was shutdown. Also used to restore the allocation
- * status after a call to switch_clear().
- */
-int
-fed_job_step_allocated(fed_jobinfo_t *jp, hostlist_t hl)
-{
- return _job_step_window_state(jp, hl, NTBL_LOADED_STATE);
-}
-
-
-
-/* Setup everything for the job. Assign tasks across
- * nodes based on the hostlist given and create the network table used
- * on all nodes of the job.
- *
- * Used by: slurmctld
- */
-int
-fed_build_jobinfo(fed_jobinfo_t *jp, hostlist_t hl, int nprocs,
- bool sn_all, char *adapter_name, int bulk_xfer)
-{
- int nnodes;
- hostlist_iterator_t hi;
- char *host = NULL;
- int proc_cnt = 0;
- int i, j;
- fed_nodeinfo_t *node;
- int rc;
- int task_cnt;
- int full_node_cnt;
- int min_procs_per_node;
- int max_procs_per_node;
-
- assert(jp);
- assert(jp->magic == FED_JOBINFO_MAGIC);
- assert(!hostlist_is_empty(hl));
-
- if(nprocs <= 0)
- slurm_seterrno_ret(EINVAL);
-
- jp->bulk_xfer = (uint8_t) bulk_xfer;
- jp->job_key = _next_key();
- snprintf(jp->job_desc, DESCLEN,
- "slurm federation driver key=%d", jp->job_key);
- jp->window_memory = FED_AUTO_WINMEM;
-
- hi = hostlist_iterator_create(hl);
-
- if (sn_all) {
- /*
- * Peek at the first host to figure out tables_per_task.
- * This driver assumes that all nodes have the same number
- * of adapters per node. Bad Things will happen if this
- * assumption is incorrect.
- */
- host = hostlist_next(hi);
- _lock();
- node = _find_node(fed_state, host);
- jp->tables_per_task = node ? node->adapter_count : 0;
- _unlock();
- if (host != NULL)
- free(host);
- hostlist_iterator_reset(hi);
- } else {
- jp->tables_per_task = 1;
- }
-
- /* Allocate memory for each fed_tableinfo_t */
- jp->tableinfo = (fed_tableinfo_t *) xmalloc(jp->tables_per_task
- * sizeof(fed_tableinfo_t));
- for (i = 0; i < jp->tables_per_task; i++) {
- jp->tableinfo[i].table_length = nprocs;
- jp->tableinfo[i].table = (NTBL **) xmalloc(nprocs
- * sizeof(NTBL *));
- for (j = 0; j < nprocs; j++) {
- jp->tableinfo[i].table[j] =
- (NTBL *) xmalloc(sizeof(NTBL));
- }
- }
-
- debug("Allocating windows");
- nnodes = hostlist_count(hl);
- full_node_cnt = nprocs % nnodes;
- min_procs_per_node = nprocs / nnodes;
- max_procs_per_node = (nprocs + nnodes - 1) / nnodes;
- proc_cnt = 0;
- _lock();
- for (i = 0; i < nnodes; i++) {
- host = hostlist_next(hi);
- if(!host)
- error("Failed to get next host");
-
- if(i < full_node_cnt)
- task_cnt = max_procs_per_node;
- else
- task_cnt = min_procs_per_node;
-
- for (j = 0; j < task_cnt; j++) {
- if (adapter_name == NULL) {
- rc = _allocate_windows_all(jp->tables_per_task,
- jp->tableinfo,
- host, proc_cnt,
- jp->job_key);
- } else {
- rc = _allocate_window_single(adapter_name,
- jp->tableinfo,
- host, proc_cnt,
- jp->job_key);
- }
- if (rc != SLURM_SUCCESS) {
- _unlock();
- goto fail;
- }
- proc_cnt++;
- }
- free(host);
- }
- _unlock();
-
-
-#if FED_DEBUG
- _print_table(jp->tableinfo[i].table, jp->tableinfo[i].table_length);
-#endif
-
- hostlist_iterator_destroy(hi);
- return SLURM_SUCCESS;
-
-fail:
- free(host);
- hostlist_iterator_destroy(hi);
- /* slurmctld will call fed_free_jobinfo on jp */
- return SLURM_FAILURE;
-}
-
-void
-_pack_tableinfo(fed_tableinfo_t *tableinfo, Buf buf)
-{
- int i;
-
- pack32(tableinfo->table_length, buf);
- for (i = 0; i < tableinfo->table_length; i++) {
- pack16(tableinfo->table[i]->task_id, buf);
- pack16(tableinfo->table[i]->lid, buf);
- pack16(tableinfo->table[i]->window_id, buf);
- }
- packmem(tableinfo->adapter_name, FED_ADAPTERNAME_LEN, buf);
-}
-
-/* Used by: all */
-int
-fed_pack_jobinfo(fed_jobinfo_t *j, Buf buf)
-{
- int i;
-
- assert(j);
- assert(j->magic == FED_JOBINFO_MAGIC);
- assert(buf);
-
- pack32(j->magic, buf);
- pack16(j->job_key, buf);
- packmem(j->job_desc, DESCLEN, buf);
- pack32(j->window_memory, buf);
- pack8(j->bulk_xfer, buf);
- pack16(j->tables_per_task, buf);
- for (i = 0; i < j->tables_per_task; i++) {
- _pack_tableinfo(&j->tableinfo[i], buf);
- }
-
- return SLURM_SUCCESS;
-}
-
-/* return 0 on success, -1 on failure */
-static int
-_unpack_tableinfo(fed_tableinfo_t *tableinfo, Buf buf)
-{
- uint32_t size;
- char *name_ptr;
- int i;
-
- safe_unpack32(&tableinfo->table_length, buf);
- tableinfo->table = (NTBL **) xmalloc(tableinfo->table_length
- * sizeof(NTBL *));
- for (i = 0; i < tableinfo->table_length; i++) {
- tableinfo->table[i] = (NTBL *) xmalloc(sizeof(NTBL));
-
- safe_unpack16(&tableinfo->table[i]->task_id, buf);
- safe_unpack16(&tableinfo->table[i]->lid, buf);
- safe_unpack16(&tableinfo->table[i]->window_id, buf);
- }
- safe_unpackmem_ptr(&name_ptr, &size, buf);
- if (size != FED_ADAPTERNAME_LEN)
- goto unpack_error;
- memcpy(tableinfo->adapter_name, name_ptr, size);
- return 0;
-
-unpack_error: /* safe_unpackXX are macros which jump to unpack_error */
- error("unpack error in _unpack_tableinfo");
- return -1;
-}
-
-/* Used by: all */
-int
-fed_unpack_jobinfo(fed_jobinfo_t *j, Buf buf)
-{
- uint32_t size;
- int i, k;
-
- assert(j);
- assert(j->magic == FED_JOBINFO_MAGIC);
- assert(buf);
-
- safe_unpack32(&j->magic, buf);
- assert(j->magic == FED_JOBINFO_MAGIC);
- safe_unpack16(&j->job_key, buf);
- safe_unpackmem(j->job_desc, &size, buf);
- if(size != DESCLEN)
- goto unpack_error;
- safe_unpack32(&j->window_memory, buf);
- safe_unpack8(&j->bulk_xfer, buf);
- safe_unpack16(&j->tables_per_task, buf);
-
- j->tableinfo = (fed_tableinfo_t *) xmalloc(j->tables_per_task
- * sizeof(fed_tableinfo_t));
- if(!j->tableinfo)
- slurm_seterrno_ret(ENOMEM);
- for (i = 0; i < j->tables_per_task; i++) {
- if (_unpack_tableinfo(&j->tableinfo[i], buf) != 0)
- goto unpack_error;
- }
-
- return SLURM_SUCCESS;
-
-unpack_error:
- error("fed_unpack_jobinfo error");
- if (j->tableinfo) {
- for (i = 0; i < j->tables_per_task; i++) {
- for (k=0; k<j->tableinfo[i].table_length; k++)
- xfree(j->tableinfo[i].table[k]);
- xfree(j->tableinfo[i].table);
- }
- xfree(j->tableinfo);
- }
- slurm_seterrno_ret(EUNPACK);
- return SLURM_ERROR;
-}
-
-/* Used by: all */
-fed_jobinfo_t *
-fed_copy_jobinfo(fed_jobinfo_t *job)
-{
- fed_jobinfo_t *new;
- int i, k;
-
- assert(job);
- assert(job->magic == FED_JOBINFO_MAGIC);
-
- if(fed_alloc_jobinfo(&new)) {
- debug("fed_alloc_jobinfo failed");
- goto cleanup1;
- }
- memcpy(new, job, sizeof(fed_jobinfo_t));
- /* table will be empty (and table_size == 0) when the network string
- * from poe does not contain "us".
- * (See man poe: -euilib or MP_EUILIB)
- */
- if (job->tables_per_task > 0) {
- /* Allocate memory for each fed_tableinfo_t */
- new->tableinfo = (fed_tableinfo_t *)xmalloc(
- job->tables_per_task * sizeof(fed_tableinfo_t));
- if (new->tableinfo == NULL)
- goto cleanup2;
- memcpy(new->tableinfo, job->tableinfo,
- sizeof(fed_tableinfo_t) * job->tables_per_task);
-
- for (i = 0; i < job->tables_per_task; i++) {
- new->tableinfo[i].table =
- (NTBL **) xmalloc(job->tableinfo[i].table_length
- * sizeof(NTBL *));
- if (new->tableinfo[i].table == NULL)
- goto cleanup3;
-
- for (k = 0; k < new->tableinfo[i].table_length; k++) {
- new->tableinfo[i].table[k] =
- (NTBL *) xmalloc(sizeof(NTBL));
- if (new->tableinfo[i].table[k] == NULL)
- goto cleanup4;
- memcpy(new->tableinfo[i].table[k],
- job->tableinfo[i].table[k],
- sizeof(fed_tableinfo_t));
- }
-
-
- }
- }
-
- return new;
-
-cleanup4:
- k--;
- for ( ; k >= 0; k--)
- xfree(new->tableinfo[i].table[k]);
-cleanup3:
- i--;
- for ( ; i >= 0; i--) {
- for (k = 0; k < new->tableinfo[i].table_length; k++)
- xfree(new->tableinfo[i].table[k]);
- xfree(new->tableinfo[i].table);
- }
- xfree(new->tableinfo);
-cleanup2:
- fed_free_jobinfo(new);
-cleanup1:
- error("Allocating new jobinfo");
- slurm_seterrno(ENOMEM);
- return NULL;
-}
-
-/* Used by: all */
-void
-fed_free_jobinfo(fed_jobinfo_t *jp)
-{
- int i, j;
- fed_tableinfo_t *tableinfo;
-
- if (!jp) {
- return;
- }
-
- if (jp->magic != FED_JOBINFO_MAGIC) {
- error("jp is not a switch/federation fed_jobinfo_t");
- return;
- }
-
- jp->magic = 0;
- if (jp->tables_per_task > 0 && jp->tableinfo != NULL) {
- for (i = 0; i < jp->tables_per_task; i++) {
- tableinfo = &jp->tableinfo[i];
- if (tableinfo->table == NULL)
- continue;
- for (j = 0; j < tableinfo->table_length; j++) {
- if (tableinfo->table[j] == NULL)
- continue;
- xfree(tableinfo->table[j]);
- }
- xfree(tableinfo->table);
- }
- xfree(jp->tableinfo);
- }
-
- xfree(jp);
- jp = NULL;
-
- return;
-}
-
-/* Return data to code for whom jobinfo is an opaque type.
- *
- * Used by: all
- */
-int
-fed_get_jobinfo(fed_jobinfo_t *jp, int key, void *data)
-{
- fed_tableinfo_t **tableinfo = (fed_tableinfo_t **)data;
- int *tables_per = (int *)data;
- int *job_key = (int *)data;
-
- assert(jp);
- assert(jp->magic == FED_JOBINFO_MAGIC);
-
- switch(key) {
- case FED_JOBINFO_TABLEINFO:
- *tableinfo = jp->tableinfo;
- break;
- case FED_JOBINFO_TABLESPERTASK:
- *tables_per = jp->tables_per_task;
- break;
- case FED_JOBINFO_KEY:
- *job_key = jp->job_key;
- break;
- default:
- slurm_seterrno_ret(EINVAL);
- }
-
- return SLURM_SUCCESS;
-}
-
-
-/*
- * Check up to "retry" times for "window_id" on "adapter_name"
- * to switch to the NTBL_UNLOADED_STATE. Sleep one second between
- * each retry.
- *
- * Used by: slurmd
- */
-static int
-_wait_for_window_unloaded(char *adapter_name, unsigned short window_id,
- int retry)
-{
- int status;
- int i;
-
- for (i = 0; i < retry; i++) {
- ntbl_query_window(NTBL_VERSION, adapter_name,
- window_id, &status);
- if (status == NTBL_UNLOADED_STATE)
- break;
- debug2("Window %hu adapter %s is in use, sleeping 1 second",
- window_id, adapter_name);
- sleep(1);
- }
-
- if (status != NTBL_UNLOADED_STATE)
- return SLURM_ERROR;
-
- return SLURM_SUCCESS;
-}
-
-
-/*
- * Look through the table and find all of the NTBL that are for an adapter on
- * this node. Wait until the window from each local NTBL is in the
- * NTBL_UNLOADED_STATE.
- *
- * Used by: slurmd
- */
-static int
-_wait_for_all_windows(fed_tableinfo_t *tableinfo)
-{
- uint16_t lid;
- int i;
- int err;
- int rc = SLURM_SUCCESS;
- int retry = 15;
-
- lid = _get_lid_from_adapter(tableinfo->adapter_name);
-
- for (i = 0; i < tableinfo->table_length; i++) {
- if (tableinfo->table[i]->lid == lid) {
- err = _wait_for_window_unloaded(
- tableinfo->adapter_name,
- tableinfo->table[i]->window_id,
- retry);
- if (err != SLURM_SUCCESS) {
- error("Window %hu adapter %s did not become"
- " free within %d seconds",
- tableinfo->table[i]->window_id,
- tableinfo->adapter_name,
- retry);
- rc = err;
- retry = 2;
- }
- }
- }
-
- return rc;
-}
-
-
-static int
-_check_rdma_job_count(char *adapter)
-{
- unsigned int job_count;
- unsigned int *job_keys;
- int rc, z;
-
- rc = ntbl_rdma_jobs(NTBL_VERSION, adapter,
- &job_count, &job_keys);
- if (rc != NTBL_SUCCESS) {
- error("ntbl_rdma_jobs(): %d", rc);
- return SLURM_ERROR;
- }
-
- debug3("Adapter %s, RDMA job_count = %u",
- adapter, job_count);
- for (z = 0; z < job_count; z++)
- debug3(" job key = %u", job_keys[z]);
- free(job_keys);
- if (job_count >= 4) {
- error("RDMA job_count is too high: %u", job_count);
- return SLURM_ERROR;
- }
-
- return SLURM_SUCCESS;
-}
-
-
-/* Load a network table on node. If table contains more than
- * one window for a given adapter, load the table only once for that
- * adapter.
- *
- * Used by: slurmd
- */
-int
-fed_load_table(fed_jobinfo_t *jp, int uid, int pid)
-{
- int i;
- int err;
- unsigned long long winmem;
- char *adapter;
- uint16_t network_id;
-/* ADAPTER_RESOURCES res; */
- int rc;
-
-#if FED_DEBUG
- char buf[2000];
-#endif
- assert(jp);
- assert(jp->magic == FED_JOBINFO_MAGIC);
-
- for(i = 0; i < jp->tables_per_task; i++) {
-#if FED_DEBUG
- _print_table(jp->tableinfo[i].table, jp->tableinfo[i].table_length);
- printf("%s", fed_sprint_jobinfo(jp, buf, 2000));
-#endif
- adapter = jp->tableinfo[i].adapter_name;
- network_id = _get_network_id_from_adapter(adapter);
-
- rc = _wait_for_all_windows(&jp->tableinfo[i]);
- if (rc != SLURM_SUCCESS)
- return rc;
-
- if(adapter == NULL)
- continue;
- winmem = jp->window_memory;
- if(jp->bulk_xfer) {
- if (i == 0) {
- rc = _check_rdma_job_count(adapter);
- if (rc != SLURM_SUCCESS)
- return rc;
- }
-
- err = ntbl_load_table_rdma(
- NTBL_VERSION,
- adapter,
- network_id,
- uid,
- pid,
- jp->job_key,
- jp->job_desc,
- jp->bulk_xfer,
- 0, /* rcontext_blocks */
- jp->tableinfo[i].table_length,
- jp->tableinfo[i].table);
- } else {
- err = ntbl_load_table(
- NTBL_VERSION,
- adapter,
- network_id,
- uid,
- pid,
- jp->job_key,
- jp->job_desc,
- &winmem,
- jp->tableinfo[i].table_length,
- jp->tableinfo[i].table);
- }
- if(err != NTBL_SUCCESS) {
- error("unable to load table: [%d] %s",
- err, _lookup_fed_status_tab(err));
- return SLURM_ERROR;
- }
- }
- umask(fed_umask);
-
- return SLURM_SUCCESS;
-}
-
-
-/*
- * Try up to "retry" times to unload a window.
- */
-static int
-_unload_window(char *adapter, unsigned short job_key, unsigned short window_id,
- int retry)
-{
- int i;
- int err;
-
- for (i = 0; i < retry; i++) {
- err = ntbl_unload_window(NTBL_VERSION, adapter,
- job_key, window_id);
- if (err == NTBL_SUCCESS)
- return SLURM_SUCCESS;
- debug("Unable to unload window %hu adapter %s job_key %hu: %s",
- window_id, adapter, job_key, _lookup_fed_status_tab(err));
-
- err = ntbl_clean_window(NTBL_VERSION, adapter,
- ALWAYS_KILL, window_id);
- if (err == NTBL_SUCCESS)
- return SLURM_SUCCESS;
- error("Unable to clean window %hu adapter %s job_key %hu: %s",
- window_id, adapter, job_key, _lookup_fed_status_tab(err));
-
- sleep(1);
- }
-
- return SLURM_FAILURE;
-}
-
-
-/* Assumes that, on error, new switch state information will be
- * read from node.
- *
- * Used by: slurmd
- */
-int
-fed_unload_table(fed_jobinfo_t *jp)
-{
- int i, j;
- int err;
- char *adapter_name;
- NTBL **table;
- uint32_t table_length;
- int local_lid;
- int rc = SLURM_SUCCESS;
- int retry = 15;
-
- assert(jp);
- assert(jp->magic == FED_JOBINFO_MAGIC);
- for (i = 0; i < jp->tables_per_task; i++) {
- table = jp->tableinfo[i].table;
- table_length = jp->tableinfo[i].table_length;
- adapter_name = jp->tableinfo[i].adapter_name;
- local_lid = _get_lid_from_adapter(adapter_name);
-
- for(j = 0; j < table_length; j++) {
- if(table[j]->lid != local_lid)
- continue;
- debug3("freeing adapter %s lid %d window %d job_key %d",
- adapter_name, table[j]->lid,
- table[j]->window_id, jp->job_key);
- err = _unload_window(adapter_name,
- jp->job_key,
- table[j]->window_id,
- retry);
- if(err != SLURM_SUCCESS) {
- rc = err;
- slurm_seterrno(EUNLOAD);
- retry = 2;
- }
- }
- }
- return rc;
-}
-
-static fed_libstate_t *
-_alloc_libstate(void)
-{
- fed_libstate_t *tmp;
-
- tmp = (fed_libstate_t *)xmalloc(sizeof(fed_libstate_t));
- if(!tmp) {
- slurm_seterrno(ENOMEM);
- return NULL;
- }
- tmp->magic = FED_LIBSTATE_MAGIC;
- tmp->node_count = 0;
- tmp->node_max = 0;
- tmp->node_list = NULL;
- tmp->hash_max = 0;
- tmp->hash_table = NULL;
- tmp->key_index = 1;
-
- return tmp;
-}
-
-/* Allocate and initialize memory for the persistent libstate.
- *
- * Used by: slurmctld
- */
-int
-fed_init(void)
-{
- fed_libstate_t *tmp;
-
- tmp = _alloc_libstate();
- if(!tmp)
- return SLURM_FAILURE;
- _lock();
- assert(!fed_state);
- fed_state = tmp;
- _unlock();
-
- return SLURM_SUCCESS;
-}
-
-static void
-_free_libstate(fed_libstate_t *lp)
-{
- int i;
-
- if (!lp)
- return;
- if (lp->node_list != NULL) {
- for (i = 0; i < lp->node_count; i++)
- fed_free_nodeinfo(&lp->node_list[i], true);
- xfree(lp->node_list);
- }
- xfree(lp->hash_table);
- xfree(lp);
-}
-
-int
-fed_fini(void)
-{
- xfree(fed_conf);
- return SLURM_SUCCESS;
-}
-
-/* Used by: slurmctld */
-static int
-_pack_libstate(fed_libstate_t *lp, Buf buffer)
-{
- int offset;
- int i;
-
- assert(lp);
- assert(lp->magic == FED_LIBSTATE_MAGIC);
-
- offset = get_buf_offset(buffer);
- pack32(lp->magic, buffer);
- pack32(lp->node_count, buffer);
- for(i = 0; i < lp->node_count; i++)
- (void)fed_pack_nodeinfo(&lp->node_list[i], buffer);
- /* don't pack hash_table, we'll just rebuild on restore */
- pack16(lp->key_index, buffer);
-
- return(get_buf_offset(buffer) - offset);
-}
-
-/* Used by: slurmctld */
-void
-fed_libstate_save(Buf buffer, bool free_flag)
-{
- _lock();
-
- if (fed_state != NULL)
- _pack_libstate(fed_state, buffer);
-
- /* Clean up fed_state since backup slurmctld can repeatedly
- * save and restore state */
- if (free_flag) {
- _free_libstate(fed_state);
- fed_state = NULL; /* freed above */
- }
- _unlock();
-}
-
-/* Used by: slurmctld */
-static int
-_unpack_libstate(fed_libstate_t *lp, Buf buffer)
-{
- int offset;
- int node_count;
- int i;
-
- assert(lp->magic == FED_LIBSTATE_MAGIC);
-
- offset = get_buf_offset(buffer);
-
- safe_unpack32(&lp->magic, buffer);
- safe_unpack32(&node_count, buffer);
- for(i = 0; i < node_count; i++) {
- if (_unpack_nodeinfo(NULL, buffer, false) != SLURM_SUCCESS)
- goto unpack_error;
- }
- if(lp->node_count != node_count) {
- error("Failed to recover switch state of all nodes (%d of %u)",
- lp->node_count, node_count);
- return SLURM_ERROR;
- }
- safe_unpack16(&lp->key_index, buffer);
-
- return SLURM_SUCCESS;
-
-unpack_error:
- error("unpack error in _unpack_libstate");
- slurm_seterrno_ret(EBADMAGIC_FEDLIBSTATE);
- return SLURM_ERROR;
-}
-
-/* Used by: slurmctld */
-int
-fed_libstate_restore(Buf buffer)
-{
- _lock();
- assert(!fed_state);
-
- fed_state = _alloc_libstate();
- if(!fed_state) {
- error("fed_libstate_restore fed_state is NULL");
- _unlock();
- return SLURM_FAILURE;
- }
- _unpack_libstate(fed_state, buffer);
- _unlock();
-
- return SLURM_SUCCESS;
-}
-
-int
-fed_libstate_clear(void)
-{
- int i, j, k;
- struct fed_nodeinfo *node;
- struct fed_adapter *adapter;
- struct fed_window *window;
-
- debug3("Clearing state on all windows in global fed state");
- _lock();
- if (!fed_state || !fed_state->node_list) {
- error("fed_state or node_list not initialized!");
- _unlock();
- return SLURM_ERROR;
- }
-
- for (i = 0; i < fed_state->node_count; i++) {
- node = &fed_state->node_list[i];
- if (!node->adapter_list)
- continue;
- for (j = 0; j < node->adapter_count; j++) {
- adapter = &node->adapter_list[i];
- if (!adapter || !adapter->window_list)
- continue;
- for (k = 0; k < adapter->window_count; k++) {
- window = &adapter->window_list[k];
- if (!window)
- continue;
- window->status = NTBL_UNLOADED_STATE;
- }
- }
- }
- _unlock();
-
- return SLURM_SUCCESS;
-}
diff --git a/src/plugins/switch/federation/federation.h b/src/plugins/switch/federation/federation.h
deleted file mode 100644
index d9e3e084964da3652e91fe9420ed04d9b12b1f3e..0000000000000000000000000000000000000000
--- a/src/plugins/switch/federation/federation.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*****************************************************************************\
- ** federation.h - Library routines for initiating jobs on IBM Federation
- ** $Id$
- *****************************************************************************
- * Copyright (C) 2004 The Regents of the University of California.
- * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
- * Written by Jason King <jking@llnl.gov>
- * CODE-OCEC-09-009. All rights reserved.
- *
- * This file is part of SLURM, a resource management program.
- * For details, see <http://www.schedmd.com/slurmdocs/>.
- * Please also read the included file: DISCLAIMER.
- *
- * SLURM is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * In addition, as a special exception, the copyright holders give permission
- * to link the code of portions of this program with the OpenSSL library under
- * certain conditions as described in each individual source file, and
- * distribute linked combinations including the two. You must obey the GNU
- * General Public License in all respects for all of the code used other than
- * OpenSSL. If you modify file(s) with this exception, you may extend this
- * exception to your version of the file(s), but you are not obligated to do
- * so. If you do not wish to do so, delete this exception statement from your
- * version. If you delete this exception statement from all source files in
- * the program, then also delete it here.
- *
- * SLURM is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along
- * with SLURM; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-\*****************************************************************************/
-
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include "src/common/slurm_xlator.h"
-
-#ifndef _FEDERATION_INCLUDED
-#define _FEDERATION_INCLUDED
-
-#if HAVE_LIBNTBL
-# include <ntbl.h>
-#else
-# error "Don't have required libntbl!"
-#endif
-
-/* opaque data structures - no peeking! */
-typedef struct fed_libstate fed_libstate_t;
-typedef struct fed_jobinfo fed_jobinfo_t;
-typedef struct fed_nodeinfo fed_nodeinfo_t;
-
-/* NOTE: error codes should be between ESLURM_SWITCH_MIN and
- * ESLURM_SWITCH MAX as defined in slurm/slurm_errno.h */
-enum {
- /* Federation specific error codes */
- ESTATUS = 3000,
- EADAPTER,
- ENOADAPTER,
- EBADMAGIC_FEDNODEINFO,
- EBADMAGIC_FEDJOBINFO,
- EBADMAGIC_FEDLIBSTATE,
- EUNPACK,
- EHOSTNAME,
- ENOTSUPPORTED,
- EVERSION,
- EWINDOW,
- EUNLOAD
-};
-
-#define FED_MAXADAPTERS 2
-#define FED_LIBSTATE_LEN (1024 * 1024 * 1)
-
-int fed_slurmctld_init(void);
-int fed_slurmd_init(void);
-int fed_slurmd_step_init(void);
-int fed_alloc_nodeinfo(fed_nodeinfo_t **nh);
-int fed_build_nodeinfo(fed_nodeinfo_t *np, char *hostname);
-char *fed_print_nodeinfo(fed_nodeinfo_t *np, char *buf, size_t size);
-int fed_pack_nodeinfo(fed_nodeinfo_t *np, Buf buf);
-int fed_unpack_nodeinfo(fed_nodeinfo_t *np, Buf buf);
-void fed_free_nodeinfo(fed_nodeinfo_t *np, bool ptr_into_array);
-int fed_alloc_jobinfo(fed_jobinfo_t **jh);
-int fed_build_jobinfo(fed_jobinfo_t *jp, hostlist_t hl, int nprocs,
- bool sn_all, char *adapter_name, int bulk_xfer);
-int fed_pack_jobinfo(fed_jobinfo_t *jp, Buf buf);
-int fed_unpack_jobinfo(fed_jobinfo_t *jp, Buf buf);
-fed_jobinfo_t *fed_copy_jobinfo(fed_jobinfo_t *jp);
-void fed_free_jobinfo(fed_jobinfo_t *jp);
-int fed_load_table(fed_jobinfo_t *jp, int uid, int pid);
-int fed_init(void);
-int fed_fini(void);
-int fed_unload_table(fed_jobinfo_t *jp);
-int fed_unpack_libstate(fed_libstate_t *lp, Buf buffer);
-int fed_get_jobinfo(fed_jobinfo_t *jp, int key, void *data);
-void fed_libstate_save(Buf buffer, bool free_flag);
-int fed_libstate_restore(Buf buffer);
-int fed_job_step_complete(fed_jobinfo_t *jp, hostlist_t hl);
-int fed_job_step_allocated(fed_jobinfo_t *jp, hostlist_t hl);
-int fed_libstate_clear(void);
-int fed_slurmctld_init(void);
-int fed_slurmd_init(void);
-int fed_slurmd_step_init(void);
-
-#endif /* _FEDERATION_INCLUDED */
diff --git a/src/plugins/switch/federation/federation_keys.h b/src/plugins/switch/federation/federation_keys.h
deleted file mode 100644
index 3553b2152c3420ac5bb4a2feb23d05a9710d837d..0000000000000000000000000000000000000000
--- a/src/plugins/switch/federation/federation_keys.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*****************************************************************************\
- ** federation_keys.h - Key definitions used by the get_jobinfo functions
- ** $Id$
- *****************************************************************************
- * Copyright (C) 2004 The Regents of the University of California.
- * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
- * Written by Jason King <jking@llnl.gov>
- * CODE-OCEC-09-009. All rights reserved.
- *
- * This file is part of SLURM, a resource management program.
- * For details, see <http://www.schedmd.com/slurmdocs/>.
- * Please also read the included file: DISCLAIMER.
- *
- * SLURM is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * In addition, as a special exception, the copyright holders give permission
- * to link the code of portions of this program with the OpenSSL library under
- * certain conditions as described in each individual source file, and
- * distribute linked combinations including the two. You must obey the GNU
- * General Public License in all respects for all of the code used other than
- * OpenSSL. If you modify file(s) with this exception, you may extend this
- * exception to your version of the file(s), but you are not obligated to do
- * so. If you do not wish to do so, delete this exception statement from your
- * version. If you delete this exception statement from all source files in
- * the program, then also delete it here.
- *
- * SLURM is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along
- * with SLURM; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-\*****************************************************************************/
-
-#ifndef _FEDERATION_KEYS_INCLUDED
-#define _FEDERATION_KEYS_INCLUDED
-
-#define FED_ADAPTERNAME_LEN 5
-
-enum {
- /* Federation specific get_jobinfo keys */
- FED_JOBINFO_TABLEINFO,
- FED_JOBINFO_TABLESPERTASK,
- FED_JOBINFO_KEY,
- FED_JOBINFO_PROTOCOL,
- FED_JOBINFO_MODE
-};
-
-/* Information shared between slurm_ll_api and the slurm federation driver */
-typedef struct fed_tableinfo {
- uint32_t table_length;
- NTBL **table;
- char adapter_name[FED_ADAPTERNAME_LEN];
-} fed_tableinfo_t;
-
-#endif /* _FEDERATION_KEYS_INCLUDED */
diff --git a/src/plugins/switch/federation/switch_federation.c b/src/plugins/switch/federation/switch_federation.c
deleted file mode 100644
index 6af1939f6ec1837c9adf077f725f38ebe119b212..0000000000000000000000000000000000000000
--- a/src/plugins/switch/federation/switch_federation.c
+++ /dev/null
@@ -1,674 +0,0 @@
-/***************************************************************************** \
- * switch_federation.c - Library routines for initiating jobs on IBM
- * Federation
- *****************************************************************************
- * Copyright (C) 2004-2007 The Regents of the University of California.
- * Copyright (C) 2008 Lawrence Livermore National Security.
- * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
- * Written by Jason King <jking@llnl.gov>
- * CODE-OCEC-09-009. All rights reserved.
- *
- * This file is part of SLURM, a resource management program.
- * For details, see <http://www.schedmd.com/slurmdocs/>.
- * Please also read the included file: DISCLAIMER.
- *
- * SLURM is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * In addition, as a special exception, the copyright holders give permission
- * to link the code of portions of this program with the OpenSSL library under
- * certain conditions as described in each individual source file, and
- * distribute linked combinations including the two. You must obey the GNU
- * General Public License in all respects for all of the code used other than
- * OpenSSL. If you modify file(s) with this exception, you may extend this
- * exception to your version of the file(s), but you are not obligated to do
- * so. If you do not wish to do so, delete this exception statement from your
- * version. If you delete this exception statement from all source files in
- * the program, then also delete it here.
- *
- * SLURM is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along
- * with SLURM; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-\*****************************************************************************/
-
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdlib.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <regex.h>
-#include <stdlib.h>
-
-#include "slurm/slurm_errno.h"
-#include "src/common/macros.h"
-#include "src/common/slurm_xlator.h"
-#include "src/plugins/switch/federation/federation.h"
-
-#define FED_BUF_SIZE 4096
-
-bool fed_need_state_save = false;
-
-static void _spawn_state_save_thread(char *dir);
-static int _switch_p_libstate_save(char * dir_name, bool free_flag);
-
-/* Type for error string table entries */
-typedef struct {
- int xe_number;
- char *xe_message;
-} slurm_errtab_t;
-
-static slurm_errtab_t slurm_errtab[] = {
- {0, "No error"},
- {-1, "Unspecified error"},
-
- /* Federation routine error codes */
-
- { ESTATUS,
- "Cannot get adapter status" },
- { EADAPTER,
- "Open of adapter failed" },
- { ENOADAPTER,
- "No adapters found" },
- { EBADMAGIC_FEDNODEINFO,
- "Bad magic in Federation nodeinfo" },
- { EBADMAGIC_FEDJOBINFO,
- "Bad magic in Federation jobinfo" },
- { EBADMAGIC_FEDLIBSTATE,
- "Bad magic in Federation libstate" },
- { EUNPACK,
- "Error during unpack" },
- { EHOSTNAME,
- "Cannot get hostname" },
- { ENOTSUPPORTED,
- "This feature not currently supported" },
- { EVERSION,
- "Header/library version mismatch" },
- { EWINDOW,
- "Error allocating switch window" },
- { EUNLOAD,
- "Error unloading switch window table" }
-};
-
-/*
- * These variables are required by the generic plugin interface. If they
- * are not found in the plugin, the plugin loader will ignore it.
- *
- * plugin_name - a string giving a human-readable description of the
- * plugin. There is no maximum length, but the symbol must refer to
- * a valid string.
- *
- * plugin_type - a string suggesting the type of the plugin or its
- * applicability to a particular form of data or method of data handling.
- * If the low-level plugin API is used, the contents of this string are
- * unimportant and may be anything. SLURM uses the higher-level plugin
- * interface which requires this string to be of the form
- *
- * <application>/<method>
- *
- * where <application> is a description of the intended application of
- * the plugin (e.g., "switch" for SLURM switch) and <method> is a description
- * of how this plugin satisfies that application. SLURM will only load
- * a switch plugin if the plugin_type string has a prefix of "switch/".
- *
- * plugin_version - an unsigned 32-bit integer giving the version number
- * of the plugin. If major and minor revisions are desired, the major
- * version number may be multiplied by a suitable magnitude constant such
- * as 100 or 1000. Various SLURM versions will likely require a certain
- * minimum version for their plugins as this API matures.
- */
-const char plugin_name[] = "switch FEDERATION plugin";
-const char plugin_type[] = "switch/federation";
-const uint32_t plugin_version = 100;
-
-/*
- * init() is called when the plugin is loaded, before any other functions
- * are called. Put global initialization here.
- */
-int init ( void )
-{
- verbose("%s loaded", plugin_name);
-
- return SLURM_SUCCESS;
-}
-
-int fini ( void )
-{
- return fed_fini();
-}
-
-int switch_p_slurmctld_init( void )
-{
- return fed_slurmctld_init();
-}
-
-int switch_p_slurmd_init( void )
-{
- return fed_slurmd_init();
-}
-
-int switch_p_slurmd_step_init( void )
-{
- return fed_slurmd_step_init();
-}
-
-/*
- * Switch functions for global state save
- * NOTE: Clears current switch state as needed for backup
- * controller to repeatedly assume control primary server
- */
-int switch_p_libstate_save ( char * dir_name )
-{
- return _switch_p_libstate_save(dir_name, true);
-}
-
-/* save and purge the libstate if free_flag is true */
-static int _switch_p_libstate_save ( char * dir_name, bool free_flag )
-{
- Buf buffer;
- char *file_name;
- int ret = SLURM_SUCCESS;
- int state_fd;
-
- buffer = init_buf(FED_LIBSTATE_LEN);
- (void)fed_libstate_save(buffer, free_flag);
- file_name = xstrdup(dir_name);
- xstrcat(file_name, "/fed_state");
- (void)unlink(file_name);
- state_fd = creat(file_name, 0600);
- if(state_fd < 0) {
- error ("Can't save state, error creating file %s %m",
- file_name);
- ret = SLURM_ERROR;
- } else {
- char *buf = get_buf_data(buffer);
- size_t len =get_buf_offset(buffer);
- while(1) {
- int wrote = write (state_fd, buf, len);
- if ((wrote < 0) && (errno == EINTR))
- continue;
- if (wrote == 0)
- break;
- if (wrote < 0) {
- error ("Can't save switch state: %m");
- ret = SLURM_ERROR;
- break;
- }
- buf += wrote;
- len -= wrote;
- }
- close(state_fd);
- }
- xfree(file_name);
-
- if(buffer)
- free_buf(buffer);
-
- return ret;
-}
-
-
-/*
- * Restore global nodeinfo from a file.
- *
- * NOTE: switch_p_libstate_restore is only called by slurmctld, and only
- * once at start-up. We exploit (abuse?) this fact to spawn a pthread to
- * periodically call _switch_p_libstate_save().
- */
-int switch_p_libstate_restore ( char * dir_name, bool recover )
-{
- char *data = NULL, *file_name;
- Buf buffer = NULL;
- int error_code = SLURM_SUCCESS;
- int state_fd, data_allocated = 0, data_read = 0, data_size = 0;
-
- xassert(dir_name != NULL);
-
- _spawn_state_save_thread(xstrdup(dir_name));
- if (!recover) /* clean start, no recovery */
- return fed_init();
-
- file_name = xstrdup(dir_name);
- xstrcat(file_name, "/fed_state");
- state_fd = open (file_name, O_RDONLY);
- if (state_fd >= 0) {
- data_allocated = FED_BUF_SIZE;
- data = xmalloc(data_allocated);
- while (1) {
- data_read = read (state_fd, &data[data_size],
- FED_BUF_SIZE);
- if ((data_read < 0) && (errno == EINTR))
- continue;
- if (data_read < 0) {
- error ("Read error on %s, %m", file_name);
- error_code = SLURM_ERROR;
- break;
- } else if (data_read == 0)
- break;
- data_size += data_read;
- data_allocated += data_read;
- xrealloc(data, data_allocated);
- }
- close (state_fd);
- xfree(file_name);
- } else {
- error("No %s file for Federation state recovery", file_name);
- error("Starting Federation with clean state");
- xfree(file_name);
- return fed_init();
- }
-
- if (error_code == SLURM_SUCCESS) {
- buffer = create_buf (data, data_size);
- data = NULL; /* now in buffer, don't xfree() */
- if (fed_libstate_restore(buffer) < 0)
- error_code = SLURM_ERROR;
- }
-
- if (buffer)
- free_buf(buffer);
- xfree(data);
-
- return error_code;
-}
-
-int switch_p_libstate_clear(void)
-{
- return fed_libstate_clear();
-}
-
-/*
- * switch state monitoring functions
- */
-/* NOTE: we assume that once the switch state is cleared,
- * notification of this will be forwarded to slurmctld. We do not
- * enforce that in this function.
- */
-/* FIX ME! - should use adapter name from federation.conf file now that
- * we have that file support.
- */
-#define ZERO 48
-int switch_p_clear_node_state(void)
-{
- int i, j;
- ADAPTER_RESOURCES res;
- char name[] = "sniN";
- int err;
-
- for(i = 0; i < FED_MAXADAPTERS; i++) {
- name[3] = i + ZERO;
- err = ntbl_adapter_resources(NTBL_VERSION, name, &res);
- if(err != NTBL_SUCCESS)
- continue;
- for(j = 0; j < res.window_count; j++)
- ntbl_clean_window(NTBL_VERSION, name,
- ALWAYS_KILL, res.window_list[j]);
- free(res.window_list);
- }
-
- return SLURM_SUCCESS;
-}
-
-int switch_p_alloc_node_info(switch_node_info_t **switch_node)
-{
- return fed_alloc_nodeinfo((fed_nodeinfo_t **)switch_node);
-}
-
-int switch_p_build_node_info(switch_node_info_t *switch_node)
-{
- char hostname[256];
- char *tmp;
-
- if(gethostname(hostname, 256) < 0)
- slurm_seterrno_ret(EHOSTNAME);
- /* remove the domain portion, if necessary */
- tmp = strstr(hostname, ".");
- if(tmp)
- *tmp = '\0';
- return fed_build_nodeinfo((fed_nodeinfo_t *)switch_node, hostname);
-}
-
-int switch_p_pack_node_info(switch_node_info_t *switch_node, Buf buffer)
-{
- return fed_pack_nodeinfo((fed_nodeinfo_t *)switch_node, buffer);
-}
-
-int switch_p_unpack_node_info(switch_node_info_t *switch_node, Buf buffer)
-{
- return fed_unpack_nodeinfo((fed_nodeinfo_t *)switch_node, buffer);
-}
-
-void switch_p_free_node_info(switch_node_info_t **switch_node)
-{
- if(switch_node)
- fed_free_nodeinfo((fed_nodeinfo_t *)*switch_node, false);
-}
-
-char * switch_p_sprintf_node_info(switch_node_info_t *switch_node,
- char *buf, size_t size)
-{
- return fed_print_nodeinfo((fed_nodeinfo_t *)switch_node, buf, size);
-}
-
-/*
- * switch functions for job step specific credential
- */
-int switch_p_alloc_jobinfo(switch_jobinfo_t **switch_job)
-{
- return fed_alloc_jobinfo((fed_jobinfo_t **)switch_job);
-}
-
-static char *adapter_name_check(char *network)
-{
- regex_t re;
- char *pattern = "(sni[[:digit:]])";
- size_t nmatch = 5;
- regmatch_t pmatch[5];
- char *name;
-
- if (regcomp(&re, pattern, REG_EXTENDED) != 0) {
- error("sockname regex compilation failed");
- return NULL;
- }
- memset(pmatch, 0, sizeof(regmatch_t)*nmatch);
- if (regexec(&re, network, nmatch, pmatch, 0) == REG_NOMATCH) {
- return NULL;
- }
- name = strndup(network + pmatch[1].rm_so,
- (size_t)(pmatch[1].rm_eo - pmatch[1].rm_so));
- regfree(&re);
-
- return name;
-}
-
-int switch_p_build_jobinfo(switch_jobinfo_t *switch_job, char *nodelist,
- uint16_t *tasks_per_node, int cyclic_alloc,
- char *network)
-{
- hostlist_t list = NULL;
- bool sn_all;
- int i, err, nprocs = 0;
- int bulk_xfer = 0;
- char *adapter_name = NULL;
-
- debug3("network = \"%s\"", network);
- if(strstr(network, "ip") || strstr(network, "IP")) {
- debug2("federation: \"ip\" found in network string, "
- "no network tables allocated");
- return SLURM_SUCCESS;
- } else {
- if (strstr(network, "sn_all")
- || strstr(network, "SN_ALL")) {
- debug3("Found sn_all in network string");
- sn_all = true;
- } else if (strstr(network, "sn_single")
- || strstr(network, "SN_SINGLE")) {
- debug3("Found sn_single in network string");
- sn_all = false;
- } else if ((adapter_name = adapter_name_check(network))) {
- debug3("Found adapter %s in network string",
- adapter_name);
- sn_all = false;
- } else {
- /* default to sn_all */
- sn_all = true;
- }
-
- list = hostlist_create(nodelist);
- if(!list)
- fatal("hostlist_create(%s): %m", nodelist);
- for (i = 0; i < hostlist_count(list); i++)
- nprocs += tasks_per_node[i];
-
- if (strstr(network, "bulk_xfer")
- || strstr(network, "BULK_XFER"))
- bulk_xfer = 1;
- err = fed_build_jobinfo((fed_jobinfo_t *)switch_job, list,
- nprocs, sn_all, adapter_name,
- bulk_xfer);
- hostlist_destroy(list);
- if (adapter_name)
- free(adapter_name);
-
- return err;
- }
-}
-
-switch_jobinfo_t *switch_p_copy_jobinfo(switch_jobinfo_t *switch_job)
-{
- switch_jobinfo_t *j;
-
- j = (switch_jobinfo_t *)fed_copy_jobinfo((fed_jobinfo_t *)switch_job);
- if (!j)
- error("fed_copy_jobinfo failed");
-
- return j;
-}
-
-void switch_p_free_jobinfo(switch_jobinfo_t *switch_job)
-{
- return fed_free_jobinfo((fed_jobinfo_t *)switch_job);
-}
-
-int switch_p_pack_jobinfo(switch_jobinfo_t *switch_job, Buf buffer)
-{
- return fed_pack_jobinfo((fed_jobinfo_t *)switch_job, buffer);
-}
-
-int switch_p_unpack_jobinfo(switch_jobinfo_t *switch_job, Buf buffer)
-{
- return fed_unpack_jobinfo((fed_jobinfo_t *)switch_job, buffer);
-}
-
-extern int switch_p_get_jobinfo(switch_jobinfo_t *switch_job, int key,
- void *resulting_data)
-{
- return fed_get_jobinfo((fed_jobinfo_t *)switch_job, key,
- resulting_data);
-}
-
-static inline int _make_step_comp(switch_jobinfo_t *jobinfo, char *nodelist)
-{
- hostlist_t list = NULL;
- int rc;
-
- list = hostlist_create(nodelist);
- rc = fed_job_step_complete((fed_jobinfo_t *)jobinfo, list);
- hostlist_destroy(list);
-
- return rc;
-}
-
-extern int switch_p_job_step_complete(switch_jobinfo_t *jobinfo, char *nodelist)
-{
- return _make_step_comp(jobinfo, nodelist);
-}
-
-extern int switch_p_job_step_part_comp(switch_jobinfo_t *jobinfo,
- char *nodelist)
-{
- return _make_step_comp(jobinfo, nodelist);
-}
-
-extern bool switch_p_part_comp(void)
-{
- return true;
-}
-
-extern int switch_p_job_step_allocated(switch_jobinfo_t *jobinfo, char *nodelist)
-{
- hostlist_t list = NULL;
- int rc;
-
- list = hostlist_create(nodelist);
- rc = fed_job_step_allocated((fed_jobinfo_t *)jobinfo, list);
- hostlist_destroy(list);
-
- return rc;
-}
-
-void switch_p_print_jobinfo(FILE *fp, switch_jobinfo_t *jobinfo)
-{
- return;
-}
-
-char *switch_p_sprint_jobinfo(switch_jobinfo_t *switch_jobinfo, char *buf,
- size_t size)
-{
- return NULL;
-}
-
-/*
- * switch functions for job initiation
- */
-static int _ntbl_version_ok(void)
-{
- return((ntbl_version() == NTBL_VERSION) ? 1 : 0);
-}
-
-int switch_p_node_init(void)
-{
- /* check to make sure the version of the library we compiled with
- * matches the one dynamically linked
- */
- if(!_ntbl_version_ok()) {
- slurm_seterrno_ret(EVERSION);
- }
-
- return SLURM_SUCCESS;
-}
-
-int switch_p_node_fini(void)
-{
- return SLURM_SUCCESS;
-}
-
-int switch_p_job_preinit(switch_jobinfo_t *jobinfo)
-{
- return SLURM_SUCCESS;
-}
-
-extern int switch_p_job_init (switch_jobinfo_t *jobinfo, uid_t uid,
- char *job_name)
-{
- pid_t pid;
-
- pid = getpid();
- return fed_load_table((fed_jobinfo_t *)jobinfo, uid, pid);
-}
-
-int switch_p_job_fini (switch_jobinfo_t *jobinfo)
-{
- return SLURM_SUCCESS;
-}
-
-int switch_p_job_postfini(switch_jobinfo_t *jobinfo, uid_t pgid,
- uint32_t job_id, uint32_t step_id)
-{
- int err;
-
- /*
- * Kill all processes in the job's session
- */
- if(pgid) {
- debug2("Sending SIGKILL to pgid %lu",
- (unsigned long) pgid);
- kill(-pgid, SIGKILL);
- } else
- debug("Job %u.%u: Bad pid valud %lu", job_id,
- step_id, (unsigned long) pgid);
-
- err = fed_unload_table((fed_jobinfo_t *)jobinfo);
- if(err != SLURM_SUCCESS)
- return SLURM_ERROR;
-
- return SLURM_SUCCESS;
-}
-
-int switch_p_job_attach(switch_jobinfo_t *jobinfo, char ***env,
- uint32_t nodeid, uint32_t procid, uint32_t nnodes,
- uint32_t nprocs, uint32_t rank)
-{
-#if 0
- printf("nodeid = %u\n", nodeid);
- printf("procid = %u\n", procid);
- printf("nnodes = %u\n", nnodes);
- printf("nprocs = %u\n", nprocs);
- printf("rank = %u\n", rank);
-#endif
- return SLURM_SUCCESS;
-}
-
-/*
- * switch functions for other purposes
- */
-
-/*
- * Linear search through table of errno values and strings,
- * returns NULL on error, string on success.
- */
-static char *_lookup_slurm_api_errtab(int errnum)
-{
- char *res = NULL;
- int i;
-
- for (i = 0; i < sizeof(slurm_errtab) / sizeof(slurm_errtab_t); i++) {
- if (slurm_errtab[i].xe_number == errnum) {
- res = slurm_errtab[i].xe_message;
- break;
- }
- }
- return res;
-}
-
-extern int switch_p_get_errno(void)
-{
- int err = slurm_get_errno();
-
- if ((err >= ESLURM_SWITCH_MIN) && (err <= ESLURM_SWITCH_MAX))
- return err;
-
- return SLURM_SUCCESS;
-}
-
-char *switch_p_strerror(int errnum)
-{
- char *res = _lookup_slurm_api_errtab(errnum);
- return (res ? res : strerror(errnum));
-}
-
-
-static void *_state_save_thread(void *arg)
-{
- char *dir_name = (char *)arg;
-
- while (1) {
- sleep(300);
- if (fed_need_state_save) {
- fed_need_state_save = false;
- _switch_p_libstate_save(dir_name, false);
- }
- }
-}
-
-static void _spawn_state_save_thread(char *dir)
-{
- pthread_attr_t attr;
- pthread_t id;
-
- slurm_attr_init(&attr);
-
- if (pthread_create(&id, &attr, &_state_save_thread, (void *)dir) != 0)
- error("Could not start federation state saving pthread");
-
- slurm_attr_destroy(&attr);
-}
diff --git a/src/plugins/switch/none/Makefile.in b/src/plugins/switch/none/Makefile.in
index 7ded0b31ebd6a2945e368bfae36dc8c7e6783abc..b6f92a50707979aacbb0683d187d0aefe70eb988 100644
--- a/src/plugins/switch/none/Makefile.in
+++ b/src/plugins/switch/none/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -170,9 +168,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -180,8 +176,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/switch/nrt/Makefile.in b/src/plugins/switch/nrt/Makefile.in
index caa8f54912cd02968986c2e08b788728b28b8ad7..cfd5c35afa1760b96936f2c7860d490e318c8c91 100644
--- a/src/plugins/switch/nrt/Makefile.in
+++ b/src/plugins/switch/nrt/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -215,9 +213,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -225,8 +221,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/switch/nrt/libpermapi/Makefile.in b/src/plugins/switch/nrt/libpermapi/Makefile.in
index 1b47e6786d4715c014a38ed5e95eae6ece0be41a..0b0f1f6db399b26c50894ef92a85333e784977d7 100644
--- a/src/plugins/switch/nrt/libpermapi/Makefile.in
+++ b/src/plugins/switch/nrt/libpermapi/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -171,9 +169,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -181,8 +177,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/task/Makefile.in b/src/plugins/task/Makefile.in
index f7264aaa98db95529e1139c48558879e291a8f59..edf1f5d3d839af2a4a2c810566e5c23285fd006a 100644
--- a/src/plugins/task/Makefile.in
+++ b/src/plugins/task/Makefile.in
@@ -55,9 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -165,9 +163,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -175,8 +171,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/task/affinity/Makefile.in b/src/plugins/task/affinity/Makefile.in
index 401bf09763a519e72526c2e012dee744e2d7f075..d11026f7f9105d38e64be678aa61ea58dbd2677b 100644
--- a/src/plugins/task/affinity/Makefile.in
+++ b/src/plugins/task/affinity/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -182,9 +180,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -192,8 +188,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/task/cgroup/Makefile.in b/src/plugins/task/cgroup/Makefile.in
index dbbf6a562b2a56e93e8735cbc5f9fb3dc99a35e6..b2389999c7790798de32ae75e797a311344bb9f3 100644
--- a/src/plugins/task/cgroup/Makefile.in
+++ b/src/plugins/task/cgroup/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -173,9 +171,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -183,8 +179,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/task/none/Makefile.in b/src/plugins/task/none/Makefile.in
index 575a2c880a9ddc52cd87e1f6ae7773af1e64e86a..88a263e85179c30debf9c6b73489730c44119f14 100644
--- a/src/plugins/task/none/Makefile.in
+++ b/src/plugins/task/none/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -170,9 +168,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -180,8 +176,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/topology/3d_torus/Makefile.in b/src/plugins/topology/3d_torus/Makefile.in
index 8c0f9573b86ec41ae83501edfab8203a82a24811..b79eef8e718b3683666d7737325cc9e08794fcb4 100644
--- a/src/plugins/topology/3d_torus/Makefile.in
+++ b/src/plugins/topology/3d_torus/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -171,9 +169,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -181,8 +177,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/topology/Makefile.in b/src/plugins/topology/Makefile.in
index 41d010256972f197384562fb49d75ad58087048c..4e5552082d1f6cdecb38f910f5b1902864112da7 100644
--- a/src/plugins/topology/Makefile.in
+++ b/src/plugins/topology/Makefile.in
@@ -55,9 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -165,9 +163,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -175,8 +171,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/topology/node_rank/Makefile.in b/src/plugins/topology/node_rank/Makefile.in
index 43b9300b03ac9f11e01b1dccd5fe49c1097c2c7b..b084e1b2e3e274e94e01683886654c406402990c 100644
--- a/src/plugins/topology/node_rank/Makefile.in
+++ b/src/plugins/topology/node_rank/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -170,9 +168,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -180,8 +176,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/topology/none/Makefile.in b/src/plugins/topology/none/Makefile.in
index 39dd1963c8fa2aef84438ae7608d6e8dd385d55f..220dc6d847c7433033335b1119ca794d0b3d04b3 100644
--- a/src/plugins/topology/none/Makefile.in
+++ b/src/plugins/topology/none/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -170,9 +168,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -180,8 +176,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/plugins/topology/tree/Makefile.in b/src/plugins/topology/tree/Makefile.in
index e411bfa74ccc7d7896cf9e5a3b1267b6d23853de..c25deccdeb13004b42669b4365533dce0f273d2f 100644
--- a/src/plugins/topology/tree/Makefile.in
+++ b/src/plugins/topology/tree/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -170,9 +168,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -180,8 +176,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/sacct/Makefile.in b/src/sacct/Makefile.in
index ca0f3f9e330933ef08bf5ffbf6a3d868581ff6af..ab7f00941eb90c29cf9096830d1ff12d69fb2c9f 100644
--- a/src/sacct/Makefile.in
+++ b/src/sacct/Makefile.in
@@ -59,9 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -154,9 +152,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -164,8 +160,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/sacctmgr/Makefile.in b/src/sacctmgr/Makefile.in
index d08f3dfc53f2c82c45557db34abac482cb56f2e4..b2d38986675734afea97c0f1123310779f84409d 100644
--- a/src/sacctmgr/Makefile.in
+++ b/src/sacctmgr/Makefile.in
@@ -57,9 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -159,9 +157,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -169,8 +165,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/salloc/Makefile.in b/src/salloc/Makefile.in
index 01288ec08f2f8176f1e1b1acac6201de8cf87afb..4f3dcae54d3e45874f8b2e5d9565d006362a2b58 100644
--- a/src/salloc/Makefile.in
+++ b/src/salloc/Makefile.in
@@ -58,9 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -153,9 +151,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -163,8 +159,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/sattach/Makefile.in b/src/sattach/Makefile.in
index 59a1ad1b3faa7e158cb8874a36ef490cd5d51baf..3bb80faf12b897dd86d7f49c9cd0bc96c5ae7b47 100644
--- a/src/sattach/Makefile.in
+++ b/src/sattach/Makefile.in
@@ -57,9 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -152,9 +150,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -162,8 +158,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/sbatch/Makefile.in b/src/sbatch/Makefile.in
index 19f1afd4c28b6751e917466c392c2e9bed44b126..30f3180a7c41d1754d9609cfe686d4b3d81cfb49 100644
--- a/src/sbatch/Makefile.in
+++ b/src/sbatch/Makefile.in
@@ -57,9 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -152,9 +150,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -162,8 +158,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/sbcast/Makefile.in b/src/sbcast/Makefile.in
index 74cdc35d43a452173da5e759f8f3575160ec96ce..63ceadfb89a9d0b97c26c73bf082475323844e80 100644
--- a/src/sbcast/Makefile.in
+++ b/src/sbcast/Makefile.in
@@ -60,9 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -154,9 +152,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -164,8 +160,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/scancel/Makefile.in b/src/scancel/Makefile.in
index fe72c80f90881603069503f67764ce2b1ab2c7e9..85279176e583665e0dd967b8e60a13cc7412b27b 100644
--- a/src/scancel/Makefile.in
+++ b/src/scancel/Makefile.in
@@ -59,9 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -153,9 +151,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -163,8 +159,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/scontrol/Makefile.in b/src/scontrol/Makefile.in
index 555e42a0a472d805f744bea89115360a54d44c3f..337eed40b55362e1568cda65be360c54bde4840c 100644
--- a/src/scontrol/Makefile.in
+++ b/src/scontrol/Makefile.in
@@ -57,9 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -168,9 +166,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -178,8 +174,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/sinfo/Makefile.in b/src/sinfo/Makefile.in
index 61e4b72a104e79950c88fc2d9fa702d1413a2f1b..e4e37071a64f014eb118412677a55cf734823d37 100644
--- a/src/sinfo/Makefile.in
+++ b/src/sinfo/Makefile.in
@@ -60,9 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -155,9 +153,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -165,8 +161,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/slurmctld/Makefile.in b/src/slurmctld/Makefile.in
index 75ba6b31451aaa4d130907790ef95c70eca61506..b436f92927bc5785f0fd83951c55387b4a4b1198 100644
--- a/src/slurmctld/Makefile.in
+++ b/src/slurmctld/Makefile.in
@@ -58,9 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -162,9 +160,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -172,8 +168,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/slurmd/Makefile.in b/src/slurmd/Makefile.in
index 7e7ea2652cacf1905b39f205901e35b314d4067c..a3a0b905a6714458228c2eb06f23be42592b6658 100644
--- a/src/slurmd/Makefile.in
+++ b/src/slurmd/Makefile.in
@@ -53,9 +53,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -163,9 +161,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -173,8 +169,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/slurmd/common/Makefile.in b/src/slurmd/common/Makefile.in
index c75a2bd83fa26de9c1862d0711e9d1bf2905a68f..f82c2956e0d646d14642eece62f6508bb4afc613 100644
--- a/src/slurmd/common/Makefile.in
+++ b/src/slurmd/common/Makefile.in
@@ -56,9 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -146,9 +144,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -156,8 +152,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/slurmd/slurmd/Makefile.in b/src/slurmd/slurmd/Makefile.in
index b75f018fcd25d96a82dd13b8ba9f79e437fef866..6545ba0cc0541b3724bc4677a3dfadc68f2bfeb3 100644
--- a/src/slurmd/slurmd/Makefile.in
+++ b/src/slurmd/slurmd/Makefile.in
@@ -58,9 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -155,9 +153,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -165,8 +161,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/slurmd/slurmstepd/Makefile.in b/src/slurmd/slurmstepd/Makefile.in
index b24818d913f1e24bafb1e6ecbdb50552714c7c3c..ce23559052353b2601d14344cc66f27dbfbbe3e3 100644
--- a/src/slurmd/slurmstepd/Makefile.in
+++ b/src/slurmd/slurmstepd/Makefile.in
@@ -58,9 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -158,9 +156,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -168,8 +164,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/slurmdbd/Makefile.in b/src/slurmdbd/Makefile.in
index f026e86b746699c350743fbc47f2a9315aa91f18..e8fe2784e194a38bbb30d30515d919c37a88481a 100644
--- a/src/slurmdbd/Makefile.in
+++ b/src/slurmdbd/Makefile.in
@@ -58,9 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -154,9 +152,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -164,8 +160,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/smap/Makefile.in b/src/smap/Makefile.in
index 0594f5f9a43ab828312fc64460c8598616bbd3cc..3f81323901e9539f29a51ecb1cb079137181380f 100644
--- a/src/smap/Makefile.in
+++ b/src/smap/Makefile.in
@@ -65,9 +65,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -174,9 +172,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -184,8 +180,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/sprio/Makefile.in b/src/sprio/Makefile.in
index 9b5d423656442051977bea4b0f79086f72a635c7..231adb3e1e23b0085490754f570abdb62830fa56 100644
--- a/src/sprio/Makefile.in
+++ b/src/sprio/Makefile.in
@@ -60,9 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -154,9 +152,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -164,8 +160,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/squeue/Makefile.in b/src/squeue/Makefile.in
index bb8599cb7e76675ab46c591cf511cf9a8bb24c58..d0f822a6e867fc426d07812b4139ce18ea2f0f82 100644
--- a/src/squeue/Makefile.in
+++ b/src/squeue/Makefile.in
@@ -60,9 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -155,9 +153,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -165,8 +161,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/sreport/Makefile.in b/src/sreport/Makefile.in
index 4ec014321564d1b6389034299383eac9582c51e5..738b0f3923f3152fb48b02fdb71ff5dbec7279b5 100644
--- a/src/sreport/Makefile.in
+++ b/src/sreport/Makefile.in
@@ -57,9 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -154,9 +152,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -164,8 +160,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/srun/Makefile.in b/src/srun/Makefile.in
index 22aa7e68a3792e9935b0119db9e7086779369944..93e5f8068ccbe8e1f4d970aea01c3b5158bb52f1 100644
--- a/src/srun/Makefile.in
+++ b/src/srun/Makefile.in
@@ -59,9 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -170,9 +168,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -180,8 +176,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/srun_cr/Makefile.in b/src/srun_cr/Makefile.in
index a9dd6f7638015196278aff76fa016930ace50c6f..7f31d1b3f219776c31f6e80f9dce58e556a545e1 100644
--- a/src/srun_cr/Makefile.in
+++ b/src/srun_cr/Makefile.in
@@ -57,9 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -152,9 +150,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -162,8 +158,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/sshare/Makefile.in b/src/sshare/Makefile.in
index 8f2bf60458c4148a3ddcf08359f5b7c6d3f9dc79..ce8ca828c64ddc94706a16a8e4a110a006fb26f8 100644
--- a/src/sshare/Makefile.in
+++ b/src/sshare/Makefile.in
@@ -57,9 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -152,9 +150,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -162,8 +158,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/sstat/Makefile.in b/src/sstat/Makefile.in
index 50ba0ad9b7dd625781f0691e80ca55d2752dd615..64037ce34c9377f1f09fbd39b8ce181be2db259c 100644
--- a/src/sstat/Makefile.in
+++ b/src/sstat/Makefile.in
@@ -57,9 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -151,9 +149,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -161,8 +157,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/strigger/Makefile.in b/src/strigger/Makefile.in
index 5fef4dadaf4a1e544dff576ef2814507527b99a4..381afe0ba957bd3842fd6b1e2a7a7223522f719a 100644
--- a/src/strigger/Makefile.in
+++ b/src/strigger/Makefile.in
@@ -60,9 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -154,9 +152,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -164,8 +160,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/src/sview/Makefile.in b/src/sview/Makefile.in
index ddd80d810b0ca691e35a2eec537d2dc245d7f5fc..ee5ad0cca141bb18dcb85a3b187438325f4c223b 100644
--- a/src/sview/Makefile.in
+++ b/src/sview/Makefile.in
@@ -61,9 +61,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -178,9 +176,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -188,8 +184,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index 3167735d98f08aabdb9b76a8c614078dbe214bcd..2b5414abf7310761304f90f60d3f64c56367c9d7 100644
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -55,9 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -170,9 +168,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -180,8 +176,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/testsuite/expect/Makefile.in b/testsuite/expect/Makefile.in
index a67da0d399fe94fce47e9e53198e62e2b25bea7b..158722611c3b3b8b1cf86bbaa40c5d0b5cb4e893 100644
--- a/testsuite/expect/Makefile.in
+++ b/testsuite/expect/Makefile.in
@@ -53,9 +53,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -123,9 +121,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -133,8 +129,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/testsuite/slurm_unit/Makefile.in b/testsuite/slurm_unit/Makefile.in
index a0de75fb6f8eaee5adc55bc84f77c857f14a65b7..8305cb6998f48cbb149cb205c7c5eaae5c14972e 100644
--- a/testsuite/slurm_unit/Makefile.in
+++ b/testsuite/slurm_unit/Makefile.in
@@ -53,9 +53,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -163,9 +161,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -173,8 +169,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/testsuite/slurm_unit/api/Makefile.in b/testsuite/slurm_unit/api/Makefile.in
index 5ea7e2d3776e3fd7ec76532037c530b3274a0069..55bc8acb8c4b943e78ea37414fc58e01dbc5340e 100644
--- a/testsuite/slurm_unit/api/Makefile.in
+++ b/testsuite/slurm_unit/api/Makefile.in
@@ -55,9 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -186,9 +184,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -196,8 +192,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/testsuite/slurm_unit/api/manual/Makefile.in b/testsuite/slurm_unit/api/manual/Makefile.in
index e49d637c7869a6ac2017c43e65ee7d46f36006fc..5debc8ce1ca4d399bb95713fa2fc1dcc3fea513c 100644
--- a/testsuite/slurm_unit/api/manual/Makefile.in
+++ b/testsuite/slurm_unit/api/manual/Makefile.in
@@ -57,9 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -178,9 +176,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -188,8 +184,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
diff --git a/testsuite/slurm_unit/common/Makefile.am b/testsuite/slurm_unit/common/Makefile.am
index d44d04e5a6f7a508de0cdbf45cd37a3c13d6cef5..c05b50eb38d2bfb55a4d51ad663f292b3173eb52 100644
--- a/testsuite/slurm_unit/common/Makefile.am
+++ b/testsuite/slurm_unit/common/Makefile.am
@@ -1,20 +1,10 @@
AUTOMAKE_OPTIONS = foreign
-if HAVE_ELAN
-elan_testprogs = runqsw
-elan_lib = $(top_builddir)/src/plugins/switch/elan/switch_elan.la
-else
-elan_testprogs =
-elan_lib =
-endif
-
INCLUDES = -I$(top_srcdir)
-LDADD = $(top_builddir)/src/api/libslurm.o -ldl\
- $(elan_lib)
+LDADD = $(top_builddir)/src/api/libslurm.o -ldl
check_PROGRAMS = \
- $(TESTS) \
- $(elan_testprogs)
+ $(TESTS)
TESTS = \
pack-test \
diff --git a/testsuite/slurm_unit/common/Makefile.in b/testsuite/slurm_unit/common/Makefile.in
index 88d3379d5a880d2b157b92b799b641f10000d906..b3f045692deafe36983588a7ab9c9eebb9d1468c 100644
--- a/testsuite/slurm_unit/common/Makefile.in
+++ b/testsuite/slurm_unit/common/Makefile.in
@@ -34,7 +34,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2)
+check_PROGRAMS = $(am__EXEEXT_1)
TESTS = pack-test$(EXEEXT) log-test$(EXEEXT) bitstring-test$(EXEEXT)
subdir = testsuite/slurm_unit/common
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -55,9 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_cray.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
- $(top_srcdir)/auxdir/x_ac_elan.m4 \
$(top_srcdir)/auxdir/x_ac_env.m4 \
- $(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
$(top_srcdir)/auxdir/x_ac_iso.m4 \
@@ -85,28 +83,18 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
am__EXEEXT_1 = pack-test$(EXEEXT) log-test$(EXEEXT) \
bitstring-test$(EXEEXT)
-@HAVE_ELAN_TRUE@am__EXEEXT_2 = runqsw$(EXEEXT)
bitstring_test_SOURCES = bitstring-test.c
bitstring_test_OBJECTS = bitstring-test.$(OBJEXT)
bitstring_test_LDADD = $(LDADD)
-@HAVE_ELAN_TRUE@am__DEPENDENCIES_1 = $(top_builddir)/src/plugins/switch/elan/switch_elan.la
-bitstring_test_DEPENDENCIES = $(top_builddir)/src/api/libslurm.o \
- $(am__DEPENDENCIES_1)
+bitstring_test_DEPENDENCIES = $(top_builddir)/src/api/libslurm.o
log_test_SOURCES = log-test.c
log_test_OBJECTS = log-test.$(OBJEXT)
log_test_LDADD = $(LDADD)
-log_test_DEPENDENCIES = $(top_builddir)/src/api/libslurm.o \
- $(am__DEPENDENCIES_1)
+log_test_DEPENDENCIES = $(top_builddir)/src/api/libslurm.o
pack_test_SOURCES = pack-test.c
pack_test_OBJECTS = pack-test.$(OBJEXT)
pack_test_LDADD = $(LDADD)
-pack_test_DEPENDENCIES = $(top_builddir)/src/api/libslurm.o \
- $(am__DEPENDENCIES_1)
-runqsw_SOURCES = runqsw.c
-runqsw_OBJECTS = runqsw.$(OBJEXT)
-runqsw_LDADD = $(LDADD)
-runqsw_DEPENDENCIES = $(top_builddir)/src/api/libslurm.o \
- $(am__DEPENDENCIES_1)
+pack_test_DEPENDENCIES = $(top_builddir)/src/api/libslurm.o
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/slurm
depcomp = $(SHELL) $(top_srcdir)/auxdir/depcomp
am__depfiles_maybe = depfiles
@@ -120,8 +108,8 @@ CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
-SOURCES = bitstring-test.c log-test.c pack-test.c runqsw.c
-DIST_SOURCES = bitstring-test.c log-test.c pack-test.c runqsw.c
+SOURCES = bitstring-test.c log-test.c pack-test.c
+DIST_SOURCES = bitstring-test.c log-test.c pack-test.c
ETAGS = etags
CTAGS = ctags
am__tty_colors = \
@@ -166,9 +154,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
EXEEXT = @EXEEXT@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
@@ -176,8 +162,6 @@ GTK_LIBS = @GTK_LIBS@
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
HAVEPGCONFIG = @HAVEPGCONFIG@
HAVE_AIX = @HAVE_AIX@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_FEDERATION = @HAVE_FEDERATION@
HAVE_MAN2HTML = @HAVE_MAN2HTML@
HAVE_NRT = @HAVE_NRT@
HAVE_OPENSSL = @HAVE_OPENSSL@
@@ -331,14 +315,8 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-@HAVE_ELAN_FALSE@elan_testprogs =
-@HAVE_ELAN_TRUE@elan_testprogs = runqsw
-@HAVE_ELAN_FALSE@elan_lib =
-@HAVE_ELAN_TRUE@elan_lib = $(top_builddir)/src/plugins/switch/elan/switch_elan.la
INCLUDES = -I$(top_srcdir)
-LDADD = $(top_builddir)/src/api/libslurm.o -ldl\
- $(elan_lib)
-
+LDADD = $(top_builddir)/src/api/libslurm.o -ldl
all: all-am
.SUFFIXES:
@@ -391,9 +369,6 @@ log-test$(EXEEXT): $(log_test_OBJECTS) $(log_test_DEPENDENCIES)
pack-test$(EXEEXT): $(pack_test_OBJECTS) $(pack_test_DEPENDENCIES)
@rm -f pack-test$(EXEEXT)
$(LINK) $(pack_test_OBJECTS) $(pack_test_LDADD) $(LIBS)
-runqsw$(EXEEXT): $(runqsw_OBJECTS) $(runqsw_DEPENDENCIES)
- @rm -f runqsw$(EXEEXT)
- $(LINK) $(runqsw_OBJECTS) $(runqsw_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -404,7 +379,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bitstring-test.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/log-test.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pack-test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runqsw.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<