From 15aaf7f948311fca62f6ac29543f3c774815b703 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@schedmd.com>
Date: Mon, 21 Nov 2011 13:01:20 -0800
Subject: [PATCH] BGQ - Added check for runjob libs to link to srun with.

---
 Makefile.in                                     |  1 +
 auxdir/Makefile.in                              |  1 +
 auxdir/x_ac_bluegene.m4                         | 16 +++++++++++++++-
 configure                                       | 17 ++++++++++++++++-
 contribs/Makefile.in                            |  1 +
 contribs/arrayrun/Makefile.in                   |  1 +
 contribs/cray/Makefile.in                       |  1 +
 contribs/lua/Makefile.in                        |  1 +
 contribs/pam/Makefile.in                        |  1 +
 contribs/perlapi/Makefile.in                    |  1 +
 contribs/perlapi/libslurm/Makefile.in           |  1 +
 contribs/perlapi/libslurmdb/Makefile.in         |  1 +
 contribs/phpext/Makefile.in                     |  1 +
 contribs/sjobexit/Makefile.in                   |  1 +
 contribs/slurmdb-direct/Makefile.in             |  1 +
 contribs/torque/Makefile.in                     |  1 +
 doc/Makefile.in                                 |  1 +
 doc/html/Makefile.in                            |  1 +
 doc/man/Makefile.in                             |  1 +
 src/Makefile.in                                 |  1 +
 src/api/Makefile.in                             |  1 +
 src/common/Makefile.in                          |  1 +
 src/database/Makefile.in                        |  1 +
 src/db_api/Makefile.in                          |  1 +
 src/plugins/Makefile.in                         |  1 +
 src/plugins/accounting_storage/Makefile.in      |  1 +
 .../accounting_storage/common/Makefile.in       |  1 +
 .../accounting_storage/filetxt/Makefile.in      |  1 +
 .../accounting_storage/mysql/Makefile.in        |  1 +
 src/plugins/accounting_storage/none/Makefile.in |  1 +
 .../accounting_storage/pgsql/Makefile.in        |  1 +
 .../accounting_storage/slurmdbd/Makefile.in     |  1 +
 src/plugins/auth/Makefile.in                    |  1 +
 src/plugins/auth/authd/Makefile.in              |  1 +
 src/plugins/auth/munge/Makefile.in              |  1 +
 src/plugins/auth/none/Makefile.in               |  1 +
 src/plugins/checkpoint/Makefile.in              |  1 +
 src/plugins/checkpoint/aix/Makefile.in          |  1 +
 src/plugins/checkpoint/blcr/Makefile.in         |  1 +
 src/plugins/checkpoint/none/Makefile.in         |  1 +
 src/plugins/checkpoint/ompi/Makefile.in         |  1 +
 src/plugins/crypto/Makefile.in                  |  1 +
 src/plugins/crypto/munge/Makefile.in            |  1 +
 src/plugins/crypto/openssl/Makefile.in          |  1 +
 src/plugins/gres/Makefile.in                    |  1 +
 src/plugins/gres/gpu/Makefile.in                |  1 +
 src/plugins/gres/nic/Makefile.in                |  1 +
 src/plugins/job_submit/Makefile.in              |  1 +
 src/plugins/job_submit/cnode/Makefile.in        |  1 +
 src/plugins/job_submit/defaults/Makefile.in     |  1 +
 src/plugins/job_submit/logging/Makefile.in      |  1 +
 src/plugins/job_submit/lua/Makefile.in          |  1 +
 src/plugins/job_submit/partition/Makefile.in    |  1 +
 src/plugins/jobacct_gather/Makefile.in          |  1 +
 src/plugins/jobacct_gather/aix/Makefile.in      |  1 +
 src/plugins/jobacct_gather/linux/Makefile.in    |  1 +
 src/plugins/jobacct_gather/none/Makefile.in     |  1 +
 src/plugins/jobcomp/Makefile.in                 |  1 +
 src/plugins/jobcomp/filetxt/Makefile.in         |  1 +
 src/plugins/jobcomp/mysql/Makefile.in           |  1 +
 src/plugins/jobcomp/none/Makefile.in            |  1 +
 src/plugins/jobcomp/pgsql/Makefile.in           |  1 +
 src/plugins/jobcomp/script/Makefile.in          |  1 +
 src/plugins/mpi/Makefile.in                     |  1 +
 src/plugins/mpi/lam/Makefile.in                 |  1 +
 src/plugins/mpi/mpich1_p4/Makefile.in           |  1 +
 src/plugins/mpi/mpich1_shmem/Makefile.in        |  1 +
 src/plugins/mpi/mpichgm/Makefile.in             |  1 +
 src/plugins/mpi/mpichmx/Makefile.in             |  1 +
 src/plugins/mpi/mvapich/Makefile.in             |  1 +
 src/plugins/mpi/none/Makefile.in                |  1 +
 src/plugins/mpi/openmpi/Makefile.in             |  1 +
 src/plugins/preempt/Makefile.in                 |  1 +
 src/plugins/preempt/none/Makefile.in            |  1 +
 src/plugins/preempt/partition_prio/Makefile.in  |  1 +
 src/plugins/preempt/qos/Makefile.in             |  1 +
 src/plugins/priority/Makefile.in                |  1 +
 src/plugins/priority/basic/Makefile.in          |  1 +
 src/plugins/priority/multifactor/Makefile.in    |  1 +
 src/plugins/proctrack/Makefile.in               |  1 +
 src/plugins/proctrack/aix/Makefile.in           |  1 +
 src/plugins/proctrack/cgroup/Makefile.in        |  1 +
 src/plugins/proctrack/linuxproc/Makefile.in     |  1 +
 src/plugins/proctrack/lua/Makefile.in           |  1 +
 src/plugins/proctrack/pgid/Makefile.in          |  1 +
 src/plugins/proctrack/rms/Makefile.in           |  1 +
 src/plugins/proctrack/sgi_job/Makefile.in       |  1 +
 src/plugins/sched/Makefile.in                   |  1 +
 src/plugins/sched/backfill/Makefile.in          |  1 +
 src/plugins/sched/builtin/Makefile.in           |  1 +
 src/plugins/sched/hold/Makefile.in              |  1 +
 src/plugins/sched/wiki/Makefile.in              |  1 +
 src/plugins/sched/wiki2/Makefile.in             |  1 +
 src/plugins/select/Makefile.in                  |  1 +
 src/plugins/select/bluegene/Makefile.in         |  1 +
 src/plugins/select/bluegene/ba/Makefile.in      |  1 +
 src/plugins/select/bluegene/ba_bgq/Makefile.in  |  1 +
 src/plugins/select/bluegene/bl/Makefile.in      |  1 +
 src/plugins/select/bluegene/bl_bgq/Makefile.in  |  1 +
 src/plugins/select/bluegene/sfree/Makefile.in   |  1 +
 src/plugins/select/cons_res/Makefile.in         |  1 +
 src/plugins/select/cray/Makefile.in             |  1 +
 src/plugins/select/cray/libalps/Makefile.in     |  1 +
 src/plugins/select/cray/libemulate/Makefile.in  |  1 +
 src/plugins/select/linear/Makefile.in           |  1 +
 src/plugins/switch/Makefile.in                  |  1 +
 src/plugins/switch/elan/Makefile.in             |  1 +
 src/plugins/switch/federation/Makefile.in       |  1 +
 src/plugins/switch/none/Makefile.in             |  1 +
 src/plugins/task/Makefile.in                    |  1 +
 src/plugins/task/affinity/Makefile.in           |  1 +
 src/plugins/task/cgroup/Makefile.in             |  1 +
 src/plugins/task/none/Makefile.in               |  1 +
 src/plugins/topology/3d_torus/Makefile.in       |  1 +
 src/plugins/topology/Makefile.in                |  1 +
 src/plugins/topology/node_rank/Makefile.in      |  1 +
 src/plugins/topology/none/Makefile.in           |  1 +
 src/plugins/topology/tree/Makefile.in           |  1 +
 src/sacct/Makefile.in                           |  1 +
 src/sacctmgr/Makefile.in                        |  1 +
 src/salloc/Makefile.in                          |  1 +
 src/sattach/Makefile.in                         |  1 +
 src/sbatch/Makefile.in                          |  1 +
 src/sbcast/Makefile.in                          |  1 +
 src/scancel/Makefile.in                         |  1 +
 src/scontrol/Makefile.in                        |  1 +
 src/sinfo/Makefile.in                           |  1 +
 src/slurmctld/Makefile.in                       |  1 +
 src/slurmd/Makefile.in                          |  1 +
 src/slurmd/common/Makefile.in                   |  1 +
 src/slurmd/slurmd/Makefile.in                   |  1 +
 src/slurmd/slurmstepd/Makefile.in               |  1 +
 src/slurmdbd/Makefile.in                        |  1 +
 src/smap/Makefile.in                            |  1 +
 src/sprio/Makefile.in                           |  1 +
 src/squeue/Makefile.in                          |  1 +
 src/sreport/Makefile.in                         |  1 +
 src/srun/Makefile.in                            |  1 +
 src/srun_cr/Makefile.in                         |  1 +
 src/sshare/Makefile.in                          |  1 +
 src/sstat/Makefile.in                           |  1 +
 src/strigger/Makefile.in                        |  1 +
 src/sview/Makefile.in                           |  1 +
 testsuite/Makefile.in                           |  1 +
 testsuite/expect/Makefile.in                    |  1 +
 testsuite/slurm_unit/Makefile.in                |  1 +
 testsuite/slurm_unit/api/Makefile.in            |  1 +
 testsuite/slurm_unit/api/manual/Makefile.in     |  1 +
 testsuite/slurm_unit/common/Makefile.in         |  1 +
 149 files changed, 178 insertions(+), 2 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index be96a1ccad8..a9412ddea1f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -282,6 +282,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/auxdir/Makefile.in b/auxdir/Makefile.in
