diff --git a/Makefile.in b/Makefile.in
index 6920ccc114d818d2ae97db7bd614188e902c35dc..1b63915a6bcd8835982d722ec96816090060ddb1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -53,6 +53,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/aclocal.m4 b/aclocal.m4
index 52d1dfc288723a6869aa70d84938f24dc2ddb14b..0ab5acdb498118452102f71a904867057d3bc502 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -7557,6 +7557,7 @@ m4_include([auxdir/x_ac_cflags.m4])
m4_include([auxdir/x_ac_databases.m4])
m4_include([auxdir/x_ac_debug.m4])
m4_include([auxdir/x_ac_elan.m4])
+m4_include([auxdir/x_ac_env.m4])
m4_include([auxdir/x_ac_federation.m4])
m4_include([auxdir/x_ac_gpl_licensed.m4])
m4_include([auxdir/x_ac_gtk.m4])
diff --git a/auxdir/Makefile.in b/auxdir/Makefile.in
index db43dbdac0c1208c8af91ce02eb64649970cc6f7..e438ec3be5e4dfca9b03e535deae56496841f7f8 100644
--- a/auxdir/Makefile.in
+++ b/auxdir/Makefile.in
@@ -46,6 +46,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
@@ -248,6 +249,7 @@ EXTRA_DIST = \
x_ac_cflags.m4 \
x_ac_debug.m4 \
x_ac_elan.m4 \
+ x_ac_env.m4 \
x_ac_federation.m4 \
x_ac_gpl_licensed.m4 \
x_ac_iso.m4 \
diff --git a/auxdir/x_ac_env.m4 b/auxdir/x_ac_env.m4
index 0143ae668fc73488ab85e35637191e1d20d01852..39e570f47152fdb29990ed8717813e38dc95fb0d 100644
--- a/auxdir/x_ac_env.m4
+++ b/auxdir/x_ac_env.m4
@@ -13,22 +13,23 @@
AC_DEFUN([X_AC_ENV_LOGIC], [
AC_MSG_CHECKING([whether sbatch --get-user-env option should load .login])
AC_ARG_ENABLE(
- [env_with_login],
- AS_HELP_STRING(--disable_env_with_login,disable loading .login with sbatch --get-user-env option),
+ [load-env-no-login],
+ AS_HELP_STRING(--enable-load-env-no-login,
+ [enable --get-user-env option to load user environment without .login]),
[ case "$enableval" in
- yes) x_ac_env_with_login=yes ;;
- no) x_ac_env_with_login=no ;;
+ yes) x_ac_load_env_no_login=yes ;;
+ no) x_ac_load_env_no_login=no ;;
*) AC_MSG_RESULT([doh!])
- AC_MSG_ERROR([bad value "$enableval" for --enable_env_with_login]) ;;
+ AC_MSG_ERROR([bad value "$enableval" for --enable-load-env-no-login]) ;;
esac
],
- [x_ac_env_with_login=yes]
+ [x_ac_load_env_no_login=no]
)
- if test "$x_ac_env_with_login" = yes; then
+ if test "$x_ac_load_env_no_login" = yes; then
AC_MSG_RESULT([yes])
- AC_DEFINE(LOAD_ENV_WITH_LOGIN,,
- [define whether sbatch --get-user-env option should load .login])
+ AC_DEFINE(LOAD_ENV_NO_LOGIN, 1,
+ [Define to 1 for --get-user-env to load user environment without .login])
else
AC_MSG_RESULT([no])
fi
diff --git a/config.h.in b/config.h.in
index 6070f076f4c8f259fae098a94377a081dc8992e8..f87bb4df2d02bd280669c11361b62d0b415cc134 100644
--- a/config.h.in
+++ b/config.h.in
@@ -273,7 +273,7 @@
member named physmem. */
#undef HAVE__SYSTEM_CONFIGURATION
-/* Define to 1 for --get-user-env to load user environment without login. */
+/* Define to 1 for --get-user-env to load user environment without .login */
#undef LOAD_ENV_NO_LOGIN
/* Define to 1 for memory leak debugging. */
diff --git a/configure b/configure
index 99355fff778639e68b5df2bb7284717331b47ea9..c7d9219d24109e9c638d53aec597f8bde0c8f56d 100755
--- a/configure
+++ b/configure
@@ -1577,6 +1577,9 @@ Optional Features:
--enable-pam enable PAM (Pluggable Authentication Modules)
support
--disable-iso8601 disable ISO 8601 time format support
+ --enable-load-env-no-login
+ enable --get-user-env option to load user
+ environment without .login
--enable-bluegene-emulation
deprecated use --enable-bgl-emulation
--enable-bgl-emulation Run SLURM in BGL mode on a non-bluegene system
@@ -1585,9 +1588,6 @@ Optional Features:
--enable-memory-leak-debug
enable memory leak debugging code for development
--enable-front-end enable slurmd operation on a front-end
- --enable-load-env-no-login
- enable --get-user-env option to load user
- environment without login
--enable-multiple-slurmd
enable multiple-slurmd support
@@ -23030,6 +23030,41 @@ echo "${ECHO_T}no" >&6; }
+ { echo "$as_me:$LINENO: checking whether sbatch --get-user-env option should load .login" >&5
+echo $ECHO_N "checking whether sbatch --get-user-env option should load .login... $ECHO_C" >&6; }
+ # Check whether --enable-load-env-no-login was given.
+if test "${enable_load_env_no_login+set}" = set; then
+ enableval=$enable_load_env_no_login; case "$enableval" in
+ yes) x_ac_load_env_no_login=yes ;;
+ no) x_ac_load_env_no_login=no ;;
+ *) { echo "$as_me:$LINENO: result: doh!" >&5
+echo "${ECHO_T}doh!" >&6; }
+ { { echo "$as_me:$LINENO: error: bad value \"$enableval\" for --enable-load-env-no-login" >&5
+echo "$as_me: error: bad value \"$enableval\" for --enable-load-env-no-login" >&2;}
+ { (exit 1); exit 1; }; } ;;
+ esac
+
+else
+ x_ac_load_env_no_login=no
+
+fi
+
+
+ if test "$x_ac_load_env_no_login" = yes; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define LOAD_ENV_NO_LOGIN 1
+_ACEOF
+
+ else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ fi
+
+
+
{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
if test "${ac_cv_c_bigendian+set}" = set; then
@@ -27280,36 +27315,6 @@ fi
-{ echo "$as_me:$LINENO: checking if user env vars should be based upon login" >&5
-echo $ECHO_N "checking if user env vars should be based upon login... $ECHO_C" >&6; }
-# Check whether --enable-load-env-no-login was given.
-if test "${enable_load_env_no_login+set}" = set; then
- enableval=$enable_load_env_no_login; case "$enableval" in
- yes) x_ac_load_env_no_login=yes ;;
- no) x_ac_load_env_no_login=no ;;
- *) { echo "$as_me:$LINENO: result: doh!" >&5
-echo "${ECHO_T}doh!" >&6; }
- { { echo "$as_me:$LINENO: error: bad value \"$enableval\" for --enable-load-env-no-login" >&5
-echo "$as_me: error: bad value \"$enableval\" for --enable-load-env-no-login" >&2;}
- { (exit 1); exit 1; }; } ;;
- esac
-
-
-fi
-
-if test "$x_ac_load_env_no_login" = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define LOAD_ENV_NO_LOGIN 1
-_ACEOF
-
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
{ echo "$as_me:$LINENO: checking whether to enable multiple-slurmd support" >&5
echo $ECHO_N "checking whether to enable multiple-slurmd support... $ECHO_C" >&6; }
# Check whether --enable-multiple-slurmd was given.
diff --git a/configure.ac b/configure.ac
index c67340b296b362e6a2b6549cb995cdbd20c85013..efb9e5037330744b572006713c2060ef30267336 100644
--- a/configure.ac
+++ b/configure.ac
@@ -221,30 +221,6 @@ dnl Check for compilation of SLURM auth modules:
dnl
X_AC_MUNGE
-dnl Check if srun --get-user-env (for Moab) should load user's environment
-dnl based upon a login. This may be temporary.
-dnl
-AC_MSG_CHECKING([if user env vars should be based upon login])
-AC_ARG_ENABLE(
- [load-env-no-login],
- AS_HELP_STRING(--enable-load-env-no-login,
- [enable --get-user-env option to load user environment without login]),
- [ case "$enableval" in
- yes) x_ac_load_env_no_login=yes ;;
- no) x_ac_load_env_no_login=no ;;
- *) AC_MSG_RESULT([doh!])
- AC_MSG_ERROR([bad value "$enableval" for --enable-load-env-no-login]) ;;
- esac
- ]
-)
-if test "$x_ac_load_env_no_login" = yes; then
- AC_DEFINE(LOAD_ENV_NO_LOGIN, 1,
- [Define to 1 for --get-user-env to load user environment without login.])
- AC_MSG_RESULT([yes])
-else
- AC_MSG_RESULT([no])
-fi
-
dnl
dnl Check if multiple-slurmd support is requested and define MULTIPLE_SLURMD
dnl if it is.
diff --git a/contribs/Makefile.in b/contribs/Makefile.in
index 3e420038748fc82428b7175f8cba5da685dd7b1a..15479d1b4683bc4671276156aecd6ac37cd1807e 100644
--- a/contribs/Makefile.in
+++ b/contribs/Makefile.in
@@ -45,6 +45,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/contribs/perlapi/Makefile.in b/contribs/perlapi/Makefile.in
index 30ea2e15efa518449c0b0b8f5c7bd79a08d7baec..3084a872461b02533c79d18c54eba9dcb014f056 100644
--- a/contribs/perlapi/Makefile.in
+++ b/contribs/perlapi/Makefile.in
@@ -45,6 +45,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/contribs/phpext/Makefile.in b/contribs/phpext/Makefile.in
index 4b13431f93f9101dba23607fb25f670fd53cb725..69aded36e705612d9de6fc52e0888113f94c8c8f 100644
--- a/contribs/phpext/Makefile.in
+++ b/contribs/phpext/Makefile.in
@@ -45,6 +45,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/contribs/python/Makefile.in b/contribs/python/Makefile.in
index acd67f906c036e5ad077f762e84af10e04862879..809c5e2194eedae5e58d8ebd90f6b5d5a4df39a1 100644
--- a/contribs/python/Makefile.in
+++ b/contribs/python/Makefile.in
@@ -45,6 +45,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/contribs/python/hostlist/Makefile.in b/contribs/python/hostlist/Makefile.in
index bf34aa37bd4b1ac9f9739dcf3f76542ef41fba0c..5500e25d0d7c0e57ba18ff474bbceef800da558c 100644
--- a/contribs/python/hostlist/Makefile.in
+++ b/contribs/python/hostlist/Makefile.in
@@ -46,6 +46,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/contribs/python/hostlist/test/Makefile.in b/contribs/python/hostlist/test/Makefile.in
index 8b1cd3371fb9ba77cfc3ca93d92035ada05fd4a7..bb74c452171f2d72b8cc073542fb028a106b3781 100644
--- a/contribs/python/hostlist/test/Makefile.in
+++ b/contribs/python/hostlist/test/Makefile.in
@@ -45,6 +45,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/contribs/torque/Makefile.in b/contribs/torque/Makefile.in
index 2dd30ae14674e584ea3dc5c45d9826bdff49243e..132d78339424d63458073584ecfb2e099634b9f7 100644
--- a/contribs/torque/Makefile.in
+++ b/contribs/torque/Makefile.in
@@ -49,6 +49,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/doc/Makefile.in b/doc/Makefile.in
index f5f7eadc4536767a63afc109695292025daf895c..d867d8874aea0bfa012960b65d045ae9ec7a213b 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -45,6 +45,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/doc/html/Makefile.in b/doc/html/Makefile.in
index 4a49275c2a6610c6f04da9b5f2cfa7bba35e8da3..31645a8ea9661641d5cf47c675279bc90267b36a 100644
--- a/doc/html/Makefile.in
+++ b/doc/html/Makefile.in
@@ -47,6 +47,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/doc/man/Makefile.in b/doc/man/Makefile.in
index 2c48332e97de0775490a9dee024fee19fb3a144a..5c1d0cacc6542fa4a25d59793f4962bb339e0616 100644
--- a/doc/man/Makefile.in
+++ b/doc/man/Makefile.in
@@ -45,6 +45,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/Makefile.in b/src/Makefile.in
index db2cf95aa54685811ee43a99b7d90577ef818804..f45e013f66ca5d26c9a8c65351202789bf979385 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -45,6 +45,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/api/Makefile.in b/src/api/Makefile.in
index f6dbe70ce1b858f16a87dd40bf57d81fb8d23595..e03a4783b1bba436ec78aefd79927289b48d0dea 100644
--- a/src/api/Makefile.in
+++ b/src/api/Makefile.in
@@ -51,6 +51,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/common/Makefile.in b/src/common/Makefile.in
index 8a03bb3e5508f1014c3cd14cfdc90f4fd19391a9..a7161797ad8cb0bc89cb0587c710efc37cf261d2 100644
--- a/src/common/Makefile.in
+++ b/src/common/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/database/Makefile.in b/src/database/Makefile.in
index 65a0a56a2e58ff7005af123149a7a51f8db6f4e7..823916e0bde5972dbec62d96756401665dfb07ed 100644
--- a/src/database/Makefile.in
+++ b/src/database/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/Makefile.in b/src/plugins/Makefile.in
index 3a4ffdd5a8f77b8124dfa92f15ad6bf5f57db8a6..796d3d1da3167f19e0cfc632618d7d64130b543f 100644
--- a/src/plugins/Makefile.in
+++ b/src/plugins/Makefile.in
@@ -45,6 +45,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/accounting_storage/Makefile.in b/src/plugins/accounting_storage/Makefile.in
index 581bd4b86f911d5d2e7dc27c5278d2e319c5036b..3ca52478bc69cffd060361e0dacfc02c69bc1537 100644
--- a/src/plugins/accounting_storage/Makefile.in
+++ b/src/plugins/accounting_storage/Makefile.in
@@ -47,6 +47,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/accounting_storage/filetxt/Makefile.in b/src/plugins/accounting_storage/filetxt/Makefile.in
index dc7ddbf76c018de6e91f6511a7067c5ac4aa56df..b17a242ecb196fcf7a42c0502b4425c3d57ccae8 100644
--- a/src/plugins/accounting_storage/filetxt/Makefile.in
+++ b/src/plugins/accounting_storage/filetxt/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/accounting_storage/mysql/Makefile.in b/src/plugins/accounting_storage/mysql/Makefile.in
index 914d8e2730c2eee142ba74c5b2115513607346c8..c9a30f06e46b7e8da78f925a930b613fefdcea6a 100644
--- a/src/plugins/accounting_storage/mysql/Makefile.in
+++ b/src/plugins/accounting_storage/mysql/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/accounting_storage/none/Makefile.in b/src/plugins/accounting_storage/none/Makefile.in
index 1b1e8355a4b066a1cf800fa1ae53a6f972324078..b346aba68893f0b38bdffa1be461ea07692ffeee 100644
--- a/src/plugins/accounting_storage/none/Makefile.in
+++ b/src/plugins/accounting_storage/none/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/accounting_storage/pgsql/Makefile.in b/src/plugins/accounting_storage/pgsql/Makefile.in
index 8af0325978f8bc2f9e183f4262dfe8bff7dd9c88..c0086f55c677b5a06b482245e11513c4e8909faf 100644
--- a/src/plugins/accounting_storage/pgsql/Makefile.in
+++ b/src/plugins/accounting_storage/pgsql/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/accounting_storage/slurmdbd/Makefile.in b/src/plugins/accounting_storage/slurmdbd/Makefile.in
index ef71ce1ea274bd4aced7b74baa357d9323bb3531..864ece53f3bd8e801c36997b36871982df7b0389 100644
--- a/src/plugins/accounting_storage/slurmdbd/Makefile.in
+++ b/src/plugins/accounting_storage/slurmdbd/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/auth/Makefile.in b/src/plugins/auth/Makefile.in
index ef5d899a41e6e29c7dd6331913e356f9c119ca0a..eb0801298d41da44c1e53f60a1dd07dae5411d81 100644
--- a/src/plugins/auth/Makefile.in
+++ b/src/plugins/auth/Makefile.in
@@ -47,6 +47,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/auth/authd/Makefile.in b/src/plugins/auth/authd/Makefile.in
index d850be843447f0f0c319b8cac50042a6770d550b..5f34807dc07f3fa263b190a594b4ad0f9d489ec9 100644
--- a/src/plugins/auth/authd/Makefile.in
+++ b/src/plugins/auth/authd/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/auth/munge/Makefile.in b/src/plugins/auth/munge/Makefile.in
index 1e1c173312fed1989a2f496944d64f34fde68d86..7c257636520af65b0c7d8adb962db7f622cf1835 100644
--- a/src/plugins/auth/munge/Makefile.in
+++ b/src/plugins/auth/munge/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/auth/none/Makefile.in b/src/plugins/auth/none/Makefile.in
index b520656300bbd6d900c13772f5904fb218e82497..a3711e8c43c42ef666e2ddf23e091e165a0eff0f 100644
--- a/src/plugins/auth/none/Makefile.in
+++ b/src/plugins/auth/none/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/checkpoint/Makefile.in b/src/plugins/checkpoint/Makefile.in
index e581d284066d9763f72f6f8ff8c39634605f13bf..113153135cf733af186fd4e3c616ed214fc34df3 100644
--- a/src/plugins/checkpoint/Makefile.in
+++ b/src/plugins/checkpoint/Makefile.in
@@ -47,6 +47,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/checkpoint/aix/Makefile.in b/src/plugins/checkpoint/aix/Makefile.in
index be64ea1a4d4e4d6c461b52e6ce3d5ea6ffb35893..e559a165e17f96f9c496038dd5cdbe4d854eeaa2 100644
--- a/src/plugins/checkpoint/aix/Makefile.in
+++ b/src/plugins/checkpoint/aix/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/checkpoint/none/Makefile.in b/src/plugins/checkpoint/none/Makefile.in
index f42e23d709030d9dae42e44cbd7c8f627910e219..50485fb37908ddf56e1a31fae12957545e07e9de 100644
--- a/src/plugins/checkpoint/none/Makefile.in
+++ b/src/plugins/checkpoint/none/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/checkpoint/ompi/Makefile.in b/src/plugins/checkpoint/ompi/Makefile.in
index f219d860672fcb3ffff5292e0003ce38ba0f52b5..9bd3a18dc820ef0a067c38ce224b408baaad68ba 100644
--- a/src/plugins/checkpoint/ompi/Makefile.in
+++ b/src/plugins/checkpoint/ompi/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/checkpoint/xlch/Makefile.in b/src/plugins/checkpoint/xlch/Makefile.in
index 37b6105e399e0f4fe885600a5d86a94700a6b140..1238170da50e30e1069721d9b63354523adc4919 100644
--- a/src/plugins/checkpoint/xlch/Makefile.in
+++ b/src/plugins/checkpoint/xlch/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/crypto/Makefile.in b/src/plugins/crypto/Makefile.in
index 1f001ff44563bbca096509d819380300314b195c..d5c9dac510bb0b841fb5a8f5098398fcc438e518 100644
--- a/src/plugins/crypto/Makefile.in
+++ b/src/plugins/crypto/Makefile.in
@@ -47,6 +47,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/crypto/munge/Makefile.in b/src/plugins/crypto/munge/Makefile.in
index 5769cfdf69bb8dbefa1e7a00c43164281a3a9dfd..dff955db8a524473249bc234b9ff7b8a56d02477 100644
--- a/src/plugins/crypto/munge/Makefile.in
+++ b/src/plugins/crypto/munge/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/crypto/openssl/Makefile.in b/src/plugins/crypto/openssl/Makefile.in
index e07434ee1d8a6fe35ab5938ba0e5fdfe88f07199..218ba1bb46eb75bba6fed0e54e50de3aeff910f9 100644
--- a/src/plugins/crypto/openssl/Makefile.in
+++ b/src/plugins/crypto/openssl/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/jobacct_gather/Makefile.in b/src/plugins/jobacct_gather/Makefile.in
index d3111ebda4968db587abc60c2bf50ba0f6de00cc..0daf96279a83939d32d46aff3ac6d4265bf71ca8 100644
--- a/src/plugins/jobacct_gather/Makefile.in
+++ b/src/plugins/jobacct_gather/Makefile.in
@@ -47,6 +47,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/jobacct_gather/aix/Makefile.in b/src/plugins/jobacct_gather/aix/Makefile.in
index c9f8b48024be33a433b28772919c07d0ec94cfc1..b6d77e436e9e5fee169cac34302518ac6d0a259b 100644
--- a/src/plugins/jobacct_gather/aix/Makefile.in
+++ b/src/plugins/jobacct_gather/aix/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/jobacct_gather/linux/Makefile.in b/src/plugins/jobacct_gather/linux/Makefile.in
index 8ebe4a9758c24c35fd5e6af1523ac24c68ee2428..3563e44f94e1d247761788ee807e449a0084553e 100644
--- a/src/plugins/jobacct_gather/linux/Makefile.in
+++ b/src/plugins/jobacct_gather/linux/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/jobacct_gather/none/Makefile.in b/src/plugins/jobacct_gather/none/Makefile.in
index e796e3b890d2f6b62f72eb490230203fa7cb3ba7..fb375a3c7c95377563d9e698586648c70b042ef0 100644
--- a/src/plugins/jobacct_gather/none/Makefile.in
+++ b/src/plugins/jobacct_gather/none/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/jobcomp/Makefile.in b/src/plugins/jobcomp/Makefile.in
index d52a188c96557e3e00bfb5033009beab599f482c..68e60debdc7718ed77232fe6fa926713cdabcb98 100644
--- a/src/plugins/jobcomp/Makefile.in
+++ b/src/plugins/jobcomp/Makefile.in
@@ -47,6 +47,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/jobcomp/filetxt/Makefile.in b/src/plugins/jobcomp/filetxt/Makefile.in
index 2ebdece8e6ea5c3ada2820e3d80a03a416693631..5597f4e60667284097c99c6a9a72e469c77f32d1 100644
--- a/src/plugins/jobcomp/filetxt/Makefile.in
+++ b/src/plugins/jobcomp/filetxt/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/jobcomp/mysql/Makefile.in b/src/plugins/jobcomp/mysql/Makefile.in
index cc04ca98344c0f92cd4e5814f8014cb6a1fe684a..580f3a88204b0dc13dea778a7929b8fd4c9fa415 100644
--- a/src/plugins/jobcomp/mysql/Makefile.in
+++ b/src/plugins/jobcomp/mysql/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/jobcomp/none/Makefile.in b/src/plugins/jobcomp/none/Makefile.in
index 8811fd92b87330cc9999130b77322e4b66491a30..62fcdb45fb51161046831190e81babb2322924c2 100644
--- a/src/plugins/jobcomp/none/Makefile.in
+++ b/src/plugins/jobcomp/none/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/jobcomp/pgsql/Makefile.in b/src/plugins/jobcomp/pgsql/Makefile.in
index e7d19b3ac8f24f730757917746c4e0cc735d4760..a1b52c59753a61641fbbedfb6960e30037cceb52 100644
--- a/src/plugins/jobcomp/pgsql/Makefile.in
+++ b/src/plugins/jobcomp/pgsql/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/jobcomp/script/Makefile.in b/src/plugins/jobcomp/script/Makefile.in
index 8853e8cdfa28114e0b6e79e5ce1491399a0e3731..ea612e73928031468cc07fc620d5450175f91756 100644
--- a/src/plugins/jobcomp/script/Makefile.in
+++ b/src/plugins/jobcomp/script/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/mpi/Makefile.in b/src/plugins/mpi/Makefile.in
index 868c8bafa08fbe3acf03184b6188b4925a8e70b9..fb7e64404b29d1aa4b7220db8a60f6a3fc94468c 100644
--- a/src/plugins/mpi/Makefile.in
+++ b/src/plugins/mpi/Makefile.in
@@ -47,6 +47,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/mpi/lam/Makefile.in b/src/plugins/mpi/lam/Makefile.in
index 30de18ecfc14e583c44ed4f3a1b40700f3b515b5..9922490e5e4601bc38f9e191dd7b868f503f3256 100644
--- a/src/plugins/mpi/lam/Makefile.in
+++ b/src/plugins/mpi/lam/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/mpi/mpich1_p4/Makefile.in b/src/plugins/mpi/mpich1_p4/Makefile.in
index e5a06cac6038aeb0fdc36401ece1f07baa82f604..d42663d5993b2b4eb3ed86ac1053b73ac5713538 100644
--- a/src/plugins/mpi/mpich1_p4/Makefile.in
+++ b/src/plugins/mpi/mpich1_p4/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/mpi/mpich1_shmem/Makefile.in b/src/plugins/mpi/mpich1_shmem/Makefile.in
index 79e6d03e001f5f8a737bde80077ca670afd355c9..cf0505dff8e3899210fb9299115a893b0ce59ea2 100644
--- a/src/plugins/mpi/mpich1_shmem/Makefile.in
+++ b/src/plugins/mpi/mpich1_shmem/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/mpi/mpichgm/Makefile.in b/src/plugins/mpi/mpichgm/Makefile.in
index 47cede3166700d92ce7acd2f593f1b93d382e72f..58ab5f2b32d30b12238bcf6edaf408d91c707b97 100644
--- a/src/plugins/mpi/mpichgm/Makefile.in
+++ b/src/plugins/mpi/mpichgm/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/mpi/mpichmx/Makefile.in b/src/plugins/mpi/mpichmx/Makefile.in
index 7b9e352573dbc7d49ea4520d84551fed5dbb7276..1dbacb8c683e7a8fc7134566cffacee782f3dff7 100644
--- a/src/plugins/mpi/mpichmx/Makefile.in
+++ b/src/plugins/mpi/mpichmx/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/mpi/mvapich/Makefile.in b/src/plugins/mpi/mvapich/Makefile.in
index f3cc681018d498a52ccd555bf209b55304100a23..f6dc5c1692a682fc0f91b939e6a41b80b87c43a9 100644
--- a/src/plugins/mpi/mvapich/Makefile.in
+++ b/src/plugins/mpi/mvapich/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/mpi/none/Makefile.in b/src/plugins/mpi/none/Makefile.in
index 3f8ded0a97fd855dc93b5bad57f6c65c5b94e28e..555c3653971ffad3e3acd58661f93c861b492345 100644
--- a/src/plugins/mpi/none/Makefile.in
+++ b/src/plugins/mpi/none/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/mpi/openmpi/Makefile.in b/src/plugins/mpi/openmpi/Makefile.in
index 2ba0f72017eab3314b6ab8280f48f908e81f1c0e..86ec7aa6111f3c1182d623eecea8d32fe9b0210d 100644
--- a/src/plugins/mpi/openmpi/Makefile.in
+++ b/src/plugins/mpi/openmpi/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/priority/Makefile.in b/src/plugins/priority/Makefile.in
index fb1a98b50cac95478fb5dc9bc4d7bd2ec71c5e83..ce137b51348b5bf997388ad295f48bca372de291 100644
--- a/src/plugins/priority/Makefile.in
+++ b/src/plugins/priority/Makefile.in
@@ -45,6 +45,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/priority/basic/Makefile.in b/src/plugins/priority/basic/Makefile.in
index c0371ab1f81275c5562b95e138d4d13698de0fdd..47bb6917e7a48a249c514879748b02a9e34b913a 100644
--- a/src/plugins/priority/basic/Makefile.in
+++ b/src/plugins/priority/basic/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/priority/multifactor/Makefile.in b/src/plugins/priority/multifactor/Makefile.in
index 8ccc44501097f9733e3f562fe9bf492215bca7e0..9022f46269d112512527d809c9906dc29cf0521d 100644
--- a/src/plugins/priority/multifactor/Makefile.in
+++ b/src/plugins/priority/multifactor/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/proctrack/Makefile.in b/src/plugins/proctrack/Makefile.in
index 99a3160b737759bde6a8d10915a7ee35e0d993eb..5264c6b81e0b2e541de31c364d8b7e9f5975a93f 100644
--- a/src/plugins/proctrack/Makefile.in
+++ b/src/plugins/proctrack/Makefile.in
@@ -47,6 +47,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/proctrack/aix/Makefile.in b/src/plugins/proctrack/aix/Makefile.in
index c973cb1d6aec25d01980b59239e5d916dec01634..f1a73011f1ad41ea9553b472d4365823b0a256c2 100644
--- a/src/plugins/proctrack/aix/Makefile.in
+++ b/src/plugins/proctrack/aix/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/proctrack/linuxproc/Makefile.in b/src/plugins/proctrack/linuxproc/Makefile.in
index 525b3d96dc3b142d7017d52dc6b4517a8b803399..550a37481a3cd0696ab8d814a5bf458c5995e881 100644
--- a/src/plugins/proctrack/linuxproc/Makefile.in
+++ b/src/plugins/proctrack/linuxproc/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/proctrack/pgid/Makefile.in b/src/plugins/proctrack/pgid/Makefile.in
index 9b05407c124736baa9c84146261cc2a752eec88c..4f62e2a200660575bc08dd6bbd62c4c7b7ace659 100644
--- a/src/plugins/proctrack/pgid/Makefile.in
+++ b/src/plugins/proctrack/pgid/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/proctrack/rms/Makefile.in b/src/plugins/proctrack/rms/Makefile.in
index 13f1d9253b0a03d1993b0f9e485bfcb95c645c63..9a0f1c2cc455d3302f6ccd9ccec1ed9226881b0a 100644
--- a/src/plugins/proctrack/rms/Makefile.in
+++ b/src/plugins/proctrack/rms/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/proctrack/sgi_job/Makefile.in b/src/plugins/proctrack/sgi_job/Makefile.in
index 82f74f7b4ed2c3a94b41c9578341bcfde2d36032..69c943f5ca2b2c765b0cea049e73751dcbbb292a 100644
--- a/src/plugins/proctrack/sgi_job/Makefile.in
+++ b/src/plugins/proctrack/sgi_job/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/sched/Makefile.in b/src/plugins/sched/Makefile.in
index 6a95c52274195c0aa5fbb3d07277271c26df2768..0d7b0c939acbeeac133ab677cb75601bc692be81 100644
--- a/src/plugins/sched/Makefile.in
+++ b/src/plugins/sched/Makefile.in
@@ -47,6 +47,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/sched/backfill/Makefile.in b/src/plugins/sched/backfill/Makefile.in
index 7b5a120c37abcf22a96b5dadae623928805894a1..6c02167ffc36c0461feabcd2195a941271a37119 100644
--- a/src/plugins/sched/backfill/Makefile.in
+++ b/src/plugins/sched/backfill/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/sched/builtin/Makefile.in b/src/plugins/sched/builtin/Makefile.in
index 636a404bd8a731fed7b37127b4d664c5758cff92..18f2744fbcb1e9456c3a91a9f70793835d6fafcc 100644
--- a/src/plugins/sched/builtin/Makefile.in
+++ b/src/plugins/sched/builtin/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/sched/gang/Makefile.in b/src/plugins/sched/gang/Makefile.in
index 798a3cf121e1644553dbb08a0d05618ba23d2393..e3557c4f85bcceae9d07fca9541c00ab45fec841 100644
--- a/src/plugins/sched/gang/Makefile.in
+++ b/src/plugins/sched/gang/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/sched/hold/Makefile.in b/src/plugins/sched/hold/Makefile.in
index 5e653cefead27874032d1d640fd2f8b6cadbbca9..24c9555ac28ca24474b5c751ca88ec83360363f9 100644
--- a/src/plugins/sched/hold/Makefile.in
+++ b/src/plugins/sched/hold/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/sched/wiki/Makefile.in b/src/plugins/sched/wiki/Makefile.in
index c1d894e31e60b566f4b2a59f70c6d09ad03ef1a9..8b7c159da9866d1af4fe61473c56d2d7832774fb 100644
--- a/src/plugins/sched/wiki/Makefile.in
+++ b/src/plugins/sched/wiki/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/sched/wiki2/Makefile.in b/src/plugins/sched/wiki2/Makefile.in
index 1a4aebad124797c045dbd025ac1090380e2052fa..a6d7f6b848416bd408008555a05b71d12746579b 100644
--- a/src/plugins/sched/wiki2/Makefile.in
+++ b/src/plugins/sched/wiki2/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/select/Makefile.in b/src/plugins/select/Makefile.in
index 093067ba9577aa2fd02af7c6dff3d4557982f35f..5ff349bf18e7e471aafff809ffda88addea6c8ac 100644
--- a/src/plugins/select/Makefile.in
+++ b/src/plugins/select/Makefile.in
@@ -47,6 +47,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/select/bluegene/Makefile.in b/src/plugins/select/bluegene/Makefile.in
index b4144a06b95dbca6cadc19a6cfa1fc7676cb8a15..cbfbc72693f442860c96611d5b0f1a015071b6a4 100644
--- a/src/plugins/select/bluegene/Makefile.in
+++ b/src/plugins/select/bluegene/Makefile.in
@@ -47,6 +47,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/select/bluegene/block_allocator/Makefile.in b/src/plugins/select/bluegene/block_allocator/Makefile.in
index 29d2a705e3b334497881b42a653c3dd9b4f0ada4..7f941c31c1759b5db9f21f4277c3feaeb1f486cd 100644
--- a/src/plugins/select/bluegene/block_allocator/Makefile.in
+++ b/src/plugins/select/bluegene/block_allocator/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/select/bluegene/plugin/Makefile.in b/src/plugins/select/bluegene/plugin/Makefile.in
index fc9dc8df223b3ddf2f02fb04a782af92f15a186b..87590ae9b7d23d6c70820f356d38e8eca0c16179 100644
--- a/src/plugins/select/bluegene/plugin/Makefile.in
+++ b/src/plugins/select/bluegene/plugin/Makefile.in
@@ -51,6 +51,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/select/cons_res/Makefile.in b/src/plugins/select/cons_res/Makefile.in
index 8ad54b785b6582dad59552522dd10594f82e55e3..5206193f932b51c2c2bde83cbc8bd70733ad080a 100644
--- a/src/plugins/select/cons_res/Makefile.in
+++ b/src/plugins/select/cons_res/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/select/linear/Makefile.in b/src/plugins/select/linear/Makefile.in
index 91d276b9d3d7b537225eb3a7f4ba4ffac01ef574..f2a4b33e8f8c949670954ad5fc3a20dfc8e9ee92 100644
--- a/src/plugins/select/linear/Makefile.in
+++ b/src/plugins/select/linear/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/switch/Makefile.in b/src/plugins/switch/Makefile.in
index 235a3976e026792d763045ed602c54893338a7ae..98a49bc375ae0743c6075114d90ca273b66f619a 100644
--- a/src/plugins/switch/Makefile.in
+++ b/src/plugins/switch/Makefile.in
@@ -47,6 +47,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/switch/elan/Makefile.in b/src/plugins/switch/elan/Makefile.in
index 8007e34ae99790b57d30db837555f34389861943..a670c4c4945d075985254a39a360fcc5d40a4c66 100644
--- a/src/plugins/switch/elan/Makefile.in
+++ b/src/plugins/switch/elan/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/switch/federation/Makefile.in b/src/plugins/switch/federation/Makefile.in
index 0a08d3fc190aafef4ccc7d844b4c08379f30e25a..898bee2df06ba15de8e9e8cc826b2eb50e35d5f9 100644
--- a/src/plugins/switch/federation/Makefile.in
+++ b/src/plugins/switch/federation/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/switch/none/Makefile.in b/src/plugins/switch/none/Makefile.in
index 3c83c0b2df3517a67b0349f0bc1299ab6e0b87bb..9125d494b4c9a571ba9594ce41d109e8336c20ae 100644
--- a/src/plugins/switch/none/Makefile.in
+++ b/src/plugins/switch/none/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/task/Makefile.in b/src/plugins/task/Makefile.in
index 41b5f0365f9c994254dfe11c3d40785c13d7d6ad..5e2e7bcca382547a3d37a43672e45eeb9824ff67 100644
--- a/src/plugins/task/Makefile.in
+++ b/src/plugins/task/Makefile.in
@@ -47,6 +47,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/task/affinity/Makefile.in b/src/plugins/task/affinity/Makefile.in
index c1f8557a667d0e38bc5ffc11dc2b8b64b985ef81..7110a9318ca53d200afe21f919608a1eecefa645 100644
--- a/src/plugins/task/affinity/Makefile.in
+++ b/src/plugins/task/affinity/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/plugins/task/none/Makefile.in b/src/plugins/task/none/Makefile.in
index 6c99d2fa1bf0395cba9cad5d5ddfdf55a0aedf7b..f28c201264ac4578fd44f0baf154ce55782c4aec 100644
--- a/src/plugins/task/none/Makefile.in
+++ b/src/plugins/task/none/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/sacct/Makefile.in b/src/sacct/Makefile.in
index 6697390edea4325bba3815d54ee18cf47229a1a4..03f72eebc8e9adadbd3c0eea9bb6d0305bba16f6 100644
--- a/src/sacct/Makefile.in
+++ b/src/sacct/Makefile.in
@@ -51,6 +51,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/sacctmgr/Makefile.in b/src/sacctmgr/Makefile.in
index ddc06a36de64d0c3ce4a570d52bb09d932417c00..e51716c9d6228f6376171c1a2664df03da45f61f 100644
--- a/src/sacctmgr/Makefile.in
+++ b/src/sacctmgr/Makefile.in
@@ -49,6 +49,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/salloc/Makefile.in b/src/salloc/Makefile.in
index 13303bd8804ab2073ead8edb3370fd77e89158ca..2afcc9ae06bdb81dac08d72e48dce35d8040a241 100644
--- a/src/salloc/Makefile.in
+++ b/src/salloc/Makefile.in
@@ -49,6 +49,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/sattach/Makefile.in b/src/sattach/Makefile.in
index 000f4216804a5cef75aed976df285f0b82f86d4f..9dc967ccc04b3604e9473f3766af2fb71df4a392 100644
--- a/src/sattach/Makefile.in
+++ b/src/sattach/Makefile.in
@@ -49,6 +49,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/sbatch/Makefile.in b/src/sbatch/Makefile.in
index 6ee219eea14e1efbd15ee546ddc8373ff1933964..74c589436d0a572463048a9750b43efe4c9efee5 100644
--- a/src/sbatch/Makefile.in
+++ b/src/sbatch/Makefile.in
@@ -49,6 +49,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/sbcast/Makefile.in b/src/sbcast/Makefile.in
index 384f9b4075989af211f59c8033cbc21b04477a7e..04d92714f704e14a53ed9bdfe4fe2502e26635d7 100644
--- a/src/sbcast/Makefile.in
+++ b/src/sbcast/Makefile.in
@@ -52,6 +52,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/scancel/Makefile.in b/src/scancel/Makefile.in
index 29b53a5c3e20ce2b504561b1619079d5f4032b90..35450efa768a09965d70c56c7974e20d20cdec2c 100644
--- a/src/scancel/Makefile.in
+++ b/src/scancel/Makefile.in
@@ -51,6 +51,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/scontrol/Makefile.in b/src/scontrol/Makefile.in
index e28ba855ca9e117983c76fcccc6237a324344b46..c7e7429567da10f7df8ee0ab3f85e97bdf33d2c0 100644
--- a/src/scontrol/Makefile.in
+++ b/src/scontrol/Makefile.in
@@ -49,6 +49,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/sinfo/Makefile.in b/src/sinfo/Makefile.in
index 3ba5355744f3c1922207bb35478cf963b723193c..eab2060606c227107970b87a1457ab8c2ebd7bf4 100644
--- a/src/sinfo/Makefile.in
+++ b/src/sinfo/Makefile.in
@@ -52,6 +52,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/slurmctld/Makefile.in b/src/slurmctld/Makefile.in
index fb35e1911cbeb94ea4767a5cd6099c0bcd97c61d..69196aae07ff59a6ba23b4ffd70526d17dbdaf69 100644
--- a/src/slurmctld/Makefile.in
+++ b/src/slurmctld/Makefile.in
@@ -50,6 +50,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/slurmd/Makefile.in b/src/slurmd/Makefile.in
index 11076e18ca836466c94d96f4983051ed8b852c13..203ac4243245085d35e031ac0ab3fb68bd91e87d 100644
--- a/src/slurmd/Makefile.in
+++ b/src/slurmd/Makefile.in
@@ -45,6 +45,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/slurmd/slurmd/Makefile.in b/src/slurmd/slurmd/Makefile.in
index 2cf72d46df0a7e5724261ecb5337eec9c0fca301..4227e4038f4433e3717ed4bdcb52814ea82bcf60 100644
--- a/src/slurmd/slurmd/Makefile.in
+++ b/src/slurmd/slurmd/Makefile.in
@@ -50,6 +50,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/slurmd/slurmstepd/Makefile.in b/src/slurmd/slurmstepd/Makefile.in
index 472475af046f45ea1d798a57e4234d09b30fbcda..31601ca86fe188e19c85511da1b142d25de677ab 100644
--- a/src/slurmd/slurmstepd/Makefile.in
+++ b/src/slurmd/slurmstepd/Makefile.in
@@ -50,6 +50,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/slurmdbd/Makefile.in b/src/slurmdbd/Makefile.in
index 3abbd7e48c0113b05470f2a2af42efd9fcc50fd5..25dae3ece6cc47338488a091f0649a6422797a8c 100644
--- a/src/slurmdbd/Makefile.in
+++ b/src/slurmdbd/Makefile.in
@@ -50,6 +50,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/smap/Makefile.in b/src/smap/Makefile.in
index 827ad789b430523700cc8078850b1660e2909eee..c494019f9bcc7596f9686c573026ff35b7d359c9 100644
--- a/src/smap/Makefile.in
+++ b/src/smap/Makefile.in
@@ -55,6 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/squeue/Makefile.in b/src/squeue/Makefile.in
index ebe73e4b5704c1759a56851758a4973462a005ac..eaa6d81f60f5898426423855e0547639d1d95ef3 100644
--- a/src/squeue/Makefile.in
+++ b/src/squeue/Makefile.in
@@ -52,6 +52,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/sreport/Makefile.in b/src/sreport/Makefile.in
index b1b92922334d12084bb46eededf64608e6eb4407..24cda278fffe6b88d756f3e26afab9c019296767 100644
--- a/src/sreport/Makefile.in
+++ b/src/sreport/Makefile.in
@@ -49,6 +49,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/srun/Makefile.in b/src/srun/Makefile.in
index 6e85b215d71fa882a2a67a020b1febecb6f32dae..7bf29b9b9ffe08ebd078204128eff8112ec18038 100644
--- a/src/srun/Makefile.in
+++ b/src/srun/Makefile.in
@@ -49,6 +49,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/sshare/Makefile.in b/src/sshare/Makefile.in
index bf7a29fe2465ce03c24a099847646197b4effcf9..c6edb390cc299e078c85b1131a722c5b741d2548 100644
--- a/src/sshare/Makefile.in
+++ b/src/sshare/Makefile.in
@@ -49,6 +49,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/sstat/Makefile.in b/src/sstat/Makefile.in
index 82e862e111abf0b22a2ecf3b2ce6b54e40547ee0..26a491c51598ae9cdffec32f4b606f021a644978 100644
--- a/src/sstat/Makefile.in
+++ b/src/sstat/Makefile.in
@@ -51,6 +51,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/strigger/Makefile.in b/src/strigger/Makefile.in
index 507891546427637ca2384dcfe659bd0c89a6e929..b6b3203a5520bbdc1ceb6f05c8b2280948a0854b 100644
--- a/src/strigger/Makefile.in
+++ b/src/strigger/Makefile.in
@@ -52,6 +52,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/src/sview/Makefile.in b/src/sview/Makefile.in
index 2dce19997dd41a5b5dfab9d397913726c6c47250..9b6c055976c5830ede327a74c49f1a0a67063cbe 100644
--- a/src/sview/Makefile.in
+++ b/src/sview/Makefile.in
@@ -53,6 +53,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index 44c1531a4dfa83cbfd18453cc0842e2c5f1f882c..d997b87931a8a668a9516efeb71a0e5454c5c9d1 100644
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -47,6 +47,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/testsuite/expect/Makefile.in b/testsuite/expect/Makefile.in
index 40be3e4bb8ca46bab88eaf7e1866dc31c57fe99e..9775f69e360852a98d16aad7896e621588f8ea36 100644
--- a/testsuite/expect/Makefile.in
+++ b/testsuite/expect/Makefile.in
@@ -45,6 +45,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/testsuite/slurm_unit/Makefile.in b/testsuite/slurm_unit/Makefile.in
index cd09cf309bb734e30baf98d04b542102efa20852..22fa96a2a843a6e7cd1e8a78b6725e21f6bad3af 100644
--- a/testsuite/slurm_unit/Makefile.in
+++ b/testsuite/slurm_unit/Makefile.in
@@ -45,6 +45,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/testsuite/slurm_unit/api/Makefile.in b/testsuite/slurm_unit/api/Makefile.in
index f990019749687dce4c3317c89708b7c5883f2b16..d51be5db9ad96a038bd76332721b3b3eb3c2ea93 100644
--- a/testsuite/slurm_unit/api/Makefile.in
+++ b/testsuite/slurm_unit/api/Makefile.in
@@ -47,6 +47,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/testsuite/slurm_unit/api/manual/Makefile.in b/testsuite/slurm_unit/api/manual/Makefile.in
index f139adce883859e450770581c94bc99c3d6f9abc..2be1980a6912e0efa6fd9a22b892a8e118889171 100644
--- a/testsuite/slurm_unit/api/manual/Makefile.in
+++ b/testsuite/slurm_unit/api/manual/Makefile.in
@@ -49,6 +49,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/testsuite/slurm_unit/common/Makefile.in b/testsuite/slurm_unit/common/Makefile.in
index 0f198b2ce1e6f9f6504bf29c5a59ffce260dffd8..9f07c9345d4c5355169e3bc28378ecf92ca5eac1 100644
--- a/testsuite/slurm_unit/common/Makefile.in
+++ b/testsuite/slurm_unit/common/Makefile.in
@@ -47,6 +47,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/testsuite/slurm_unit/slurmctld/Makefile.in b/testsuite/slurm_unit/slurmctld/Makefile.in
index 841b6b5bb6295bb8dab60857e9113269f512a59c..cf7cf8d11c863f87dd8db2952ccb322a259be2ab 100644
--- a/testsuite/slurm_unit/slurmctld/Makefile.in
+++ b/testsuite/slurm_unit/slurmctld/Makefile.in
@@ -47,6 +47,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/testsuite/slurm_unit/slurmd/Makefile.in b/testsuite/slurm_unit/slurmd/Makefile.in
index e2b8c8bb6b460012bc3c9ed9f8760cef93f1a4f5..81f64a103412a40bc796c8d2f2b2dcdfa1294e9b 100644
--- a/testsuite/slurm_unit/slurmd/Makefile.in
+++ b/testsuite/slurm_unit/slurmd/Makefile.in
@@ -47,6 +47,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \
diff --git a/testsuite/slurm_unit/slurmdbd/Makefile.in b/testsuite/slurm_unit/slurmdbd/Makefile.in
index 6332d2a1052a8131b3c45b3a78654b3752ba99c0..2505bae2b0866496de1a0ecd89c51acd620f2eb6 100644
--- a/testsuite/slurm_unit/slurmdbd/Makefile.in
+++ b/testsuite/slurm_unit/slurmdbd/Makefile.in
@@ -47,6 +47,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_databases.m4 \
$(top_srcdir)/auxdir/x_ac_debug.m4 \
$(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
$(top_srcdir)/auxdir/x_ac_federation.m4 \
$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
$(top_srcdir)/auxdir/x_ac_gtk.m4 \