diff --git a/Makefile.in b/Makefile.in
index 41bf1da687fe6d0173789182f651a8ce1f22c68f..4a9434fb7925cb62d7dad7071b17908f84f51b5c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# $Id: Makefile.am 8283 2006-06-02 16:29:11Z da $
+# $Id: Makefile.am 8073 2006-05-15 18:53:33Z jette $
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -60,7 +60,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -156,8 +155,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/aclocal.m4 b/aclocal.m4
index 56889bef8e75fbd673679749ee314e0e7ff2ec9b..e002c3483db7e6e07eb79f9fe6dfda702c6907ec 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -7026,6 +7026,5 @@ m4_include([auxdir/x_ac_pam.m4])
 m4_include([auxdir/x_ac_ptrace.m4])
 m4_include([auxdir/x_ac_readline.m4])
 m4_include([auxdir/x_ac_setproctitle.m4])
-m4_include([auxdir/x_ac_sgi_job.m4])
 m4_include([auxdir/x_ac_slurm_ssl.m4])
 m4_include([auxdir/x_ac_xcpu.m4])
diff --git a/auxdir/Makefile.in b/auxdir/Makefile.in
index ac4e403b00d3dd944bc573e40aefc101086cc242..675a237c5ab3aff00942cb8b44ea0afa961f0e84 100644
--- a/auxdir/Makefile.in
+++ b/auxdir/Makefile.in
@@ -54,7 +54,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -120,8 +119,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/auxdir/x_ac_sgi_job.m4 b/auxdir/x_ac_sgi_job.m4
index 6eb29bb206166f869fccf1be82ff243e1a212b8d..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/auxdir/x_ac_sgi_job.m4
+++ b/auxdir/x_ac_sgi_job.m4
@@ -1,21 +0,0 @@
-##*****************************************************************************
-## $Id: x_ac_aix.m4 8192 2006-05-25 00:15:05Z morrone $
-##*****************************************************************************
-#  AUTHOR:
-#    Mark Grondona <mgrondona@llnl.gov>
-#
-#  SYNOPSIS:
-#    AC_SGI_JOB
-#
-#  DESCRIPTION:
-#    Check for presence of SGI job container support via libjob.so
-##*****************************************************************************
-
-
-AC_DEFUN([X_AC_SGI_JOB],
-[
-   AC_CHECK_LIB([job], [job_attachpid], [ac_have_sgi_job="yes"], [])
-   AC_MSG_CHECKING([for SGI job container support])
-   AC_MSG_RESULT([${ac_have_sgi_job=no}])
-   AM_CONDITIONAL(HAVE_SGI_JOB, test "x$ac_have_sgi_job" = "xyes")
-])
diff --git a/configure b/configure
index 6c9045436ead27b69a01026c2a051bbc0c390e54..220b9b571c489b872757990b88fcd0224491ae3d 100755
--- a/configure
+++ b/configure
@@ -463,7 +463,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os PROJECT SLURM_API_VERSION SLURM_API_CURRENT SLURM_API_MAJOR SLURM_API_AGE SLURM_API_REVISION VERSION SLURM_MAJOR SLURM_MINOR SLURM_MICRO RELEASE SLURM_VERSION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CMD_LDFLAGS LIB_LDFLAGS SO_LDFLAGS HAVE_AIX_TRUE HAVE_AIX_FALSE HAVE_AIX PROCTRACKDIR CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE HAVE_AIX_PROCTRACK_TRUE HAVE_AIX_PROCTRACK_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL WITH_GNU_LD_TRUE WITH_GNU_LD_FALSE HAVE_SCHED_SETAFFINITY_TRUE HAVE_SCHED_SETAFFINITY_FALSE NUMA_LIBS HAVE_NUMA_TRUE HAVE_NUMA_FALSE PAM_LIBS HAVE_PAM_TRUE HAVE_PAM_FALSE LIBOBJS HAVE_UNSETENV_TRUE HAVE_UNSETENV_FALSE PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS BG_INCLUDES BG_LDFLAGS SEMAPHORE_SOURCES SEMAPHORE_LIBS NCURSES HAVE_SOME_CURSES_TRUE HAVE_SOME_CURSES_FALSE HAVE_SOME_CURSES DEBUG_MODULES_TRUE DEBUG_MODULES_FALSE SLURMCTLD_PORT SLURMD_PORT ELAN_LIBS HAVE_ELAN_TRUE HAVE_ELAN_FALSE HAVE_ELAN FEDERATION_LDFLAGS HAVE_FEDERATION_TRUE HAVE_FEDERATION_FALSE HAVE_FEDERATION HAVE_SGI_JOB_TRUE HAVE_SGI_JOB_FALSE READLINE_LIBS SSL_LDFLAGS SSL_LIBS SSL_CPPFLAGS MUNGE_LIBS MUNGE_CPPFLAGS MUNGE_LDFLAGS WITH_MUNGE_TRUE WITH_MUNGE_FALSE AUTHD_LIBS AUTHD_CFLAGS WITH_AUTHD_TRUE WITH_AUTHD_FALSE LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os PROJECT SLURM_API_VERSION SLURM_API_CURRENT SLURM_API_MAJOR SLURM_API_AGE SLURM_API_REVISION VERSION SLURM_MAJOR SLURM_MINOR SLURM_MICRO RELEASE SLURM_VERSION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CMD_LDFLAGS LIB_LDFLAGS SO_LDFLAGS HAVE_AIX_TRUE HAVE_AIX_FALSE HAVE_AIX PROCTRACKDIR CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE HAVE_AIX_PROCTRACK_TRUE HAVE_AIX_PROCTRACK_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL WITH_GNU_LD_TRUE WITH_GNU_LD_FALSE HAVE_SCHED_SETAFFINITY_TRUE HAVE_SCHED_SETAFFINITY_FALSE NUMA_LIBS HAVE_NUMA_TRUE HAVE_NUMA_FALSE PAM_LIBS HAVE_PAM_TRUE HAVE_PAM_FALSE LIBOBJS HAVE_UNSETENV_TRUE HAVE_UNSETENV_FALSE PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS BG_INCLUDES BG_LDFLAGS SEMAPHORE_SOURCES SEMAPHORE_LIBS NCURSES HAVE_SOME_CURSES_TRUE HAVE_SOME_CURSES_FALSE HAVE_SOME_CURSES DEBUG_MODULES_TRUE DEBUG_MODULES_FALSE SLURMCTLD_PORT SLURMD_PORT ELAN_LIBS HAVE_ELAN_TRUE HAVE_ELAN_FALSE HAVE_ELAN FEDERATION_LDFLAGS HAVE_FEDERATION_TRUE HAVE_FEDERATION_FALSE HAVE_FEDERATION READLINE_LIBS SSL_LDFLAGS SSL_LIBS SSL_CPPFLAGS MUNGE_LIBS MUNGE_CPPFLAGS MUNGE_LDFLAGS WITH_MUNGE_TRUE WITH_MUNGE_FALSE AUTHD_LIBS AUTHD_CFLAGS WITH_AUTHD_TRUE WITH_AUTHD_FALSE LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -24650,91 +24650,6 @@ fi
 
 
 