index f6d6d6100d0..1b86a66deda 100644
--- a/auxdir/Makefile.in
+++ b/auxdir/Makefile.in
@@ -196,6 +196,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/auxdir/x_ac_bluegene.m4 b/auxdir/x_ac_bluegene.m4
index 717ef144487..8681e237803 100644
--- a/auxdir/x_ac_bluegene.m4
+++ b/auxdir/x_ac_bluegene.m4
@@ -231,6 +231,7 @@ AC_DEFUN([X_AC_BGQ],
 
 	libname=bgsched
 	loglibname=log4cxx
+	runjoblibname=runjob_client
 
    	for bg_dir in $trydb2dir "" $bg_default_dirs; do
       	# Skip directories that don't exist
@@ -259,7 +260,18 @@ AC_DEFUN([X_AC_BGQ],
 			fi
 		fi
 
-      		# Search for headers in the directory
+		soloc=$bg_dir/hlcs/lib/lib$runjoblibname.so
+		# Search for required BG API libraries in the directory
+		if test -z "$have_bg_ar" -a -f "$soloc" ; then
+			have_bgq_ar=yes
+			if test "$ac_with_rpath" = "yes"; then
+				runjob_ldflags="$runjob_ldflags -Wl,-rpath -Wl,$bg_dir/hlcs/lib -L$bg_dir/hlcs/lib -l$runjoblibname"
+			else
+				runjob_ldflags="$runjob_ldflags -L$bg_dir/hlcs/lib -l$runjoblibname"
+			fi
+		fi
+
+		# Search for headers in the directory
       		if test -z "$have_bg_hdr" -a -f "$bg_dir/hlcs/include/bgsched/bgsched.h" ; then
 			have_bgq_hdr=yes
 			bg_includes="-I$bg_dir/hlcs/include"
@@ -289,6 +301,7 @@ AC_DEFUN([X_AC_BGQ],
 
   	if test ! -z "$have_bgq_files" ; then
       		BG_LDFLAGS="$bg_ldflags"
+		RUNJOB_LDFLAGS="$runjob_ldflags"
       		BG_INCLUDES="$bg_includes"
 		CFLAGS="$CFLAGS -m64"
    		CXXFLAGS="$CXXFLAGS $CFLAGS"
@@ -314,4 +327,5 @@ AC_DEFUN([X_AC_BGQ],
 
    	AC_SUBST(BG_INCLUDES)
    	AC_SUBST(BG_LDFLAGS)
+	AC_SUBST(RUNJOB_LDFLAGS)
 ])
diff --git a/configure b/configure
index b45b1e62bdd..4fe60d42b19 100755
--- a/configure
+++ b/configure
@@ -755,6 +755,7 @@ BLUEGENE_LOADED_TRUE
 BGQ_LOADED
 BGQ_LOADED_FALSE
 BGQ_LOADED_TRUE
+RUNJOB_LDFLAGS
 BG_LDFLAGS
 am__fastdepCXX_FALSE
 am__fastdepCXX_TRUE
@@ -5175,6 +5176,7 @@ $as_echo "$as_me: Running in BG/Q emulation mode" >&6;}
 
 	libname=bgsched
 	loglibname=log4cxx
+	runjoblibname=runjob_client
 
    	for bg_dir in $trydb2dir "" $bg_default_dirs; do
       	# Skip directories that don't exist
@@ -5203,7 +5205,18 @@ $as_echo "$as_me: Running in BG/Q emulation mode" >&6;}
 			fi
 		fi
 
-      		# Search for headers in the directory
+		soloc=$bg_dir/hlcs/lib/lib$runjoblibname.so
+		# Search for required BG API libraries in the directory
+		if test -z "$have_bg_ar" -a -f "$soloc" ; then
+			have_bgq_ar=yes
+			if test "$ac_with_rpath" = "yes"; then
+				runjob_ldflags="$runjob_ldflags -Wl,-rpath -Wl,$bg_dir/hlcs/lib -L$bg_dir/hlcs/lib -l$runjoblibname"
+			else
+				runjob_ldflags="$runjob_ldflags -L$bg_dir/hlcs/lib -l$runjoblibname"
+			fi
+		fi
+
+		# Search for headers in the directory
       		if test -z "$have_bg_hdr" -a -f "$bg_dir/hlcs/include/bgsched/bgsched.h" ; then
 			have_bgq_hdr=yes
 			bg_includes="-I$bg_dir/hlcs/include"
@@ -5256,6 +5269,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
   	if test ! -z "$have_bgq_files" ; then
       		BG_LDFLAGS="$bg_ldflags"
+		RUNJOB_LDFLAGS="$runjob_ldflags"
       		BG_INCLUDES="$bg_includes"
 		CFLAGS="$CFLAGS -m64"
    		CXXFLAGS="$CXXFLAGS $CFLAGS"
@@ -5296,6 +5310,7 @@ $as_echo "$as_me: Running on a legitimate BG/Q system" >&6;}
 
 
 
+
  if test "x$ac_bgq_loaded" = "xyes"; then
   BGQ_LOADED_TRUE=
   BGQ_LOADED_FALSE='#'
diff --git a/contribs/Makefile.in b/contribs/Makefile.in
index f46c2bfd30f..5b38c95ab4c 100644
--- a/contribs/Makefile.in
+++ b/contribs/Makefile.in
@@ -235,6 +235,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/contribs/arrayrun/Makefile.in b/contribs/arrayrun/Makefile.in
index e73dd74807a..08a54351c05 100644
--- a/contribs/arrayrun/Makefile.in
+++ b/contribs/arrayrun/Makefile.in
@@ -195,6 +195,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/contribs/cray/Makefile.in b/contribs/cray/Makefile.in
index f3f02e0fc94..3502d172894 100644
--- a/contribs/cray/Makefile.in
+++ b/contribs/cray/Makefile.in
@@ -223,6 +223,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/contribs/lua/Makefile.in b/contribs/lua/Makefile.in
index 66100363377..0b719898b1c 100644
--- a/contribs/lua/Makefile.in
+++ b/contribs/lua/Makefile.in
@@ -195,6 +195,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/contribs/pam/Makefile.in b/contribs/pam/Makefile.in
index 665666fe380..90a77b6cabd 100644
--- a/contribs/pam/Makefile.in
+++ b/contribs/pam/Makefile.in
@@ -249,6 +249,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/contribs/perlapi/Makefile.in b/contribs/perlapi/Makefile.in
index ac33e15be87..ec7776a8270 100644
--- a/contribs/perlapi/Makefile.in
+++ b/contribs/perlapi/Makefile.in
@@ -235,6 +235,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/contribs/perlapi/libslurm/Makefile.in b/contribs/perlapi/libslurm/Makefile.in
index 67011c4356a..2239325ffc3 100644
--- a/contribs/perlapi/libslurm/Makefile.in
+++ b/contribs/perlapi/libslurm/Makefile.in
@@ -195,6 +195,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/contribs/perlapi/libslurmdb/Makefile.in b/contribs/perlapi/libslurmdb/Makefile.in
index 38c785b3eb3..403f910a6ba 100644
--- a/contribs/perlapi/libslurmdb/Makefile.in
+++ b/contribs/perlapi/libslurmdb/Makefile.in
@@ -195,6 +195,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/contribs/phpext/Makefile.in b/contribs/phpext/Makefile.in
index 91de1fb2550..e3e975f4f3b 100644
--- a/contribs/phpext/Makefile.in
+++ b/contribs/phpext/Makefile.in
@@ -195,6 +195,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/contribs/sjobexit/Makefile.in b/contribs/sjobexit/Makefile.in
index 17ac2c2d04d..a024440c024 100644
--- a/contribs/sjobexit/Makefile.in
+++ b/contribs/sjobexit/Makefile.in
@@ -222,6 +222,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/contribs/slurmdb-direct/Makefile.in b/contribs/slurmdb-direct/Makefile.in
index 32c747172a3..d5ad51d086d 100644
--- a/contribs/slurmdb-direct/Makefile.in
+++ b/contribs/slurmdb-direct/Makefile.in
@@ -222,6 +222,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/contribs/torque/Makefile.in b/contribs/torque/Makefile.in
index 7b1a2832aaf..980f66f4668 100644
--- a/contribs/torque/Makefile.in
+++ b/contribs/torque/Makefile.in
@@ -222,6 +222,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 060f166b816..db6ac8a70dd 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -235,6 +235,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/doc/html/Makefile.in b/doc/html/Makefile.in
index 0429a2d27db..26cd0c710b1 100644
--- a/doc/html/Makefile.in
+++ b/doc/html/Makefile.in
@@ -220,6 +220,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/doc/man/Makefile.in b/doc/man/Makefile.in
index 465c9eb4ab1..35357e913ae 100644
--- a/doc/man/Makefile.in
+++ b/doc/man/Makefile.in
@@ -224,6 +224,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/Makefile.in b/src/Makefile.in
index 16b59408ca3..9bcfdd1b608 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -240,6 +240,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/api/Makefile.in b/src/api/Makefile.in
index 7e608870679..31e349854cb 100644
--- a/src/api/Makefile.in
+++ b/src/api/Makefile.in
@@ -272,6 +272,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/common/Makefile.in b/src/common/Makefile.in
index 78a1a3094df..c218bc42bd8 100644
--- a/src/common/Makefile.in
+++ b/src/common/Makefile.in
@@ -317,6 +317,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/database/Makefile.in b/src/database/Makefile.in
index b73ef7b2d86..a7b0ed74564 100644
--- a/src/database/Makefile.in
+++ b/src/database/Makefile.in
@@ -247,6 +247,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/db_api/Makefile.in b/src/db_api/Makefile.in
index f9f7fd225eb..99baaf32c57 100644
--- a/src/db_api/Makefile.in
+++ b/src/db_api/Makefile.in
@@ -257,6 +257,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/Makefile.in b/src/plugins/Makefile.in
index 83341e58355..01ead5be7d5 100644
--- a/src/plugins/Makefile.in
+++ b/src/plugins/Makefile.in
@@ -235,6 +235,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/accounting_storage/Makefile.in b/src/plugins/accounting_storage/Makefile.in
index 4fd5c5e0dad..2dbd8bc768e 100644
--- a/src/plugins/accounting_storage/Makefile.in
+++ b/src/plugins/accounting_storage/Makefile.in
@@ -237,6 +237,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/accounting_storage/common/Makefile.in b/src/plugins/accounting_storage/common/Makefile.in
index 2566b072438..290635613bc 100644
--- a/src/plugins/accounting_storage/common/Makefile.in
+++ b/src/plugins/accounting_storage/common/Makefile.in
@@ -218,6 +218,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/accounting_storage/filetxt/Makefile.in b/src/plugins/accounting_storage/filetxt/Makefile.in
index fc811837646..48f519387b8 100644
--- a/src/plugins/accounting_storage/filetxt/Makefile.in
+++ b/src/plugins/accounting_storage/filetxt/Makefile.in
@@ -245,6 +245,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/accounting_storage/mysql/Makefile.in b/src/plugins/accounting_storage/mysql/Makefile.in
index 4038c393c03..7e207af8634 100644
--- a/src/plugins/accounting_storage/mysql/Makefile.in
+++ b/src/plugins/accounting_storage/mysql/Makefile.in
@@ -295,6 +295,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/accounting_storage/none/Makefile.in b/src/plugins/accounting_storage/none/Makefile.in
index 782103dfcfd..ac4800deddf 100644
--- a/src/plugins/accounting_storage/none/Makefile.in
+++ b/src/plugins/accounting_storage/none/Makefile.in
@@ -244,6 +244,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/accounting_storage/pgsql/Makefile.in b/src/plugins/accounting_storage/pgsql/Makefile.in
index 963530c38a1..09741209c0f 100644
--- a/src/plugins/accounting_storage/pgsql/Makefile.in
+++ b/src/plugins/accounting_storage/pgsql/Makefile.in
@@ -290,6 +290,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/accounting_storage/slurmdbd/Makefile.in b/src/plugins/accounting_storage/slurmdbd/Makefile.in
index b3285d77df1..b79365de209 100644
--- a/src/plugins/accounting_storage/slurmdbd/Makefile.in
+++ b/src/plugins/accounting_storage/slurmdbd/Makefile.in
@@ -245,6 +245,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/auth/Makefile.in b/src/plugins/auth/Makefile.in
index f816b901347..0e1debd6865 100644
--- a/src/plugins/auth/Makefile.in
+++ b/src/plugins/auth/Makefile.in
@@ -237,6 +237,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/auth/authd/Makefile.in b/src/plugins/auth/authd/Makefile.in
index 78838e616b1..b62120f137e 100644
--- a/src/plugins/auth/authd/Makefile.in
+++ b/src/plugins/auth/authd/Makefile.in
@@ -243,6 +243,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/auth/munge/Makefile.in b/src/plugins/auth/munge/Makefile.in
index fde4fd5d3a4..6a0d3b80742 100644
--- a/src/plugins/auth/munge/Makefile.in
+++ b/src/plugins/auth/munge/Makefile.in
@@ -244,6 +244,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/auth/none/Makefile.in b/src/plugins/auth/none/Makefile.in
index a6cb33cb064..2e1e82607ca 100644
--- a/src/plugins/auth/none/Makefile.in
+++ b/src/plugins/auth/none/Makefile.in
@@ -242,6 +242,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/checkpoint/Makefile.in b/src/plugins/checkpoint/Makefile.in
index 228eb74e9bd..632b95be17f 100644
--- a/src/plugins/checkpoint/Makefile.in
+++ b/src/plugins/checkpoint/Makefile.in
@@ -237,6 +237,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/checkpoint/aix/Makefile.in b/src/plugins/checkpoint/aix/Makefile.in
index 56bca458414..ef02494db84 100644
--- a/src/plugins/checkpoint/aix/Makefile.in
+++ b/src/plugins/checkpoint/aix/Makefile.in
@@ -247,6 +247,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/checkpoint/blcr/Makefile.in b/src/plugins/checkpoint/blcr/Makefile.in
index 7249a2d5f60..8eb94cd11b5 100644
--- a/src/plugins/checkpoint/blcr/Makefile.in
+++ b/src/plugins/checkpoint/blcr/Makefile.in
@@ -253,6 +253,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/checkpoint/none/Makefile.in b/src/plugins/checkpoint/none/Makefile.in
index 92272092611..ffb5826dd82 100644
--- a/src/plugins/checkpoint/none/Makefile.in
+++ b/src/plugins/checkpoint/none/Makefile.in
@@ -242,6 +242,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/checkpoint/ompi/Makefile.in b/src/plugins/checkpoint/ompi/Makefile.in
index 59f991c2179..b725e69146b 100644
--- a/src/plugins/checkpoint/ompi/Makefile.in
+++ b/src/plugins/checkpoint/ompi/Makefile.in
@@ -242,6 +242,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/crypto/Makefile.in b/src/plugins/crypto/Makefile.in
index 89740225dce..248b7a49b70 100644
--- a/src/plugins/crypto/Makefile.in
+++ b/src/plugins/crypto/Makefile.in
@@ -237,6 +237,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/crypto/munge/Makefile.in b/src/plugins/crypto/munge/Makefile.in
index 0776316d7b6..930d4d0458f 100644
--- a/src/plugins/crypto/munge/Makefile.in
+++ b/src/plugins/crypto/munge/Makefile.in
@@ -244,6 +244,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/crypto/openssl/Makefile.in b/src/plugins/crypto/openssl/Makefile.in
index 6fd8389324a..b90ef8c8dc6 100644
--- a/src/plugins/crypto/openssl/Makefile.in
+++ b/src/plugins/crypto/openssl/Makefile.in
@@ -249,6 +249,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/gres/Makefile.in b/src/plugins/gres/Makefile.in
index c845bb8a260..3f2388b54d2 100644
--- a/src/plugins/gres/Makefile.in
+++ b/src/plugins/gres/Makefile.in
@@ -237,6 +237,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/gres/gpu/Makefile.in b/src/plugins/gres/gpu/Makefile.in
index 9e1d2597f0c..ff3d8bba446 100644
--- a/src/plugins/gres/gpu/Makefile.in
+++ b/src/plugins/gres/gpu/Makefile.in
@@ -243,6 +243,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/gres/nic/Makefile.in b/src/plugins/gres/nic/Makefile.in
index 9940a339a9e..f26fdad4655 100644
--- a/src/plugins/gres/nic/Makefile.in
+++ b/src/plugins/gres/nic/Makefile.in
@@ -243,6 +243,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/job_submit/Makefile.in b/src/plugins/job_submit/Makefile.in
index 56fe33a051c..a2788cf739b 100644
--- a/src/plugins/job_submit/Makefile.in
+++ b/src/plugins/job_submit/Makefile.in
@@ -237,6 +237,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/job_submit/cnode/Makefile.in b/src/plugins/job_submit/cnode/Makefile.in
index 2e8b34e6143..53f06f749fb 100644
--- a/src/plugins/job_submit/cnode/Makefile.in
+++ b/src/plugins/job_submit/cnode/Makefile.in
@@ -242,6 +242,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/job_submit/defaults/Makefile.in b/src/plugins/job_submit/defaults/Makefile.in
index e181e4b9361..5b66492c4a9 100644
--- a/src/plugins/job_submit/defaults/Makefile.in
+++ b/src/plugins/job_submit/defaults/Makefile.in
@@ -242,6 +242,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/job_submit/logging/Makefile.in b/src/plugins/job_submit/logging/Makefile.in
index c186f12ad0e..4ac50e2df88 100644
--- a/src/plugins/job_submit/logging/Makefile.in
+++ b/src/plugins/job_submit/logging/Makefile.in
@@ -242,6 +242,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/job_submit/lua/Makefile.in b/src/plugins/job_submit/lua/Makefile.in
index 539e3e9cdba..da698ce17f1 100644
--- a/src/plugins/job_submit/lua/Makefile.in
+++ b/src/plugins/job_submit/lua/Makefile.in
@@ -242,6 +242,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/job_submit/partition/Makefile.in b/src/plugins/job_submit/partition/Makefile.in
index 6ad9a4814d1..725fb995ed4 100644
--- a/src/plugins/job_submit/partition/Makefile.in
+++ b/src/plugins/job_submit/partition/Makefile.in
@@ -243,6 +243,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/jobacct_gather/Makefile.in b/src/plugins/jobacct_gather/Makefile.in
index 6d9d1154f92..9c59f0986c0 100644
--- a/src/plugins/jobacct_gather/Makefile.in
+++ b/src/plugins/jobacct_gather/Makefile.in
@@ -237,6 +237,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/jobacct_gather/aix/Makefile.in b/src/plugins/jobacct_gather/aix/Makefile.in
index 4411f8fd540..e9b7ea8db6d 100644
--- a/src/plugins/jobacct_gather/aix/Makefile.in
+++ b/src/plugins/jobacct_gather/aix/Makefile.in
@@ -242,6 +242,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/jobacct_gather/linux/Makefile.in b/src/plugins/jobacct_gather/linux/Makefile.in
index e596d596d7c..2f871040247 100644
--- a/src/plugins/jobacct_gather/linux/Makefile.in
+++ b/src/plugins/jobacct_gather/linux/Makefile.in
@@ -243,6 +243,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/jobacct_gather/none/Makefile.in b/src/plugins/jobacct_gather/none/Makefile.in
index cf302f8682d..7718913d307 100644
--- a/src/plugins/jobacct_gather/none/Makefile.in
+++ b/src/plugins/jobacct_gather/none/Makefile.in
@@ -242,6 +242,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/jobcomp/Makefile.in b/src/plugins/jobcomp/Makefile.in
index 7b84b982d60..7f0f709362b 100644
--- a/src/plugins/jobcomp/Makefile.in
+++ b/src/plugins/jobcomp/Makefile.in
@@ -237,6 +237,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/jobcomp/filetxt/Makefile.in b/src/plugins/jobcomp/filetxt/Makefile.in
index 626f4f0a52c..494fb0219bd 100644
--- a/src/plugins/jobcomp/filetxt/Makefile.in
+++ b/src/plugins/jobcomp/filetxt/Makefile.in
@@ -243,6 +243,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/jobcomp/mysql/Makefile.in b/src/plugins/jobcomp/mysql/Makefile.in
index 35c6a9d2755..e37f8215efa 100644
--- a/src/plugins/jobcomp/mysql/Makefile.in
+++ b/src/plugins/jobcomp/mysql/Makefile.in
@@ -251,6 +251,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/jobcomp/none/Makefile.in b/src/plugins/jobcomp/none/Makefile.in
index da9fbe3ef4e..15edf151c37 100644
--- a/src/plugins/jobcomp/none/Makefile.in
+++ b/src/plugins/jobcomp/none/Makefile.in
@@ -242,6 +242,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/jobcomp/pgsql/Makefile.in b/src/plugins/jobcomp/pgsql/Makefile.in
index 35a25745c0d..f7339818f4e 100644
--- a/src/plugins/jobcomp/pgsql/Makefile.in
+++ b/src/plugins/jobcomp/pgsql/Makefile.in
@@ -251,6 +251,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/jobcomp/script/Makefile.in b/src/plugins/jobcomp/script/Makefile.in
index 290f5667696..506f21b85ec 100644
--- a/src/plugins/jobcomp/script/Makefile.in
+++ b/src/plugins/jobcomp/script/Makefile.in
@@ -242,6 +242,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/mpi/Makefile.in b/src/plugins/mpi/Makefile.in
index c8b04c8efbf..585512e95cd 100644
--- a/src/plugins/mpi/Makefile.in
+++ b/src/plugins/mpi/Makefile.in
@@ -237,6 +237,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/mpi/lam/Makefile.in b/src/plugins/mpi/lam/Makefile.in
index 6e9aadb1c62..7b0b37fc6df 100644
--- a/src/plugins/mpi/lam/Makefile.in
+++ b/src/plugins/mpi/lam/Makefile.in
@@ -242,6 +242,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/mpi/mpich1_p4/Makefile.in b/src/plugins/mpi/mpich1_p4/Makefile.in
index 67fcf6798b3..4a3cf375165 100644
--- a/src/plugins/mpi/mpich1_p4/Makefile.in
+++ b/src/plugins/mpi/mpich1_p4/Makefile.in
@@ -242,6 +242,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/mpi/mpich1_shmem/Makefile.in b/src/plugins/mpi/mpich1_shmem/Makefile.in
index a0d751376d6..db4211ef1dd 100644
--- a/src/plugins/mpi/mpich1_shmem/Makefile.in
+++ b/src/plugins/mpi/mpich1_shmem/Makefile.in
@@ -242,6 +242,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/mpi/mpichgm/Makefile.in b/src/plugins/mpi/mpichgm/Makefile.in
index 4805cfaa7c8..2b154466cdd 100644
--- a/src/plugins/mpi/mpichgm/Makefile.in
+++ b/src/plugins/mpi/mpichgm/Makefile.in
@@ -242,6 +242,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/mpi/mpichmx/Makefile.in b/src/plugins/mpi/mpichmx/Makefile.in
index 8d0ce323974..34726bc1c6e 100644
--- a/src/plugins/mpi/mpichmx/Makefile.in
+++ b/src/plugins/mpi/mpichmx/Makefile.in
@@ -242,6 +242,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/mpi/mvapich/Makefile.in b/src/plugins/mpi/mvapich/Makefile.in
index f09e9f77e26..a00190387af 100644
--- a/src/plugins/mpi/mvapich/Makefile.in
+++ b/src/plugins/mpi/mvapich/Makefile.in
@@ -242,6 +242,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/mpi/none/Makefile.in b/src/plugins/mpi/none/Makefile.in
index 2dda94a0ee4..329507f8f13 100644
--- a/src/plugins/mpi/none/Makefile.in
+++ b/src/plugins/mpi/none/Makefile.in
@@ -242,6 +242,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/mpi/openmpi/Makefile.in b/src/plugins/mpi/openmpi/Makefile.in
index ec3ca5d5092..2f48aaa7b0d 100644
--- a/src/plugins/mpi/openmpi/Makefile.in
+++ b/src/plugins/mpi/openmpi/Makefile.in
@@ -242,6 +242,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/preempt/Makefile.in b/src/plugins/preempt/Makefile.in
index f3af94701b1..567674f5e05 100644
--- a/src/plugins/preempt/Makefile.in
+++ b/src/plugins/preempt/Makefile.in
@@ -237,6 +237,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/preempt/none/Makefile.in b/src/plugins/preempt/none/Makefile.in
index de6cd8a6747..c0b5f10473f 100644
--- a/src/plugins/preempt/none/Makefile.in
+++ b/src/plugins/preempt/none/Makefile.in
@@ -242,6 +242,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/preempt/partition_prio/Makefile.in b/src/plugins/preempt/partition_prio/Makefile.in
index 4907ed0c504..d416ef0f40e 100644
--- a/src/plugins/preempt/partition_prio/Makefile.in
+++ b/src/plugins/preempt/partition_prio/Makefile.in
@@ -244,6 +244,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/preempt/qos/Makefile.in b/src/plugins/preempt/qos/Makefile.in
index e55668046db..bcc13036bdb 100644
--- a/src/plugins/preempt/qos/Makefile.in
+++ b/src/plugins/preempt/qos/Makefile.in
@@ -242,6 +242,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/priority/Makefile.in b/src/plugins/priority/Makefile.in
index 17e1f56774e..57e51c83de4 100644
--- a/src/plugins/priority/Makefile.in
+++ b/src/plugins/priority/Makefile.in
@@ -235,6 +235,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/priority/basic/Makefile.in b/src/plugins/priority/basic/Makefile.in
index ceba8a93381..3118180c3c3 100644
--- a/src/plugins/priority/basic/Makefile.in
+++ b/src/plugins/priority/basic/Makefile.in
@@ -242,6 +242,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/priority/multifactor/Makefile.in b/src/plugins/priority/multifactor/Makefile.in
index c1cfce443c6..d6be58f2c22 100644
--- a/src/plugins/priority/multifactor/Makefile.in
+++ b/src/plugins/priority/multifactor/Makefile.in
@@ -243,6 +243,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/proctrack/Makefile.in b/src/plugins/proctrack/Makefile.in
index 6e5e269e991..4a44c614573 100644
--- a/src/plugins/proctrack/Makefile.in
+++ b/src/plugins/proctrack/Makefile.in
@@ -237,6 +237,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/proctrack/aix/Makefile.in b/src/plugins/proctrack/aix/Makefile.in
index 5e156ae89c3..86413e9f84e 100644
--- a/src/plugins/proctrack/aix/Makefile.in
+++ b/src/plugins/proctrack/aix/Makefile.in
@@ -242,6 +242,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/proctrack/cgroup/Makefile.in b/src/plugins/proctrack/cgroup/Makefile.in
index a6e1e49899e..963d63d89b5 100644
--- a/src/plugins/proctrack/cgroup/Makefile.in
+++ b/src/plugins/proctrack/cgroup/Makefile.in
@@ -242,6 +242,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/proctrack/linuxproc/Makefile.in b/src/plugins/proctrack/linuxproc/Makefile.in
index 42bec10ae2f..5b7d8e45e9f 100644
--- a/src/plugins/proctrack/linuxproc/Makefile.in
+++ b/src/plugins/proctrack/linuxproc/Makefile.in
@@ -243,6 +243,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/proctrack/lua/Makefile.in b/src/plugins/proctrack/lua/Makefile.in
index 7b0002f7ed6..c4fbc34a06d 100644
--- a/src/plugins/proctrack/lua/Makefile.in
+++ b/src/plugins/proctrack/lua/Makefile.in
@@ -242,6 +242,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/proctrack/pgid/Makefile.in b/src/plugins/proctrack/pgid/Makefile.in
index 08dc0fd01c7..d2851f53dce 100644
--- a/src/plugins/proctrack/pgid/Makefile.in
+++ b/src/plugins/proctrack/pgid/Makefile.in
@@ -242,6 +242,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/proctrack/rms/Makefile.in b/src/plugins/proctrack/rms/Makefile.in
index 5be7836e6e2..bf279310148 100644
--- a/src/plugins/proctrack/rms/Makefile.in
+++ b/src/plugins/proctrack/rms/Makefile.in
@@ -243,6 +243,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/proctrack/sgi_job/Makefile.in b/src/plugins/proctrack/sgi_job/Makefile.in
index 2f2391261d6..d25a6e05ff7 100644
--- a/src/plugins/proctrack/sgi_job/Makefile.in
+++ b/src/plugins/proctrack/sgi_job/Makefile.in
@@ -242,6 +242,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/sched/Makefile.in b/src/plugins/sched/Makefile.in
index dc68c102ada..f2b3a72f768 100644
--- a/src/plugins/sched/Makefile.in
+++ b/src/plugins/sched/Makefile.in
@@ -237,6 +237,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/sched/backfill/Makefile.in b/src/plugins/sched/backfill/Makefile.in
index 06a625b9ba7..121aaf3d1a5 100644
--- a/src/plugins/sched/backfill/Makefile.in
+++ b/src/plugins/sched/backfill/Makefile.in
@@ -242,6 +242,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/sched/builtin/Makefile.in b/src/plugins/sched/builtin/Makefile.in
index bcc7365f106..fc02bba236f 100644
--- a/src/plugins/sched/builtin/Makefile.in
+++ b/src/plugins/sched/builtin/Makefile.in
@@ -242,6 +242,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/sched/hold/Makefile.in b/src/plugins/sched/hold/Makefile.in
index d3f2f67fca4..324905971d0 100644
--- a/src/plugins/sched/hold/Makefile.in
+++ b/src/plugins/sched/hold/Makefile.in
@@ -242,6 +242,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/sched/wiki/Makefile.in b/src/plugins/sched/wiki/Makefile.in
index c0199a623cc..60d91ffb015 100644
--- a/src/plugins/sched/wiki/Makefile.in
+++ b/src/plugins/sched/wiki/Makefile.in
@@ -244,6 +244,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/sched/wiki2/Makefile.in b/src/plugins/sched/wiki2/Makefile.in
index ad6ff79ebc5..f679ffb550b 100644
--- a/src/plugins/sched/wiki2/Makefile.in
+++ b/src/plugins/sched/wiki2/Makefile.in
@@ -247,6 +247,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/select/Makefile.in b/src/plugins/select/Makefile.in
index 2e31ca8d829..88b40a5301c 100644
--- a/src/plugins/select/Makefile.in
+++ b/src/plugins/select/Makefile.in
@@ -237,6 +237,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/select/bluegene/Makefile.in b/src/plugins/select/bluegene/Makefile.in
index 0abf14aa991..9afc6e40acb 100644
--- a/src/plugins/select/bluegene/Makefile.in
+++ b/src/plugins/select/bluegene/Makefile.in
@@ -404,6 +404,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/select/bluegene/ba/Makefile.in b/src/plugins/select/bluegene/ba/Makefile.in
index bfb8aa92097..aaabcb21d05 100644
--- a/src/plugins/select/bluegene/ba/Makefile.in
+++ b/src/plugins/select/bluegene/ba/Makefile.in
@@ -230,6 +230,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/select/bluegene/ba_bgq/Makefile.in b/src/plugins/select/bluegene/ba_bgq/Makefile.in
index 89bdc434dde..4781aba9efe 100644
--- a/src/plugins/select/bluegene/ba_bgq/Makefile.in
+++ b/src/plugins/select/bluegene/ba_bgq/Makefile.in
@@ -240,6 +240,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/select/bluegene/bl/Makefile.in b/src/plugins/select/bluegene/bl/Makefile.in
index 1812d4b385a..be1fd48a3f3 100644
--- a/src/plugins/select/bluegene/bl/Makefile.in
+++ b/src/plugins/select/bluegene/bl/Makefile.in
@@ -221,6 +221,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/select/bluegene/bl_bgq/Makefile.in b/src/plugins/select/bluegene/bl_bgq/Makefile.in
index bd37ed2aa9f..a2c355d90d7 100644
--- a/src/plugins/select/bluegene/bl_bgq/Makefile.in
+++ b/src/plugins/select/bluegene/bl_bgq/Makefile.in
@@ -230,6 +230,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/select/bluegene/sfree/Makefile.in b/src/plugins/select/bluegene/sfree/Makefile.in
index bd532f7de3d..b3d5579735d 100644
--- a/src/plugins/select/bluegene/sfree/Makefile.in
+++ b/src/plugins/select/bluegene/sfree/Makefile.in
@@ -222,6 +222,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/select/cons_res/Makefile.in b/src/plugins/select/cons_res/Makefile.in
index 8555d98820e..52f80fd9b95 100644
--- a/src/plugins/select/cons_res/Makefile.in
+++ b/src/plugins/select/cons_res/Makefile.in
@@ -243,6 +243,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/select/cray/Makefile.in b/src/plugins/select/cray/Makefile.in
index 42aefc0b3ff..1ae7405505d 100644
--- a/src/plugins/select/cray/Makefile.in
+++ b/src/plugins/select/cray/Makefile.in
@@ -289,6 +289,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/select/cray/libalps/Makefile.in b/src/plugins/select/cray/libalps/Makefile.in
index 90d561aa252..eec9ab41872 100644
--- a/src/plugins/select/cray/libalps/Makefile.in
+++ b/src/plugins/select/cray/libalps/Makefile.in
@@ -228,6 +228,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/select/cray/libemulate/Makefile.in b/src/plugins/select/cray/libemulate/Makefile.in
index 25b0d31c9ee..5dae4cc6cda 100644
--- a/src/plugins/select/cray/libemulate/Makefile.in
+++ b/src/plugins/select/cray/libemulate/Makefile.in
@@ -222,6 +222,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/select/linear/Makefile.in b/src/plugins/select/linear/Makefile.in
index 6547d5629e3..8effe85bbea 100644
--- a/src/plugins/select/linear/Makefile.in
+++ b/src/plugins/select/linear/Makefile.in
@@ -242,6 +242,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/switch/Makefile.in b/src/plugins/switch/Makefile.in
index 88b9cd3b001..48ea9f6cebb 100644
--- a/src/plugins/switch/Makefile.in
+++ b/src/plugins/switch/Makefile.in
@@ -237,6 +237,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/switch/elan/Makefile.in b/src/plugins/switch/elan/Makefile.in
index 948fcd83217..b773c85fb63 100644
--- a/src/plugins/switch/elan/Makefile.in
+++ b/src/plugins/switch/elan/Makefile.in
@@ -248,6 +248,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/switch/federation/Makefile.in b/src/plugins/switch/federation/Makefile.in
index 509d631ae45..62d34bd3c0e 100644
--- a/src/plugins/switch/federation/Makefile.in
+++ b/src/plugins/switch/federation/Makefile.in
@@ -251,6 +251,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/switch/none/Makefile.in b/src/plugins/switch/none/Makefile.in
index 2a1af9a549e..6dcb50d1acd 100644
--- a/src/plugins/switch/none/Makefile.in
+++ b/src/plugins/switch/none/Makefile.in
@@ -242,6 +242,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/task/Makefile.in b/src/plugins/task/Makefile.in
index 9a6d5d174b7..3eca05a5c09 100644
--- a/src/plugins/task/Makefile.in
+++ b/src/plugins/task/Makefile.in
@@ -237,6 +237,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/task/affinity/Makefile.in b/src/plugins/task/affinity/Makefile.in
index f66ab2a3b10..6c108b7542f 100644
--- a/src/plugins/task/affinity/Makefile.in
+++ b/src/plugins/task/affinity/Makefile.in
@@ -254,6 +254,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/task/cgroup/Makefile.in b/src/plugins/task/cgroup/Makefile.in
index e8a92b9d39d..772c54787c6 100644
--- a/src/plugins/task/cgroup/Makefile.in
+++ b/src/plugins/task/cgroup/Makefile.in
@@ -245,6 +245,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/task/none/Makefile.in b/src/plugins/task/none/Makefile.in
index 0cf750f3aa2..8969fc57cfd 100644
--- a/src/plugins/task/none/Makefile.in
+++ b/src/plugins/task/none/Makefile.in
@@ -242,6 +242,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/topology/3d_torus/Makefile.in b/src/plugins/topology/3d_torus/Makefile.in
index bc4e75b607d..03168d8c1fb 100644
--- a/src/plugins/topology/3d_torus/Makefile.in
+++ b/src/plugins/topology/3d_torus/Makefile.in
@@ -243,6 +243,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/topology/Makefile.in b/src/plugins/topology/Makefile.in
index 7a8420dc505..38cb018d8e4 100644
--- a/src/plugins/topology/Makefile.in
+++ b/src/plugins/topology/Makefile.in
@@ -237,6 +237,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/topology/node_rank/Makefile.in b/src/plugins/topology/node_rank/Makefile.in
index a956ca18b09..3b76b09d1ee 100644
--- a/src/plugins/topology/node_rank/Makefile.in
+++ b/src/plugins/topology/node_rank/Makefile.in
@@ -242,6 +242,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/topology/none/Makefile.in b/src/plugins/topology/none/Makefile.in
index 01cdafc8074..74351935c7a 100644
--- a/src/plugins/topology/none/Makefile.in
+++ b/src/plugins/topology/none/Makefile.in
@@ -242,6 +242,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/plugins/topology/tree/Makefile.in b/src/plugins/topology/tree/Makefile.in
index c3a746bb654..476e4bff2a8 100644
--- a/src/plugins/topology/tree/Makefile.in
+++ b/src/plugins/topology/tree/Makefile.in
@@ -242,6 +242,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/sacct/Makefile.in b/src/sacct/Makefile.in
index 31f024259ef..c770674087f 100644
--- a/src/sacct/Makefile.in
+++ b/src/sacct/Makefile.in
@@ -226,6 +226,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/sacctmgr/Makefile.in b/src/sacctmgr/Makefile.in
index 16d4014bc2b..32ef2c32f7d 100644
--- a/src/sacctmgr/Makefile.in
+++ b/src/sacctmgr/Makefile.in
@@ -231,6 +231,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/salloc/Makefile.in b/src/salloc/Makefile.in
index 851d4010d0c..8c5658a86de 100644
--- a/src/salloc/Makefile.in
+++ b/src/salloc/Makefile.in
@@ -225,6 +225,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/sattach/Makefile.in b/src/sattach/Makefile.in
index 038b231a6ea..96dd3957e75 100644
--- a/src/sattach/Makefile.in
+++ b/src/sattach/Makefile.in
@@ -224,6 +224,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/sbatch/Makefile.in b/src/sbatch/Makefile.in
index 96fbccb4613..1405bef5144 100644
--- a/src/sbatch/Makefile.in
+++ b/src/sbatch/Makefile.in
@@ -224,6 +224,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/sbcast/Makefile.in b/src/sbcast/Makefile.in
index 815a9bcc80a..0cfb072c58e 100644
--- a/src/sbcast/Makefile.in
+++ b/src/sbcast/Makefile.in
@@ -226,6 +226,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/scancel/Makefile.in b/src/scancel/Makefile.in
index 4ee568d302d..3583a0c07a9 100644
--- a/src/scancel/Makefile.in
+++ b/src/scancel/Makefile.in
@@ -225,6 +225,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/scontrol/Makefile.in b/src/scontrol/Makefile.in
index 1b2ae373973..7373eb52a78 100644
--- a/src/scontrol/Makefile.in
+++ b/src/scontrol/Makefile.in
@@ -228,6 +228,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/sinfo/Makefile.in b/src/sinfo/Makefile.in
index 1c5a962673f..6596965cd1b 100644
--- a/src/sinfo/Makefile.in
+++ b/src/sinfo/Makefile.in
@@ -227,6 +227,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/slurmctld/Makefile.in b/src/slurmctld/Makefile.in
index eff9c928bf4..f7434036064 100644
--- a/src/slurmctld/Makefile.in
+++ b/src/slurmctld/Makefile.in
@@ -234,6 +234,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/slurmd/Makefile.in b/src/slurmd/Makefile.in
index 40d285915b6..a61fdf3658c 100644
--- a/src/slurmd/Makefile.in
+++ b/src/slurmd/Makefile.in
@@ -235,6 +235,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/slurmd/common/Makefile.in b/src/slurmd/common/Makefile.in
index a96c613b7d6..c4d3832dac9 100644
--- a/src/slurmd/common/Makefile.in
+++ b/src/slurmd/common/Makefile.in
@@ -218,6 +218,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/slurmd/slurmd/Makefile.in b/src/slurmd/slurmd/Makefile.in
index a227b49fda8..c266e742890 100644
--- a/src/slurmd/slurmd/Makefile.in
+++ b/src/slurmd/slurmd/Makefile.in
@@ -227,6 +227,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/slurmd/slurmstepd/Makefile.in b/src/slurmd/slurmstepd/Makefile.in
index ffb601f43ae..e2df9338c95 100644
--- a/src/slurmd/slurmstepd/Makefile.in
+++ b/src/slurmd/slurmstepd/Makefile.in
@@ -230,6 +230,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/slurmdbd/Makefile.in b/src/slurmdbd/Makefile.in
index 31bef6cd8cf..7ea6fa3767c 100644
--- a/src/slurmdbd/Makefile.in
+++ b/src/slurmdbd/Makefile.in
@@ -226,6 +226,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/smap/Makefile.in b/src/smap/Makefile.in
index 4d113f65832..f58ef54ff01 100644
--- a/src/smap/Makefile.in
+++ b/src/smap/Makefile.in
@@ -246,6 +246,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/sprio/Makefile.in b/src/sprio/Makefile.in
index b443e3a556a..eaed426f2b7 100644
--- a/src/sprio/Makefile.in
+++ b/src/sprio/Makefile.in
@@ -226,6 +226,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/squeue/Makefile.in b/src/squeue/Makefile.in
index bf0c02fd274..0c31b28ddf1 100644
--- a/src/squeue/Makefile.in
+++ b/src/squeue/Makefile.in
@@ -227,6 +227,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/sreport/Makefile.in b/src/sreport/Makefile.in
index e6eee011df4..17fa4905b26 100644
--- a/src/sreport/Makefile.in
+++ b/src/sreport/Makefile.in
@@ -226,6 +226,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/srun/Makefile.in b/src/srun/Makefile.in
index 61a053caf92..c132f7879b8 100644
--- a/src/srun/Makefile.in
+++ b/src/srun/Makefile.in
@@ -226,6 +226,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/srun_cr/Makefile.in b/src/srun_cr/Makefile.in
index 5fe56ff4545..b0b185dd399 100644
--- a/src/srun_cr/Makefile.in
+++ b/src/srun_cr/Makefile.in
@@ -224,6 +224,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/sshare/Makefile.in b/src/sshare/Makefile.in
index 67f415a0df9..18e5d935384 100644
--- a/src/sshare/Makefile.in
+++ b/src/sshare/Makefile.in
@@ -224,6 +224,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/sstat/Makefile.in b/src/sstat/Makefile.in
index 87ac60a0cc6..35b7ab448aa 100644
--- a/src/sstat/Makefile.in
+++ b/src/sstat/Makefile.in
@@ -223,6 +223,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/strigger/Makefile.in b/src/strigger/Makefile.in
index 5eae11e1372..6b8659f7562 100644
--- a/src/strigger/Makefile.in
+++ b/src/strigger/Makefile.in
@@ -226,6 +226,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/src/sview/Makefile.in b/src/sview/Makefile.in
index 0503e0aa1d3..2fd2d98ff16 100644
--- a/src/sview/Makefile.in
+++ b/src/sview/Makefile.in
@@ -250,6 +250,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index 01a338e6ea4..71b20b0bb50 100644
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -242,6 +242,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/testsuite/expect/Makefile.in b/testsuite/expect/Makefile.in
index eec47d20d71..9ea034dbdbb 100644
--- a/testsuite/expect/Makefile.in
+++ b/testsuite/expect/Makefile.in
@@ -195,6 +195,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/testsuite/slurm_unit/Makefile.in b/testsuite/slurm_unit/Makefile.in
index bf54119a012..4cfbe27e456 100644
--- a/testsuite/slurm_unit/Makefile.in
+++ b/testsuite/slurm_unit/Makefile.in
@@ -235,6 +235,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/testsuite/slurm_unit/api/Makefile.in b/testsuite/slurm_unit/api/Makefile.in
index dffb2b5b664..a1273da5f02 100644
--- a/testsuite/slurm_unit/api/Makefile.in
+++ b/testsuite/slurm_unit/api/Makefile.in
@@ -258,6 +258,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/testsuite/slurm_unit/api/manual/Makefile.in b/testsuite/slurm_unit/api/manual/Makefile.in
index 84f50285af0..0938ac3e120 100644
--- a/testsuite/slurm_unit/api/manual/Makefile.in
+++ b/testsuite/slurm_unit/api/manual/Makefile.in
@@ -250,6 +250,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
diff --git a/testsuite/slurm_unit/common/Makefile.in b/testsuite/slurm_unit/common/Makefile.in
index 4189033c771..2178b17bd69 100644
--- a/testsuite/slurm_unit/common/Makefile.in
+++ b/testsuite/slurm_unit/common/Makefile.in
@@ -238,6 +238,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
 RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
 SED = @SED@
 SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
 SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
-- 
GitLab