-   echo "$as_me:$LINENO: checking for job_attachpid in -ljob" >&5
-echo $ECHO_N "checking for job_attachpid in -ljob... $ECHO_C" >&6
-if test "${ac_cv_lib_job_job_attachpid+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ljob  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char job_attachpid ();
-int
-main ()
-{
-job_attachpid ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_job_job_attachpid=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_job_job_attachpid=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_job_job_attachpid" >&5
-echo "${ECHO_T}$ac_cv_lib_job_job_attachpid" >&6
-if test $ac_cv_lib_job_job_attachpid = yes; then
-  ac_have_sgi_job="yes"
-fi
-
-   echo "$as_me:$LINENO: checking for SGI job container support" >&5
-echo $ECHO_N "checking for SGI job container support... $ECHO_C" >&6
-   echo "$as_me:$LINENO: result: ${ac_have_sgi_job=no}" >&5
-echo "${ECHO_T}${ac_have_sgi_job=no}" >&6
-
-
-if test "x$ac_have_sgi_job" = "xyes"; then
-  HAVE_SGI_JOB_TRUE=
-  HAVE_SGI_JOB_FALSE='#'
-else
-  HAVE_SGI_JOB_TRUE='#'
-  HAVE_SGI_JOB_FALSE=
-fi
-
-
-
-
   echo "$as_me:$LINENO: checking for whether to include readline suport" >&5
 echo $ECHO_N "checking for whether to include readline suport... $ECHO_C" >&6
 
@@ -25294,7 +25209,7 @@ _ACEOF
 
 
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              ac_config_files="$ac_config_files Makefile config.xml auxdir/Makefile src/Makefile src/api/Makefile src/common/Makefile src/sacct/Makefile src/srun/Makefile src/slurmd/Makefile src/slurmd/slurmd/Makefile src/slurmd/slurmstepd/Makefile src/slurmctld/Makefile src/sbcast/Makefile src/scontrol/Makefile src/scancel/Makefile src/squeue/Makefile src/sinfo/Makefile src/smap/Makefile src/plugins/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/jobacct/Makefile src/plugins/jobacct/linux/Makefile src/plugins/jobacct/aix/Makefile src/plugins/jobacct/none/Makefile src/plugins/jobcomp/Makefile src/plugins/jobcomp/filetxt/Makefile src/plugins/jobcomp/none/Makefile src/plugins/jobcomp/script/Makefile src/plugins/proctrack/Makefile src/plugins/proctrack/aix/Makefile src/plugins/proctrack/pgid/Makefile src/plugins/proctrack/linuxproc/Makefile src/plugins/proctrack/rms/Makefile src/plugins/proctrack/sgi_job/Makefile src/plugins/sched/Makefile src/plugins/sched/backfill/Makefile src/plugins/sched/builtin/Makefile src/plugins/sched/hold/Makefile src/plugins/sched/maui/Makefile src/plugins/sched/maui/wiki/Makefile src/plugins/select/Makefile src/plugins/select/bluegene/Makefile src/plugins/select/bluegene/block_allocator/Makefile src/plugins/select/bluegene/plugin/Makefile src/plugins/select/linear/Makefile src/plugins/select/cons_res/Makefile src/plugins/switch/Makefile src/plugins/switch/elan/Makefile src/plugins/switch/none/Makefile src/plugins/switch/federation/Makefile src/plugins/mpi/Makefile src/plugins/mpi/mpichgm/Makefile src/plugins/mpi/mvapich/Makefile src/plugins/mpi/lam/Makefile src/plugins/mpi/none/Makefile src/plugins/task/Makefile src/plugins/task/affinity/Makefile src/plugins/task/none/Makefile doc/Makefile doc/man/Makefile doc/html/Makefile testsuite/Makefile testsuite/expect/Makefile testsuite/slurm_unit/Makefile testsuite/slurm_unit/common/Makefile testsuite/slurm_unit/slurmctld/Makefile testsuite/slurm_unit/slurmd/Makefile testsuite/slurm_unit/api/Makefile testsuite/slurm_unit/api/manual/Makefile"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ac_config_files="$ac_config_files Makefile config.xml auxdir/Makefile src/Makefile src/api/Makefile src/common/Makefile src/sacct/Makefile src/srun/Makefile src/slurmd/Makefile src/slurmd/slurmd/Makefile src/slurmd/slurmstepd/Makefile src/slurmctld/Makefile src/sbcast/Makefile src/scontrol/Makefile src/scancel/Makefile src/squeue/Makefile src/sinfo/Makefile src/smap/Makefile src/plugins/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/jobacct/Makefile src/plugins/jobacct/linux/Makefile src/plugins/jobacct/aix/Makefile src/plugins/jobacct/none/Makefile src/plugins/jobcomp/Makefile src/plugins/jobcomp/filetxt/Makefile src/plugins/jobcomp/none/Makefile src/plugins/jobcomp/script/Makefile src/plugins/proctrack/Makefile src/plugins/proctrack/aix/Makefile src/plugins/proctrack/pgid/Makefile src/plugins/proctrack/linuxproc/Makefile src/plugins/proctrack/rms/Makefile src/plugins/sched/Makefile src/plugins/sched/backfill/Makefile src/plugins/sched/builtin/Makefile src/plugins/sched/hold/Makefile src/plugins/sched/maui/Makefile src/plugins/sched/maui/wiki/Makefile src/plugins/select/Makefile src/plugins/select/bluegene/Makefile src/plugins/select/bluegene/block_allocator/Makefile src/plugins/select/bluegene/plugin/Makefile src/plugins/select/linear/Makefile src/plugins/select/cons_res/Makefile src/plugins/switch/Makefile src/plugins/switch/elan/Makefile src/plugins/switch/none/Makefile src/plugins/switch/federation/Makefile src/plugins/mpi/Makefile src/plugins/mpi/mpichgm/Makefile src/plugins/mpi/mvapich/Makefile src/plugins/mpi/lam/Makefile src/plugins/mpi/none/Makefile src/plugins/task/Makefile src/plugins/task/affinity/Makefile src/plugins/task/none/Makefile doc/Makefile doc/man/Makefile doc/html/Makefile testsuite/Makefile testsuite/expect/Makefile testsuite/slurm_unit/Makefile testsuite/slurm_unit/common/Makefile testsuite/slurm_unit/slurmctld/Makefile testsuite/slurm_unit/slurmd/Makefile testsuite/slurm_unit/api/Makefile testsuite/slurm_unit/api/manual/Makefile"
 
 
 cat >confcache <<\_ACEOF
@@ -25500,13 +25415,6 @@ echo "$as_me: error: conditional \"HAVE_FEDERATION\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${HAVE_SGI_JOB_TRUE}" && test -z "${HAVE_SGI_JOB_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"HAVE_SGI_JOB\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"HAVE_SGI_JOB\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
 if test -z "${WITH_MUNGE_TRUE}" && test -z "${WITH_MUNGE_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"WITH_MUNGE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -26004,7 +25912,6 @@ do
   "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/sched/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/plugins/sched/Makefile" ;;
   "src/plugins/sched/backfill/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/plugins/sched/backfill/Makefile" ;;
   "src/plugins/sched/builtin/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/plugins/sched/builtin/Makefile" ;;
@@ -26256,8 +26163,6 @@ s,@FEDERATION_LDFLAGS@,$FEDERATION_LDFLAGS,;t t
 s,@HAVE_FEDERATION_TRUE@,$HAVE_FEDERATION_TRUE,;t t
 s,@HAVE_FEDERATION_FALSE@,$HAVE_FEDERATION_FALSE,;t t
 s,@HAVE_FEDERATION@,$HAVE_FEDERATION,;t t
-s,@HAVE_SGI_JOB_TRUE@,$HAVE_SGI_JOB_TRUE,;t t
-s,@HAVE_SGI_JOB_FALSE@,$HAVE_SGI_JOB_FALSE,;t t
 s,@READLINE_LIBS@,$READLINE_LIBS,;t t
 s,@SSL_LDFLAGS@,$SSL_LDFLAGS,;t t
 s,@SSL_LIBS@,$SSL_LIBS,;t t
diff --git a/configure.ac b/configure.ac
index bf26f51dd00ba01f0b5e0f78ebee860c3273ef5d..9e8654ca999869435a64de0902769c7c832f34a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -151,10 +151,6 @@ X_AC_FEDERATION
 AM_CONDITIONAL(HAVE_FEDERATION, test "x$ac_have_federation" = "xyes")
 AC_SUBST(HAVE_FEDERATION)
 
-dnl check for SGI job container support
-dnl
-X_AC_SGI_JOB
-
 dnl Check for whether to include readline support
 dnl 
 X_AC_READLINE
@@ -247,7 +243,6 @@ AC_CONFIG_FILES([Makefile
 		 src/plugins/proctrack/pgid/Makefile
 		 src/plugins/proctrack/linuxproc/Makefile
 		 src/plugins/proctrack/rms/Makefile
-		 src/plugins/proctrack/sgi_job/Makefile
 		 src/plugins/sched/Makefile
 		 src/plugins/sched/backfill/Makefile
 		 src/plugins/sched/builtin/Makefile
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 83558274f0586c19f80464ac9ac0f73d92f99402..70e2bc36f414ea97a50f8801ff551772e4d58c4e 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -55,7 +55,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -130,8 +129,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/doc/html/Makefile.in b/doc/html/Makefile.in
index 4650a21811bc22d171eadaeda9097f5ec972f684..666be6fb7276c2da9ed2ce28b70e02afd5fbfd1a 100644
--- a/doc/html/Makefile.in
+++ b/doc/html/Makefile.in
@@ -56,7 +56,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -131,8 +130,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/doc/man/Makefile.in b/doc/man/Makefile.in
index 71863e52c14e0913713655b2a0d9a3a58f0b65e7..acb813716dea4c0d17f013f449bc22ea335cf744 100644
--- a/doc/man/Makefile.in
+++ b/doc/man/Makefile.in
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# $Id: Makefile.am 8240 2006-05-30 23:14:48Z jette $
+# $Id: Makefile.am 8147 2006-05-22 21:36:42Z grondo $
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -55,7 +55,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -129,8 +128,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/Makefile.in b/src/Makefile.in
index 2eda8b2bee71250fcb8bc4b68c47e958e10408b3..f9725666274f73c6cb5f31c59ce671e757a29700 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -55,7 +55,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -130,8 +129,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/api/Makefile.in b/src/api/Makefile.in
index 55c3501cefa9d7fe45c3cc72cfa19e7bf3070e5f..43f6b2085446ec8844984c5960446518930baf4d 100644
--- a/src/api/Makefile.in
+++ b/src/api/Makefile.in
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# $Id: Makefile.am 8235 2006-05-30 18:56:24Z morrone $
+# $Id: Makefile.am 8196 2006-05-25 01:05:24Z morrone $
 #
 # Makefile for slurm API library
 
@@ -60,7 +60,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -160,8 +159,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/common/Makefile.in b/src/common/Makefile.in
index d585ff5fd460e7afca5530a25779d2ced34d21fb..6211594ebf42cb25de70e1bd5402fb67597f7abf 100644
--- a/src/common/Makefile.in
+++ b/src/common/Makefile.in
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# $Id: Makefile.am 8241 2006-05-30 23:23:19Z grondo $
+# $Id: Makefile.am 8235 2006-05-30 18:56:24Z morrone $
 # Makefile for common library 
 
 SOURCES = $(libcommon_la_SOURCES) $(EXTRA_libcommon_la_SOURCES) $(libdaemonize_la_SOURCES) $(libeio_la_SOURCES) $(libspank_la_SOURCES)
@@ -59,7 +59,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -194,8 +193,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/Makefile.in b/src/plugins/Makefile.in
index 0b91e16feeb99ca58422081f43a7763d6725f667..5c69586f88e64408ca1bbea1e181ebd2de13fc15 100644
--- a/src/plugins/Makefile.in
+++ b/src/plugins/Makefile.in
@@ -55,7 +55,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -130,8 +129,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/auth/Makefile.in b/src/plugins/auth/Makefile.in
index 098cc0b72f722b3bfe5c46186217bae63c9d8fb3..1027e8ee9873c9fae3124a25a188abc3f8d918d2 100644
--- a/src/plugins/auth/Makefile.in
+++ b/src/plugins/auth/Makefile.in
@@ -56,7 +56,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -131,8 +130,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/auth/authd/Makefile.in b/src/plugins/auth/authd/Makefile.in
index 5d304bd809d0d5f59df6ab21fe5d3dd4248319be..e45e42e85d3c6821229c81ad444ad36a7827779c 100644
--- a/src/plugins/auth/authd/Makefile.in
+++ b/src/plugins/auth/authd/Makefile.in
@@ -59,7 +59,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -151,8 +150,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/auth/munge/Makefile.in b/src/plugins/auth/munge/Makefile.in
index 28fe3062f9f110f814ae601ce42deb91e420b365..c922304802d3aa3c40aa5110ec2fb78150fbf978 100644
--- a/src/plugins/auth/munge/Makefile.in
+++ b/src/plugins/auth/munge/Makefile.in
@@ -59,7 +59,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -152,8 +151,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/auth/none/Makefile.in b/src/plugins/auth/none/Makefile.in
index b1f3c981932613e8e7030cc3a05f568e8e408881..ff0e1641c13bd263c6b4d4c7246fb6ad481fc43a 100644
--- a/src/plugins/auth/none/Makefile.in
+++ b/src/plugins/auth/none/Makefile.in
@@ -59,7 +59,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -150,8 +149,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/checkpoint/Makefile.in b/src/plugins/checkpoint/Makefile.in
index 824df5d69013f4daf3f8d70d99160cdd6271e8b0..bc012a4f7671f5fa48c013739c8d55547330c6c6 100644
--- a/src/plugins/checkpoint/Makefile.in
+++ b/src/plugins/checkpoint/Makefile.in
@@ -56,7 +56,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -131,8 +130,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/checkpoint/aix/Makefile.in b/src/plugins/checkpoint/aix/Makefile.in
index 42b3196fbc367ce3d170e3c97a8ea0488b81484c..d79f80805f3f49d0a0789357d7add22024dda06e 100644
--- a/src/plugins/checkpoint/aix/Makefile.in
+++ b/src/plugins/checkpoint/aix/Makefile.in
@@ -59,7 +59,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -155,8 +154,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/checkpoint/none/Makefile.in b/src/plugins/checkpoint/none/Makefile.in
index d1b14f3a613dd53adfc193f10298f04ad52d6a5d..0713b2ba16c8bb78d1eb61b6b5a0661f3817f793 100644
--- a/src/plugins/checkpoint/none/Makefile.in
+++ b/src/plugins/checkpoint/none/Makefile.in
@@ -59,7 +59,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -150,8 +149,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/jobacct/Makefile.in b/src/plugins/jobacct/Makefile.in
index 1031822cd84556bd5184f98dd78942657d0bc046..f483dbe716572e01e5f5ec568dfb1776b92e45e1 100644
--- a/src/plugins/jobacct/Makefile.in
+++ b/src/plugins/jobacct/Makefile.in
@@ -56,7 +56,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -131,8 +130,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/jobacct/aix/Makefile.in b/src/plugins/jobacct/aix/Makefile.in
index 9d1cfbe31c9ecb37865a9bda7948b1c3aa98faf3..101061d9f049ca43c5b04ecae45875df78722a05 100644
--- a/src/plugins/jobacct/aix/Makefile.in
+++ b/src/plugins/jobacct/aix/Makefile.in
@@ -59,7 +59,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -151,8 +150,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/jobacct/linux/Makefile.in b/src/plugins/jobacct/linux/Makefile.in
index 841421ec3de70f1c5c1a74fc294d4ffba1e107d2..f7243f65a41f23075a63bde77bff47067ed60340 100644
--- a/src/plugins/jobacct/linux/Makefile.in
+++ b/src/plugins/jobacct/linux/Makefile.in
@@ -59,7 +59,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -151,8 +150,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/jobacct/none/Makefile.in b/src/plugins/jobacct/none/Makefile.in
index 621fcf127f7a94564afd251c3057c3da35665c87..a6e87d11cbd838832883a6873bb15b47b87504a2 100644
--- a/src/plugins/jobacct/none/Makefile.in
+++ b/src/plugins/jobacct/none/Makefile.in
@@ -59,7 +59,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -150,8 +149,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/jobcomp/Makefile.in b/src/plugins/jobcomp/Makefile.in
index f3f6031773c09d121b8f0148f94b3c33574e1c34..9ef50a1d854f89766990120601d2fc65273b6816 100644
--- a/src/plugins/jobcomp/Makefile.in
+++ b/src/plugins/jobcomp/Makefile.in
@@ -56,7 +56,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -131,8 +130,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/jobcomp/filetxt/Makefile.in b/src/plugins/jobcomp/filetxt/Makefile.in
index f0dc621dd16173b388ec561a1275392e5517130e..20e30a9398fecf03ab1f54ff9e0316ae9c49d3d7 100644
--- a/src/plugins/jobcomp/filetxt/Makefile.in
+++ b/src/plugins/jobcomp/filetxt/Makefile.in
@@ -59,7 +59,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -150,8 +149,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/jobcomp/none/Makefile.in b/src/plugins/jobcomp/none/Makefile.in
index e602b290466f598d7401a7f77e41378be3807bc7..4a27a681941a89cfb8e34a97fcaa548aa6d1659f 100644
--- a/src/plugins/jobcomp/none/Makefile.in
+++ b/src/plugins/jobcomp/none/Makefile.in
@@ -59,7 +59,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -150,8 +149,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/jobcomp/script/Makefile.in b/src/plugins/jobcomp/script/Makefile.in
index 9d264c7bd050317f4e88fca83880df9daa66ce20..6d1d60f62a3790cb8824ba4c10c6caf10fe4a04c 100644
--- a/src/plugins/jobcomp/script/Makefile.in
+++ b/src/plugins/jobcomp/script/Makefile.in
@@ -59,7 +59,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -150,8 +149,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/mpi/Makefile.in b/src/plugins/mpi/Makefile.in
index 771f4e78b7d0a0165266b7b6e9d04ff237fc7a5a..9d9d52e6724b8ed8864c45ba2f8420ab07fd67d1 100644
--- a/src/plugins/mpi/Makefile.in
+++ b/src/plugins/mpi/Makefile.in
@@ -56,7 +56,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -131,8 +130,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/mpi/lam/Makefile.in b/src/plugins/mpi/lam/Makefile.in
index ae584fe78473d246b52c407f2433be0725029ca5..a9ff8982274669e69dfbe190686c02cfca286ece 100644
--- a/src/plugins/mpi/lam/Makefile.in
+++ b/src/plugins/mpi/lam/Makefile.in
@@ -59,7 +59,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -150,8 +149,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/mpi/mpichgm/Makefile.in b/src/plugins/mpi/mpichgm/Makefile.in
index 9d05b0a258fa99aa360b4b3b13b9584b58f785a1..3cf7b5fe2159ce6b90fcf39d97224a7788fcedc0 100644
--- a/src/plugins/mpi/mpichgm/Makefile.in
+++ b/src/plugins/mpi/mpichgm/Makefile.in
@@ -59,7 +59,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -151,8 +150,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/mpi/mvapich/Makefile.in b/src/plugins/mpi/mvapich/Makefile.in
index 44527a7afd95c085c3f9df754805b91176d2e4e9..a5e6b23608f05722b0fc330e1de38abfd602c4f2 100644
--- a/src/plugins/mpi/mvapich/Makefile.in
+++ b/src/plugins/mpi/mvapich/Makefile.in
@@ -59,7 +59,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -151,8 +150,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/mpi/none/Makefile.in b/src/plugins/mpi/none/Makefile.in
index 56858fc2e74661c00a528e0374c74396156f948a..0035f210058cae897c8a582a7e6a93302ac4900a 100644
--- a/src/plugins/mpi/none/Makefile.in
+++ b/src/plugins/mpi/none/Makefile.in
@@ -59,7 +59,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -150,8 +149,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/proctrack/Makefile.am b/src/plugins/proctrack/Makefile.am
index e97e1a5fc5c51e376f1f2b3f1aa06843f438fe26..738cdc2cf9f844bc3550b8b12665089716bef1ec 100644
--- a/src/plugins/proctrack/Makefile.am
+++ b/src/plugins/proctrack/Makefile.am
@@ -2,11 +2,7 @@
 # Makefile for proctrack plugins
 
 if HAVE_AIX_PROCTRACK
-AIX_PROCTRACK = aix 
+SUBDIRS = aix pgid linuxproc rms
+else
+SUBDIRS = pgid linuxproc rms
 endif
-
-if HAVE_SGI_JOB
-SGI_JOB = sgi_job
-endif
-
-SUBDIRS = $(AIX_PROCTRACK) $(SGI_JOB) pgid linuxproc rms 
diff --git a/src/plugins/proctrack/Makefile.in b/src/plugins/proctrack/Makefile.in
index d2b44bbcf2839045f739a01f2552d81ddda5a39f..ad23c3cc9d0eae0254d7a199e9f893e36a5480bc 100644
--- a/src/plugins/proctrack/Makefile.in
+++ b/src/plugins/proctrack/Makefile.in
@@ -56,7 +56,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -74,7 +73,7 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	uninstall-recursive
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = aix sgi_job pgid linuxproc rms
+DIST_SUBDIRS = pgid linuxproc rms aix
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -131,8 +130,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
@@ -249,9 +246,8 @@ target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-@HAVE_AIX_PROCTRACK_TRUE@AIX_PROCTRACK = aix 
-@HAVE_SGI_JOB_TRUE@SGI_JOB = sgi_job
-SUBDIRS = $(AIX_PROCTRACK) $(SGI_JOB) pgid linuxproc rms 
+@HAVE_AIX_PROCTRACK_FALSE@SUBDIRS = pgid linuxproc rms
+@HAVE_AIX_PROCTRACK_TRUE@SUBDIRS = aix pgid linuxproc rms
 all: all-recursive
 
 .SUFFIXES:
diff --git a/src/plugins/proctrack/aix/Makefile.in b/src/plugins/proctrack/aix/Makefile.in
index 0a23aeb23e3fded323c432ec714a0a6bfbab8c2d..050dda5f24cce6b63ea2f5b6eac82bef3f4808da 100644
--- a/src/plugins/proctrack/aix/Makefile.in
+++ b/src/plugins/proctrack/aix/Makefile.in
@@ -59,7 +59,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -150,8 +149,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/proctrack/linuxproc/Makefile.in b/src/plugins/proctrack/linuxproc/Makefile.in
index d4e63a58d76177d1e9eedb0818041f8ea0b693c5..be82999ceb17a67928257b3129d94ecd811bafbd 100644
--- a/src/plugins/proctrack/linuxproc/Makefile.in
+++ b/src/plugins/proctrack/linuxproc/Makefile.in
@@ -59,7 +59,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -151,8 +150,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/proctrack/pgid/Makefile.in b/src/plugins/proctrack/pgid/Makefile.in
index 36f626c39b7130dbefea59a912b33a6c7e3fa741..8698ee5d323553e2dccc75f7d92196fc9589a56e 100644
--- a/src/plugins/proctrack/pgid/Makefile.in
+++ b/src/plugins/proctrack/pgid/Makefile.in
@@ -59,7 +59,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -150,8 +149,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/proctrack/rms/Makefile.in b/src/plugins/proctrack/rms/Makefile.in
index deefe3d7238460a73c964b65e3ad2bbac245b5c3..7be7bf67b108f91d98f80151a16174183c429390 100644
--- a/src/plugins/proctrack/rms/Makefile.in
+++ b/src/plugins/proctrack/rms/Makefile.in
@@ -59,7 +59,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -151,8 +150,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/proctrack/sgi_job/Makefile.am b/src/plugins/proctrack/sgi_job/Makefile.am
index 2d657e01bf6cdd6597e202cce65c8e36d4b048d9..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/src/plugins/proctrack/sgi_job/Makefile.am
+++ b/src/plugins/proctrack/sgi_job/Makefile.am
@@ -1,15 +0,0 @@
-# $Id: Makefile.am 4954 2005-05-26 22:04:39Z morrone $
-# Makefile for proctrack/sgi_job plugin
-
-AUTOMAKE_OPTIONS = foreign
-
-PLUGIN_FLAGS = - -module -avoid-version --export-dynamic 
-
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
-
-pkglib_LTLIBRARIES = proctrack_sgi_job.la
-
-proctrack_sgi_job_la_SOURCES = proctrack_sgi_job.c
-proctrack_sgi_job_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) $(OTHER_FLAGS)
-# Don't need to add -ljob because we dlopen the .so to avoid 
-#  symbol collisions with slurm functions
diff --git a/src/plugins/proctrack/sgi_job/Makefile.in b/src/plugins/proctrack/sgi_job/Makefile.in
index cfdcc9871f111cc73134c2ed8ef83946de0ec589..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/src/plugins/proctrack/sgi_job/Makefile.in
+++ b/src/plugins/proctrack/sgi_job/Makefile.in
@@ -1,553 +0,0 @@
-# Makefile.in generated by automake 1.9 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  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@
-
-# $Id: Makefile.am 4954 2005-05-26 22:04:39Z morrone $
-# Makefile for proctrack/sgi_job plugin
-
-SOURCES = $(proctrack_sgi_job_la_SOURCES)
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../../..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-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 = :
-host_triplet = @host@
-subdir = src/plugins/proctrack/sgi_job
-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/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_bluegene.m4 \
-	$(top_srcdir)/auxdir/x_ac_debug.m4 \
-	$(top_srcdir)/auxdir/x_ac_elan.m4 \
-	$(top_srcdir)/auxdir/x_ac_federation.m4 \
-	$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
-	$(top_srcdir)/auxdir/x_ac_munge.m4 \
-	$(top_srcdir)/auxdir/x_ac_ncurses.m4 \
-	$(top_srcdir)/auxdir/x_ac_pam.m4 \
-	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
-	$(top_srcdir)/auxdir/x_ac_readline.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_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 =
-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 = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(pkglibdir)"
-pkglibLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(pkglib_LTLIBRARIES)
-proctrack_sgi_job_la_LIBADD =
-am_proctrack_sgi_job_la_OBJECTS = proctrack_sgi_job.lo
-proctrack_sgi_job_la_OBJECTS = $(am_proctrack_sgi_job_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/slurm
-depcomp = $(SHELL) $(top_srcdir)/auxdir/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(proctrack_sgi_job_la_SOURCES)
-DIST_SOURCES = $(proctrack_sgi_job_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTHD_CFLAGS = @AUTHD_CFLAGS@
-AUTHD_LIBS = @AUTHD_LIBS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BG_INCLUDES = @BG_INCLUDES@
-BG_LDFLAGS = @BG_LDFLAGS@
-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@
-DEBUG_MODULES_FALSE = @DEBUG_MODULES_FALSE@
-DEBUG_MODULES_TRUE = @DEBUG_MODULES_TRUE@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ELAN_LIBS = @ELAN_LIBS@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
-FFLAGS = @FFLAGS@
-HAVE_AIX = @HAVE_AIX@
-HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
-HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
-HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
-HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
-HAVE_ELAN = @HAVE_ELAN@
-HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
-HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
-HAVE_FEDERATION = @HAVE_FEDERATION@
-HAVE_FEDERATION_FALSE = @HAVE_FEDERATION_FALSE@
-HAVE_FEDERATION_TRUE = @HAVE_FEDERATION_TRUE@
-HAVE_NUMA_FALSE = @HAVE_NUMA_FALSE@
-HAVE_NUMA_TRUE = @HAVE_NUMA_TRUE@
-HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
-HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
-HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
-HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
-HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
-HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
-HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
-HAVE_UNSETENV_FALSE = @HAVE_UNSETENV_FALSE@
-HAVE_UNSETENV_TRUE = @HAVE_UNSETENV_TRUE@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIB_LDFLAGS = @LIB_LDFLAGS@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
-MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
-MUNGE_LIBS = @MUNGE_LIBS@
-NCURSES = @NCURSES@
-NUMA_LIBS = @NUMA_LIBS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PAM_LIBS = @PAM_LIBS@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCTRACKDIR = @PROCTRACKDIR@
-PROJECT = @PROJECT@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-READLINE_LIBS = @READLINE_LIBS@
-RELEASE = @RELEASE@
-SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
-SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SLURMCTLD_PORT = @SLURMCTLD_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_VERSION = @SLURM_VERSION@
-SO_LDFLAGS = @SO_LDFLAGS@
-SSL_CPPFLAGS = @SSL_CPPFLAGS@
-SSL_LDFLAGS = @SSL_LDFLAGS@
-SSL_LIBS = @SSL_LIBS@
-STRIP = @STRIP@
-VERSION = @VERSION@
-WITH_AUTHD_FALSE = @WITH_AUTHD_FALSE@
-WITH_AUTHD_TRUE = @WITH_AUTHD_TRUE@
-WITH_GNU_LD_FALSE = @WITH_GNU_LD_FALSE@
-WITH_GNU_LD_TRUE = @WITH_GNU_LD_TRUE@
-WITH_MUNGE_FALSE = @WITH_MUNGE_FALSE@
-WITH_MUNGE_TRUE = @WITH_MUNGE_TRUE@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-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@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = - -module -avoid-version --export-dynamic 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
-pkglib_LTLIBRARIES = proctrack_sgi_job.la
-proctrack_sgi_job_la_SOURCES = proctrack_sgi_job.c
-proctrack_sgi_job_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) $(OTHER_FLAGS)
-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 \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/plugins/proctrack/sgi_job/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  src/plugins/proctrack/sgi_job/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
-install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
-	    $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
-	  else :; fi; \
-	done
-
-uninstall-pkglibLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
-	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_sgi_job.la: $(proctrack_sgi_job_la_OBJECTS) $(proctrack_sgi_job_la_DEPENDENCIES) 
-	$(LINK) -rpath $(pkglibdir) $(proctrack_sgi_job_la_LDFLAGS) $(proctrack_sgi_job_la_OBJECTS) $(proctrack_sgi_job_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proctrack_sgi_job.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@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@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@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@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@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
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-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; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	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; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	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; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && 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)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$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)
-
-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-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am: install-pkglibLTLIBRARIES
-
-install-info: install-info-am
-
-install-man:
-
-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-info-am uninstall-pkglibLTLIBRARIES
-
-.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-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-pkglibLTLIBRARIES 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-info-am \
-	uninstall-pkglibLTLIBRARIES
-
-# Don't need to add -ljob because we dlopen the .so to avoid 
-#  symbol collisions with slurm functions
-# 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/sgi_job/proctrack_sgi_job.c b/src/plugins/proctrack/sgi_job/proctrack_sgi_job.c
index 7be9301118cb09a1765a24b4c3094af6c43993d0..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/src/plugins/proctrack/sgi_job/proctrack_sgi_job.c
+++ b/src/plugins/proctrack/sgi_job/proctrack_sgi_job.c
@@ -1,223 +0,0 @@
-/*****************************************************************************\
- *  proctrack_sgi_job.c - process tracking via SGI's "job" module.
- *****************************************************************************
- *  Copyright (C) 2005 The Regents of the University of California.
- *  Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
- *  Written by Mark Grondona <mgrondona@llnl.gov>
- *  UCRL-CODE-217948.
- *  
- *  This file is part of SLURM, a resource management program.
- *  For details, see <http://www.llnl.gov/linux/slurm/>.
- *  
- *  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.
- *  
- *  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.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  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 <sys/types.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <dlfcn.h>
-
-#include <slurm/slurm.h>
-#include <slurm/slurm_errno.h>
-#include "src/common/log.h"
-
-#include "src/slurmd/slurmstepd/slurmstepd_job.h"
-
-
-const char plugin_name[]      = "Process tracking via SGI job module";
-const char plugin_type[]      = "proctrack/sgi_job";
-const uint32_t plugin_version = 90;
-
-/* 
- * We can't include <job.h> since its prototypes conflict with some
- *  of SLURM's. Instead, put important function protypes and
- *  the jid_t typedef here:
- */
-typedef uint64_t jid_t;
-
-typedef jid_t (*create_f)    (jid_t jid_requested, uid_t uid, int options);
-typedef jid_t (*getjid_f)    (jid_t jid);
-typedef jid_t (*waitjid_f)   (jid_t jid, int *status, int options);
-typedef int   (*killjid_f)   (jid_t jid, int sig);
-typedef jid_t (*detachpid_f) (pid_t pid);
-typedef jid_t (*attachpid_f) (pid_t pid, jid_t jid_requested);
-
-/*
- *  Handle to libjob.so 
- */
-static void *libjob_handle = NULL;
-
-/*
- *  libjob operations we'll need in this plugin
- */
-static struct job_operations {
-	create_f    create;
-	getjid_f    getjid;
-	waitjid_f   waitjid;
-	killjid_f   killjid;
-	detachpid_f detachpid;
-	attachpid_f attachpid;
-} job_ops;
-
-
-/*
- * init() is called when the plugin is loaded, before any other functions
- * are called.  Put global initialization here.
- */
-int init (void)
-{
-	/*  We dlopen() libjob.so instead of directly linking to it
-	 *   because of symbols like "job_create" in libjob which
-	 *   conflict with symbols in slurmd. dlopening the library
-	 *   prevents these symbols from going into the global namespace.
-	 */
-	if ((libjob_handle = dlopen ("libjob.so", RTLD_LAZY)) == NULL) {
-		error ("Unable to open libjob.so: %m");
-		return SLURM_ERROR;
-	}
-
-	job_ops.create    = dlsym (libjob_handle, "job_create");
-	job_ops.getjid    = dlsym (libjob_handle, "job_getjid");
-	job_ops.waitjid   = dlsym (libjob_handle, "job_waitjid");
-	job_ops.killjid   = dlsym (libjob_handle, "job_killjid");
-	job_ops.detachpid = dlsym (libjob_handle, "job_detachpid");
-	job_ops.attachpid = dlsym (libjob_handle, "job_attachpid");
-
-	if (!job_ops.create)
-		error ("Unable to resolve job_create in libjob.so");
-	if (!job_ops.getjid)
-		error ("Unable to resolve job_getjid in libjob.so");
-	if (!job_ops.waitjid)
-		error ("Unable to resolve job_waitjid in libjob.so");
-	if (!job_ops.killjid)
-		error ("Unable to resolve job_killjid in libjob.so");
-	if (!job_ops.detachpid)
-		error ("Unable to resolve job_detachpid in libjob.so");
-	if (!job_ops.attachpid)
-		error ("Unable to resolve job_attachpid in libjob.so");
-
-	info ("successfully loaded libjob.so");
-	return SLURM_SUCCESS;
-}
-
-int fini (void)
-{
-	dlclose (libjob_handle);
-	return SLURM_SUCCESS;
-}
-
-jid_t _job_create (jid_t jid, uid_t uid, int options)
-{
-	return ((*job_ops.create) (jid, uid, options));
-}
-
-jid_t _job_getjid (pid_t pid)
-{
-	return ((*job_ops.getjid) (pid));
-}
-
-jid_t _job_waitjid (jid_t jid, int *status, int options)
-{
-	return ((*job_ops.waitjid) (jid, status, options));
-}
-
-int _job_killjid (jid_t jid, int sig)
-{
-	return ((*job_ops.killjid) (jid, sig));
-}
-
-int _job_detachpid (pid_t pid)
-{
-	return ((*job_ops.detachpid) (pid));
-}
-
-int _job_attachpid (pid_t pid, jid_t jid)
-{
-	return ((*job_ops.attachpid) (pid, jid));
-}
-
-
-int slurm_container_create (slurmd_job_t *job)
-{
-	jid_t jid;
-	job->cont_id = (uint32_t) -1;
-
-	if (!libjob_handle)
-		init();
-
-	if ((jid = _job_create (0, job->uid, 0)) == (jid_t) -1) {
-		error ("Failed to create job container: %m");
-		return SLURM_ERROR;
-	}
-	debug ("created jid 0x%08lx\n", jid);
-	
-	return SLURM_SUCCESS;
-}
-
-int slurm_container_add (slurmd_job_t *job, pid_t pid)
-{
-	if (job->cont_id == (uint32_t) -1) {
-		job->cont_id = (uint32_t) _job_getjid (getpid());
-		/*
-		 *  Detach ourselves from the job container now that there
-		 *   is at least one other process in it.
-		 */
-		if (_job_detachpid (getpid()) == (jid_t) -1) {
-			error ("Failed to detach from job container: %m");
-			return SLURM_ERROR;
-		}
-	}
-	return SLURM_SUCCESS;
-}
-
-int slurm_container_signal (uint32_t id, int sig)
-{
-	if ( (_job_killjid ((jid_t) id, sig) < 0) 
-	   && (errno != ENODATA) && (errno != EBADF) )
-		return (SLURM_ERROR);
-	return (SLURM_SUCCESS);
-}
-
-int slurm_container_destroy (uint32_t id)
-{
-	_job_waitjid ((jid_t) id, NULL, 0);
-	/*  Assume any error means job doesn't exist. Therefore,
-	 *   return SUCCESS to slurmd so it doesn't retry continuously
-	 */
-	return SLURM_SUCCESS;
-}
-
-uint32_t slurm_container_find (pid_t pid)
-{
-	jid_t jid;
-
-	if ((jid = _job_getjid (pid)) == (jid_t) -1)
-		return ((uint32_t) 0); /* XXX: What to return on error? */
-	
-	return ((uint32_t) jid);
-}
-
diff --git a/src/plugins/sched/Makefile.in b/src/plugins/sched/Makefile.in
index 14b5809aa4ac9badbf5705f0e28a78b9ef8bdcdc..59cde186f8acf97c4e92439df424ca439c205105 100644
--- a/src/plugins/sched/Makefile.in
+++ b/src/plugins/sched/Makefile.in
@@ -56,7 +56,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -131,8 +130,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/sched/backfill/Makefile.in b/src/plugins/sched/backfill/Makefile.in
index b8b16aba7cd9cab0a712e954958af9aeb154c6a5..9a24a04bb96389b6ae71f37b2374833159947ef3 100644
--- a/src/plugins/sched/backfill/Makefile.in
+++ b/src/plugins/sched/backfill/Makefile.in
@@ -59,7 +59,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -150,8 +149,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/sched/builtin/Makefile.in b/src/plugins/sched/builtin/Makefile.in
index b814ddded21b63c0226a4d55cd0120258a45b34f..29aa51bce1f5bd7f8fde8a59ba615656d70d4593 100644
--- a/src/plugins/sched/builtin/Makefile.in
+++ b/src/plugins/sched/builtin/Makefile.in
@@ -59,7 +59,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -150,8 +149,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/sched/hold/Makefile.in b/src/plugins/sched/hold/Makefile.in
index ce00febab0001372edc68b4c9389b421a1b2964e..12ad1263fd108b2ce9beab836a3988b03f72758b 100644
--- a/src/plugins/sched/hold/Makefile.in
+++ b/src/plugins/sched/hold/Makefile.in
@@ -59,7 +59,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -150,8 +149,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/sched/maui/Makefile.in b/src/plugins/sched/maui/Makefile.in
index 68dc3dc110752c4a0a7fc0504f39911ac4b6d610..2260c03410a09f454b5149a7b8e212f5f99685df 100644
--- a/src/plugins/sched/maui/Makefile.in
+++ b/src/plugins/sched/maui/Makefile.in
@@ -56,7 +56,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -131,8 +130,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/sched/maui/wiki/Makefile.in b/src/plugins/sched/maui/wiki/Makefile.in
index e73e7f9a9ed6b6cec00a3e3f6987546460fd2ec5..c39d8da5eff91eef414767f999309dbfc0a72d30 100644
--- a/src/plugins/sched/maui/wiki/Makefile.in
+++ b/src/plugins/sched/maui/wiki/Makefile.in
@@ -59,7 +59,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -183,8 +182,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/select/Makefile.in b/src/plugins/select/Makefile.in
index 0a4e7a94a2ff761113c1cfe3275708fb6219e567..3ccee6c04ae0365576e0317394ff84d1f33f4b00 100644
--- a/src/plugins/select/Makefile.in
+++ b/src/plugins/select/Makefile.in
@@ -56,7 +56,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -131,8 +130,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/select/bluegene/Makefile.in b/src/plugins/select/bluegene/Makefile.in
index 19ac40aec123c944db8ded9d84f135c503b92f2b..2a37b838087391e4c51ecb40eaac75b131094c7e 100644
--- a/src/plugins/select/bluegene/Makefile.in
+++ b/src/plugins/select/bluegene/Makefile.in
@@ -56,7 +56,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -131,8 +130,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/select/bluegene/block_allocator/Makefile.in b/src/plugins/select/bluegene/block_allocator/Makefile.in
index 1c7951640c8c00ad37a02bad77c61037e56145ad..520402793a677b50c7bb69fa769946cfa5588f68 100644
--- a/src/plugins/select/bluegene/block_allocator/Makefile.in
+++ b/src/plugins/select/bluegene/block_allocator/Makefile.in
@@ -59,7 +59,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -142,8 +141,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/select/bluegene/plugin/Makefile.in b/src/plugins/select/bluegene/plugin/Makefile.in
index d1c03d6c4dc348047e948d2333cdad76d13f97a4..8b1cf5ede077da97abeff5c7b44c50226d68f5ca 100644
--- a/src/plugins/select/bluegene/plugin/Makefile.in
+++ b/src/plugins/select/bluegene/plugin/Makefile.in
@@ -62,7 +62,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -172,8 +171,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/select/cons_res/Makefile.in b/src/plugins/select/cons_res/Makefile.in
index 8c4850dd00ac815d0193ed93e0116c641bef4336..bb36cce62af45ffff89448ee0eb086fe1f98ce22 100644
--- a/src/plugins/select/cons_res/Makefile.in
+++ b/src/plugins/select/cons_res/Makefile.in
@@ -59,7 +59,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -151,8 +150,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/select/linear/Makefile.in b/src/plugins/select/linear/Makefile.in
index 4196f0ff5381c05be4d20df00a3131a63a78694e..c42a85defd4fb1b546960775601739ff0cbf9eef 100644
--- a/src/plugins/select/linear/Makefile.in
+++ b/src/plugins/select/linear/Makefile.in
@@ -59,7 +59,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -150,8 +149,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/switch/Makefile.in b/src/plugins/switch/Makefile.in
index be881b4ba25efeea5bbf914945f589c654c4a0a5..0a7c500d53c7322cc431b3f3e686c59082cd7853 100644
--- a/src/plugins/switch/Makefile.in
+++ b/src/plugins/switch/Makefile.in
@@ -56,7 +56,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -131,8 +130,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/switch/elan/Makefile.in b/src/plugins/switch/elan/Makefile.in
index 1a680a4d043e3c45b2b958566d0468ee35ec1a4f..a6b1f611818ce559441fa9213c2d2ff42b55e8ad 100644
--- a/src/plugins/switch/elan/Makefile.in
+++ b/src/plugins/switch/elan/Makefile.in
@@ -59,7 +59,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -156,8 +155,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/switch/federation/Makefile.in b/src/plugins/switch/federation/Makefile.in
index 118a1c57e4bb1a09f51bb7d37be2653b06cf4fbf..98f98a495a4f3d6a8db6ef8ce5d4eb7dedbd6353 100644
--- a/src/plugins/switch/federation/Makefile.in
+++ b/src/plugins/switch/federation/Makefile.in
@@ -59,7 +59,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -160,8 +159,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/switch/none/Makefile.in b/src/plugins/switch/none/Makefile.in
index 045d564e14815abf3a654a1ee1295e6430f2c976..99af1081ed8ffaf500ffbbe22307024c12b34930 100644
--- a/src/plugins/switch/none/Makefile.in
+++ b/src/plugins/switch/none/Makefile.in
@@ -59,7 +59,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -151,8 +150,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/task/Makefile.in b/src/plugins/task/Makefile.in
index a3ed44937208e1f3261b0cb74bc4a1858f05a97c..f3a8ad05532dafe6d84b821adad9ceaa072703a1 100644
--- a/src/plugins/task/Makefile.in
+++ b/src/plugins/task/Makefile.in
@@ -56,7 +56,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -131,8 +130,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/task/affinity/Makefile.in b/src/plugins/task/affinity/Makefile.in
index c86065e0a27ae79343e90c451d527c554fdc9e67..e38788dbaa4a5fd1a66d75e7843f9070f4b49220 100644
--- a/src/plugins/task/affinity/Makefile.in
+++ b/src/plugins/task/affinity/Makefile.in
@@ -59,7 +59,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -160,8 +159,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/task/none/Makefile.in b/src/plugins/task/none/Makefile.in
index 2a94117a89111b896344e3296b265abe178d0771..367f4bc82f42fe4be5f5dce922c8e9b4218d185f 100644
--- a/src/plugins/task/none/Makefile.in
+++ b/src/plugins/task/none/Makefile.in
@@ -59,7 +59,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -151,8 +150,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/sacct/Makefile.in b/src/sacct/Makefile.in
index 0f3c0e7f93fb90e820fe3c53eabf9315021767a0..f9d4c92fcfa0d864579bc4f0d46f85330ad9ad92 100644
--- a/src/sacct/Makefile.in
+++ b/src/sacct/Makefile.in
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# $Id: Makefile.am 7820 2006-04-20 21:35:46Z da $
+# $Id: Makefile.am 7973 2006-05-08 23:52:35Z morrone $
 # Makefile for sacct
 
 
@@ -62,7 +62,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -150,8 +149,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/sbcast/Makefile.in b/src/sbcast/Makefile.in
index 829f54e3faeb7da63c147d409d8359fa8b8fc9da..ac002295a6203c08aa25f0ebd8ccd9e6b26797a0 100644
--- a/src/sbcast/Makefile.in
+++ b/src/sbcast/Makefile.in
@@ -63,7 +63,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -150,8 +149,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/scancel/Makefile.in b/src/scancel/Makefile.in
index d87f555a1472faf1504b4401f3b8f4c26b9ce1c0..3fa942034d7627fb9f097a4c47668f39fd29c97d 100644
--- a/src/scancel/Makefile.in
+++ b/src/scancel/Makefile.in
@@ -62,7 +62,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -149,8 +148,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/scontrol/Makefile.in b/src/scontrol/Makefile.in
index 6d39631344a6b7f9c40b05e135aca2ab6dcf4e49..f79d076c434fb4f31d372120dfa73054318bc179 100644
--- a/src/scontrol/Makefile.in
+++ b/src/scontrol/Makefile.in
@@ -60,7 +60,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -148,8 +147,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/sinfo/Makefile.in b/src/sinfo/Makefile.in
index ab91cb7a243865c3da714eac486b14ab5749cce1..510798181bb22732b42fc6e3fef1eefc614f892d 100644
--- a/src/sinfo/Makefile.in
+++ b/src/sinfo/Makefile.in
@@ -63,7 +63,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -151,8 +150,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/slurmctld/Makefile.in b/src/slurmctld/Makefile.in
index 32cea24a57afe6bea9eaf9b493307697a97737d0..081664b422b1669f56831b74a4e02d2c9918d1c3 100644
--- a/src/slurmctld/Makefile.in
+++ b/src/slurmctld/Makefile.in
@@ -61,7 +61,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -153,8 +152,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/slurmd/Makefile.in b/src/slurmd/Makefile.in
index 9508c03e654544dc6f45179fc51171c30807b3b0..df6476c6f26ebcaf4fe0312eaa11d4ea415c72aa 100644
--- a/src/slurmd/Makefile.in
+++ b/src/slurmd/Makefile.in
@@ -55,7 +55,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -130,8 +129,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/slurmd/slurmd/Makefile.in b/src/slurmd/slurmd/Makefile.in
index cd284b87741a090fb88fd385a94eb0bc3931fbd0..eeca7f28fd43af876a14b5df285b7a9b81079a77 100644
--- a/src/slurmd/slurmd/Makefile.in
+++ b/src/slurmd/slurmd/Makefile.in
@@ -62,7 +62,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -161,8 +160,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/slurmd/slurmstepd/Makefile.in b/src/slurmd/slurmstepd/Makefile.in
index 1cc94e9726003b75381163e54243b60e5e5f01ba..33e8128431e29a7d4e7bdf1eb41b152f1567860d 100644
--- a/src/slurmd/slurmstepd/Makefile.in
+++ b/src/slurmd/slurmstepd/Makefile.in
@@ -61,7 +61,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -157,8 +156,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/smap/Makefile.in b/src/smap/Makefile.in
index aef51a6368b5b03d79db09cbc90e7685261b9672..325468e08cf84d2cc453808f4809d9ca006dd937 100644
--- a/src/smap/Makefile.in
+++ b/src/smap/Makefile.in
@@ -66,7 +66,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -162,8 +161,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/squeue/Makefile.in b/src/squeue/Makefile.in
index 5ec10a012bb287b467c1d74056e0b694413d997f..85cd5b1afe69e6c42642e1410ee0586e12ff07d0 100644
--- a/src/squeue/Makefile.in
+++ b/src/squeue/Makefile.in
@@ -63,7 +63,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -152,8 +151,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/srun/Makefile.in b/src/srun/Makefile.in
index cde3ae751b2aa11541592467ad79b933bf314d2b..c2570b008612a8f4902adf4e5e3d79757042b05e 100644
--- a/src/srun/Makefile.in
+++ b/src/srun/Makefile.in
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# $Id: Makefile.am 8241 2006-05-30 23:23:19Z grondo $
+# $Id: Makefile.am 8235 2006-05-30 18:56:24Z morrone $
 #
 
 SOURCES = $(srun_SOURCES)
@@ -60,7 +60,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -153,8 +152,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index 9949358100e431b1b8ec18a5c7a2756e803568c9..233bd10d37894323d57e424013df7df2bdf4771b 100644
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -57,7 +57,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -137,8 +136,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/testsuite/expect/Makefile.in b/testsuite/expect/Makefile.in
index 90f64b6e239ad9c7b47c6e32f41728fe7dcb951a..ef35c9fab061e08c34bce85f8f4eeabae76530e5 100644
--- a/testsuite/expect/Makefile.in
+++ b/testsuite/expect/Makefile.in
@@ -55,7 +55,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -121,8 +120,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
@@ -307,11 +304,11 @@ EXTRA_DIST = \
 	test1.49			\
 	test1.50			\
 	test1.51			\
-	test1.52			\
-	test1.53			\
-	test1.54			\
-	test1.55			\
-	test1.56			\
+	test1.52                        \
+	test1.53                        \
+	test1.54                        \
+	test1.55                        \
+	test1.56                        \
 	test1.80			\
 	test1.81			\
 	test1.82			\
@@ -324,8 +321,8 @@ EXTRA_DIST = \
 	test1.88.prog.c			\
 	test1.89			\
 	test1.89.prog.c			\
-	test1.90			\
-	test1.90.prog.c			\
+	test1.90                        \
+	test1.90.prog.c                 \
 	test2.1				\
 	test2.2				\
 	test2.3				\
@@ -342,8 +339,8 @@ EXTRA_DIST = \
 	test3.4				\
 	test3.5				\
 	test3.6				\
-	test3.7				\
-	test3.7.prog.c			\
+	test3.7                         \
+	test3.7.prog.c                  \
 	test3.8				\
 	test4.1				\
 	test4.2				\
@@ -417,20 +414,20 @@ EXTRA_DIST = \
 	test11.3			\
 	test11.4			\
 	test11.5			\
-	test11.6			\
-	test11.7			\
+	test11.6                        \
+	test11.7                        \
 	test12.1			\
 	test12.2			\
 	test12.2.prog.c			\
 	test13.1			\
-	test14.1			\
-	test14.2			\
-	test14.3			\
-	test14.4			\
-	test14.5			\
-	test14.6			\
-	test14.7			\
-	test14.8			\
+	test14.1                        \
+	test14.2                        \
+	test14.3                        \
+	test14.4                        \
+	test14.5                        \
+	test14.6                        \
+	test14.7                        \
+	test14.8                        \
 	usleep
 
 all: all-am
diff --git a/testsuite/slurm_unit/Makefile.in b/testsuite/slurm_unit/Makefile.in
index 56fa10ff8088034936a31f6f3411e308741a63fa..50a4eebcb71d5aabefb4fc087abd0a14bdb6e918 100644
--- a/testsuite/slurm_unit/Makefile.in
+++ b/testsuite/slurm_unit/Makefile.in
@@ -53,7 +53,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -128,8 +127,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/testsuite/slurm_unit/api/Makefile.in b/testsuite/slurm_unit/api/Makefile.in
index ffa4b60649c276454b9d5ede85482023ece782ca..40a92c7921738bdfd5d788704fb38b5964c2a6ee 100644
--- a/testsuite/slurm_unit/api/Makefile.in
+++ b/testsuite/slurm_unit/api/Makefile.in
@@ -56,7 +56,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -148,8 +147,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/testsuite/slurm_unit/api/manual/Makefile.in b/testsuite/slurm_unit/api/manual/Makefile.in
index b7edd56e14f99993e40be880d2fb08e5a2b746ed..0e3d62f99458bdcb73cb04abe56ca4bee8b18f87 100644
--- a/testsuite/slurm_unit/api/manual/Makefile.in
+++ b/testsuite/slurm_unit/api/manual/Makefile.in
@@ -60,7 +60,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -179,8 +178,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/testsuite/slurm_unit/common/Makefile.in b/testsuite/slurm_unit/common/Makefile.in
index 562cfcceef6329006cb0ad2f4de55eec263d79a2..99b5513dbc3f00d4903e75ed37b3f7af9bedf8eb 100644
--- a/testsuite/slurm_unit/common/Makefile.in
+++ b/testsuite/slurm_unit/common/Makefile.in
@@ -58,7 +58,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -191,8 +190,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/testsuite/slurm_unit/slurmctld/Makefile.in b/testsuite/slurm_unit/slurmctld/Makefile.in
index a8a428519a052571c41bed5fe0d6fe3efcf2ea47..bc3357fea3ff2bb05a1ad127234b9baced4354ed 100644
--- a/testsuite/slurm_unit/slurmctld/Makefile.in
+++ b/testsuite/slurm_unit/slurmctld/Makefile.in
@@ -54,7 +54,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -121,8 +120,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/testsuite/slurm_unit/slurmd/Makefile.in b/testsuite/slurm_unit/slurmd/Makefile.in
index 5f523ec2c86529ed8975c896449f455e612945b2..001fbe9fa1e8729fd24ab6b01eac30167d67a7cc 100644
--- a/testsuite/slurm_unit/slurmd/Makefile.in
+++ b/testsuite/slurm_unit/slurmd/Makefile.in
@@ -54,7 +54,6 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
 	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
 	$(top_srcdir)/auxdir/x_ac_readline.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_xcpu.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -121,8 +120,6 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
 HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
 HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
 HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
-HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
-HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
 HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
 HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
 HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@