diff --git a/Makefile.in b/Makefile.in
index 24c2ef31d325dc00b6d1e39cadac8acb023a4b4f..eea9a3b37083bd5d48547bb6f2054e1c43d70d52 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -142,6 +142,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -167,6 +168,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/NEWS b/NEWS
index 2581d516bb0d20d9b2da74ae02614de7798a01e0..743bb57fe91825d2ddbdeeac4d0962c944693bbe 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,8 @@ documents those changes that are of interest to users and admins.
  -- Add spank support to sbatch. Note that spank_local_user() will be called 
     with step_layout=NULL and gid=SLURM_BATCH_SCRIPT and spank_fini() will 
     be called immediately afterwards.
+ -- Made configure use mysql_config to find location of mysql database install
+    Removed bluegene specific information from the general database tables.
 
 * Changes in SLURM 1.3.0-pre8
 =============================
diff --git a/auxdir/Makefile.in b/auxdir/Makefile.in
index 304b6d5a190476c1d98c8d6feee12503b59352e0..94f08c5fec4339dd95734df5f3e6e02d745be0ef 100644
--- a/auxdir/Makefile.in
+++ b/auxdir/Makefile.in
@@ -102,6 +102,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -127,6 +128,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/auxdir/x_ac_databases.m4 b/auxdir/x_ac_databases.m4
index d38df310a9b8f871d0353f73c38aec658cc231aa..839dd8ac7cebc4a68a934dd06eee79c0e5285e10 100644
--- a/auxdir/x_ac_databases.m4
+++ b/auxdir/x_ac_databases.m4
@@ -15,43 +15,48 @@ AC_DEFUN([X_AC_DATABASES],
 [
 	#Check for MySQL
 	ac_have_mysql="no"
-	AC_CHECK_HEADERS(mysql/mysql.h,
-			 [has_mysql_header="true"],
-			 [has_mysql_header="false"])
-   	if test "$has_mysql_header" = "true"; then	
-      		AC_CHECK_LIB(mysqlclient, mysql_init, [has_mysql_lib="true"], [has_mysql_lib="false"])
-      		if test "$has_mysql_lib" = "true"; then
-               		MYSQL_LIBS=" -lmysqlclient -lz"
-        		save_LIBS="$LIBS"
-        		LIBS="$MYSQL_LIBS $save_LIBS"
-        		AC_TRY_LINK([
-          			#include <mysql/mysql.h>
-        			],[
-          			int main()
-          			{
-					MYSQL mysql;
-            				(void) mysql_init(&mysql);
-					(void) mysql_close(&mysql);
-            		        }
-        		], [ac_have_mysql="yes"], [ac_have_mysql="no"])
-			LIBS="$save_LIBS"
-        		if test "$ac_have_mysql" == "yes"; then
-            			AC_MSG_RESULT([MySQL test program built properly.])
-            			AC_SUBST(MYSQL_LIBS)
-				AC_DEFINE(HAVE_MYSQL, 1, [Define to 1 if using MySQL libaries])
-	        	else
-        			AC_MSG_WARN([*** MySQL test program execution failed.])
-			fi        	
-      		else
-        		AC_MSG_WARN(mysqlclient lib not found: mysql support not available)
-      		fi
-   	else
-      		AC_MSG_WARN(mysql/mysql.h header not found: mysql support not available)
-   	fi 
+	### Check for mysql_config program
+    	AC_PATH_PROG(HAVEMYSQLCONFIG, mysql_config, no)
+	if test x$HAVEMYSQLCONFIG = xno; then
+        	AC_MSG_WARN([*** mysql_config not found. Evidently no MySQL install on system.])
+	else
+		# mysql_config puts -I on the front of the dir.  We don't 
+		# want that so we remove it.
+		MYSQL_CFLAGS=`$HAVEMYSQLCONFIG --cflags`
+		MYSQL_LIBS=`$HAVEMYSQLCONFIG --libs_r`
+		if test -z "$MYSQL_LIBS"; then
+			MYSQL_LIBS=`$HAVEMYSQLCONFIG --libs`
+		fi
+		save_CFLAGS="$CFLAGS"
+		save_LIBS="$LIBS"
+       		CFLAGS="$MYSQL_CFLAGS $save_CFLAGS"
+		LIBS="$MYSQL_LIBS $save_LIBS"
+		AC_TRY_LINK([#include <mysql.h>],[
+          		int main()
+          		{
+				MYSQL mysql;
+            			(void) mysql_init(&mysql);
+				(void) mysql_close(&mysql);
+            		}
+        		],
+			[ac_have_mysql="yes"],
+			[ac_have_mysql="no"])
+		CFLAGS="$save_CFLAGS"
+		LIBS="$save_LIBS"
+       		if test "$ac_have_mysql" == "yes"; then
+            		AC_MSG_RESULT([MySQL test program built properly.])
+            		AC_SUBST(MYSQL_LIBS)
+			AC_SUBST(MYSQL_CFLAGS)
+			AC_DEFINE(HAVE_MYSQL, 1, [Define to 1 if using MySQL libaries])
+	        else
+        		AC_MSG_WARN([*** MySQL test program execution failed.])
+		fi        	
+      	fi
+
 
 	#Check for PostgreSQL
-	ac_have_pgsql="no"
-	### Check for pkg-config program
+	ac_have_postgres="no"
+	### Check for pg_config program
     	AC_PATH_PROG(HAVEPGCONFIG, pg_config, no)
 	if test x$HAVEPGCONFIG = xno; then
         	AC_MSG_WARN([*** pg_config not found. Evidently no PostgreSQL install on system.])
@@ -71,16 +76,16 @@ AC_DEFUN([X_AC_DATABASES],
        				PGSQL_LIBS=" -lpq"
 	       			save_LIBS="$LIBS"
         			LIBS="$PGSQL_LIBS $save_LIBS"
-       				AC_TRY_LINK([
-      					#include <libpq-fe.h>
-      					],[
+       				AC_TRY_LINK([#include <libpq-fe.h>],[
           				int main()
        	  				{
 						PGconn     *conn;
 						conn = PQconnectdb("dbname = postgres");
        						(void) PQfinish(conn);
             			        }
-        			], [ac_have_pgsql="yes"], [ac_have_pgsql="no"])
+        				],
+					[ac_have_pgsql="yes"],
+					[ac_have_pgsql="no"])
 				LIBS="$save_LIBS"
        				if test "$ac_have_pgsql" == "yes"; then
     					AC_MSG_RESULT([PostgreSQL test program built properly.])
diff --git a/config.h.in b/config.h.in
index fe6eef7d52b027b0e7b0c675deb3735fb7d608fc..5d0b969581479f6f8e12e030ef29040ea69be23c 100644
--- a/config.h.in
+++ b/config.h.in
@@ -101,9 +101,6 @@
 /* Define to 1 if using MySQL libaries */
 #undef HAVE_MYSQL
 
-/* Define to 1 if you have the <mysql/mysql.h> header file. */
-#undef HAVE_MYSQL_MYSQL_H
-
 /* Define to 1 if you have the <ncurses.h> header file. */
 #undef HAVE_NCURSES_H
 
diff --git a/configure b/configure
index 02edad6789c910d3f9d5123ccb37652634b727c5..69971f19a26647464ac76fa21490216337806d9b 100755
--- a/configure
+++ b/configure
@@ -925,7 +925,9 @@ GTK2_CFLAGS
 GTK2_LIBS
 HAVE_GTK_TRUE
 HAVE_GTK_FALSE
+HAVEMYSQLCONFIG
 MYSQL_LIBS
+MYSQL_CFLAGS
 HAVEPGCONFIG
 PGSQL_LIBS
 PGSQL_CFLAGS
@@ -7109,7 +7111,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7112 "configure"' > conftest.$ac_ext
+  echo '#line 7114 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -8900,11 +8902,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8903: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8905: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8907: \$? = $ac_status" >&5
+   echo "$as_me:8909: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9190,11 +9192,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9193: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9195: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9197: \$? = $ac_status" >&5
+   echo "$as_me:9199: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9294,11 +9296,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9297: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9299: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9301: \$? = $ac_status" >&5
+   echo "$as_me:9303: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -11656,7 +11658,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 11659 "configure"
+#line 11661 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11756,7 +11758,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 11759 "configure"
+#line 11761 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14176,11 +14178,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14179: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14181: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14183: \$? = $ac_status" >&5
+   echo "$as_me:14185: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -14280,11 +14282,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14283: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14285: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14287: \$? = $ac_status" >&5
+   echo "$as_me:14289: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15857,11 +15859,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15860: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15862: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15864: \$? = $ac_status" >&5
+   echo "$as_me:15866: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -15961,11 +15963,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15964: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15966: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15968: \$? = $ac_status" >&5
+   echo "$as_me:15970: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -18161,11 +18163,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18164: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18166: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:18168: \$? = $ac_status" >&5
+   echo "$as_me:18170: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -18451,11 +18453,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18454: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18456: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:18458: \$? = $ac_status" >&5
+   echo "$as_me:18460: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -18555,11 +18557,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18558: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18560: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:18562: \$? = $ac_status" >&5
+   echo "$as_me:18564: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -24935,239 +24937,80 @@ fi
 
 	#Check for MySQL
 	ac_have_mysql="no"
-
-for ac_header in mysql/mysql.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+	### Check for mysql_config program
+    	# Extract the first word of "mysql_config", so it can be a program name with args.
+set dummy mysql_config; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_HAVEMYSQLCONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
- has_mysql_header="true"
-else
-  has_mysql_header="false"
-fi
-
+  case $HAVEMYSQLCONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_HAVEMYSQLCONFIG="$HAVEMYSQLCONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_HAVEMYSQLCONFIG="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
 done
+done
+IFS=$as_save_IFS
 
-   	if test "$has_mysql_header" = "true"; then
-      		{ echo "$as_me:$LINENO: checking for mysql_init in -lmysqlclient" >&5
-echo $ECHO_N "checking for mysql_init in -lmysqlclient... $ECHO_C" >&6; }
-if test "${ac_cv_lib_mysqlclient_mysql_init+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lmysqlclient  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char mysql_init ();
-int
-main ()
-{
-return mysql_init ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
+  test -z "$ac_cv_path_HAVEMYSQLCONFIG" && ac_cv_path_HAVEMYSQLCONFIG="no"
+  ;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_mysqlclient_mysql_init=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_mysqlclient_mysql_init=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_mysqlclient_mysql_init" >&5
-echo "${ECHO_T}$ac_cv_lib_mysqlclient_mysql_init" >&6; }
-if test $ac_cv_lib_mysqlclient_mysql_init = yes; then
-  has_mysql_lib="true"
+HAVEMYSQLCONFIG=$ac_cv_path_HAVEMYSQLCONFIG
+if test -n "$HAVEMYSQLCONFIG"; then
+  { echo "$as_me:$LINENO: result: $HAVEMYSQLCONFIG" >&5
+echo "${ECHO_T}$HAVEMYSQLCONFIG" >&6; }
 else
-  has_mysql_lib="false"
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
-      		if test "$has_mysql_lib" = "true"; then
-               		MYSQL_LIBS=" -lmysqlclient -lz"
-        		save_LIBS="$LIBS"
-        		LIBS="$MYSQL_LIBS $save_LIBS"
-        		cat >conftest.$ac_ext <<_ACEOF
+
+	if test x$HAVEMYSQLCONFIG = xno; then
+        	{ echo "$as_me:$LINENO: WARNING: *** mysql_config not found. Evidently no MySQL install on system." >&5
+echo "$as_me: WARNING: *** mysql_config not found. Evidently no MySQL install on system." >&2;}
+	else
+		# mysql_config puts -I on the front of the dir.  We don't
+		# want that so we remove it.
+		MYSQL_CFLAGS=`$HAVEMYSQLCONFIG --cflags`
+		MYSQL_LIBS=`$HAVEMYSQLCONFIG --libs_r`
+		if test -z "$MYSQL_LIBS"; then
+			MYSQL_LIBS=`$HAVEMYSQLCONFIG --libs`
+		fi
+		save_CFLAGS="$CFLAGS"
+		save_LIBS="$LIBS"
+       		CFLAGS="$MYSQL_CFLAGS $save_CFLAGS"
+		LIBS="$MYSQL_LIBS $save_LIBS"
+		cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
-          			#include <mysql/mysql.h>
-
+#include <mysql.h>
 int
 main ()
 {
 
-          			int main()
-          			{
-					MYSQL mysql;
-            				(void) mysql_init(&mysql);
-					(void) mysql_close(&mysql);
-            		        }
+          		int main()
+          		{
+				MYSQL mysql;
+            			(void) mysql_init(&mysql);
+				(void) mysql_close(&mysql);
+            		}
 
   ;
   return 0;
@@ -25201,32 +25044,28 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-			LIBS="$save_LIBS"
-        		if test "$ac_have_mysql" == "yes"; then
-            			{ echo "$as_me:$LINENO: result: MySQL test program built properly." >&5
+		CFLAGS="$save_CFLAGS"
+		LIBS="$save_LIBS"
+       		if test "$ac_have_mysql" == "yes"; then
+            		{ echo "$as_me:$LINENO: result: MySQL test program built properly." >&5
 echo "${ECHO_T}MySQL test program built properly." >&6; }
 
 
+
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_MYSQL 1
 _ACEOF
 
-	        	else
-        			{ echo "$as_me:$LINENO: WARNING: *** MySQL test program execution failed." >&5
+	        else
+        		{ echo "$as_me:$LINENO: WARNING: *** MySQL test program execution failed." >&5
 echo "$as_me: WARNING: *** MySQL test program execution failed." >&2;}
-			fi
-      		else
-        		{ echo "$as_me:$LINENO: WARNING: mysqlclient lib not found: mysql support not available" >&5
-echo "$as_me: WARNING: mysqlclient lib not found: mysql support not available" >&2;}
-      		fi
-   	else
-      		{ echo "$as_me:$LINENO: WARNING: mysql/mysql.h header not found: mysql support not available" >&5
-echo "$as_me: WARNING: mysql/mysql.h header not found: mysql support not available" >&2;}
-   	fi
+		fi
+      	fi
+
 
 	#Check for PostgreSQL
-	ac_have_pgsql="no"
-	### Check for pkg-config program
+	ac_have_postgres="no"
+	### Check for pg_config program
     	# Extract the first word of "pg_config", so it can be a program name with args.
 set dummy pg_config; ac_word=$2
 { echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -25498,9 +25337,7 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
-      					#include <libpq-fe.h>
-
+#include <libpq-fe.h>
 int
 main ()
 {
@@ -27983,7 +27820,9 @@ GTK2_CFLAGS!$GTK2_CFLAGS$ac_delim
 GTK2_LIBS!$GTK2_LIBS$ac_delim
 HAVE_GTK_TRUE!$HAVE_GTK_TRUE$ac_delim
 HAVE_GTK_FALSE!$HAVE_GTK_FALSE$ac_delim
+HAVEMYSQLCONFIG!$HAVEMYSQLCONFIG$ac_delim
 MYSQL_LIBS!$MYSQL_LIBS$ac_delim
+MYSQL_CFLAGS!$MYSQL_CFLAGS$ac_delim
 HAVEPGCONFIG!$HAVEPGCONFIG$ac_delim
 PGSQL_LIBS!$PGSQL_LIBS$ac_delim
 PGSQL_CFLAGS!$PGSQL_CFLAGS$ac_delim
@@ -28017,8 +27856,6 @@ AUTHD_LIBS!$AUTHD_LIBS$ac_delim
 AUTHD_CFLAGS!$AUTHD_CFLAGS$ac_delim
 WITH_AUTHD_TRUE!$WITH_AUTHD_TRUE$ac_delim
 WITH_AUTHD_FALSE!$WITH_AUTHD_FALSE$ac_delim
-UTIL_LIBS!$UTIL_LIBS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -28057,6 +27894,51 @@ CEOF$ac_eof
 _ACEOF
 
 
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  cat >conf$$subs.sed <<_ACEOF
+UTIL_LIBS!$UTIL_LIBS$ac_delim
+LTLIBOBJS!$LTLIBOBJS$ac_delim
+_ACEOF
+
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 2; then
+    break
+  elif $ac_last_try; then
+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+  ac_eof=`expr $ac_eof + 1`
+fi
+
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+:end
+s/|#_!!_#|//g
+CEOF$ac_eof
+_ACEOF
+
+
 # VPATH may cause trouble with some makes, so we remove $(srcdir),
 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
@@ -28306,7 +28188,7 @@ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
 s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed 's/|#_!!_#|//g' >$tmp/out
+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
diff --git a/contribs/Makefile.in b/contribs/Makefile.in
index e5f2ede6fb1fdcc9abaae5985451dabafad8f907..a287f8b89130c5489ca997719f05f2d9939d2417 100644
--- a/contribs/Makefile.in
+++ b/contribs/Makefile.in
@@ -113,6 +113,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -138,6 +139,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/contribs/perlapi/Makefile.in b/contribs/perlapi/Makefile.in
index 7b709bdcda185f21ad1af7c404ecf5079caaeea1..2f249e5516615be285555953f9bcfb7392aa74a2 100644
--- a/contribs/perlapi/Makefile.in
+++ b/contribs/perlapi/Makefile.in
@@ -101,6 +101,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -126,6 +127,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/contribs/torque/Makefile.in b/contribs/torque/Makefile.in
index fcad8bb9193197a02dbb7be0ebdaacc53dbd9cbc..24e41f32a53f1a8a1434fd92ba98a1c3de9f4072 100644
--- a/contribs/torque/Makefile.in
+++ b/contribs/torque/Makefile.in
@@ -108,6 +108,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -133,6 +134,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/doc/Makefile.in b/doc/Makefile.in
index b143e24da9e2f24731c693092124c73b69adc47e..ca79f5db7333748df97afc12ce553be1379ceee0 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -113,6 +113,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -138,6 +139,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/doc/html/Makefile.in b/doc/html/Makefile.in
index a6fd0d1bb3969264d0b6696476264270d4436b01..8863d77fb4873a8429dfd2585d230b3db44e7907 100644
--- a/doc/html/Makefile.in
+++ b/doc/html/Makefile.in
@@ -112,6 +112,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -137,6 +138,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/doc/man/Makefile.in b/doc/man/Makefile.in
index 35dd6c66fd5c3ee7aaa405998f401d2d41520f3c..f26004e852b5b16284c0b05bd6d428b681959355 100644
--- a/doc/man/Makefile.in
+++ b/doc/man/Makefile.in
@@ -109,6 +109,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -134,6 +135,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/Makefile.in b/src/Makefile.in
index 1889f4f1eef80ed2d75d9028ee7044f2beb0e279..1531997a3b548f0b82cce8d540e9ce067007dba4 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -113,6 +113,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -138,6 +139,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/api/Makefile.in b/src/api/Makefile.in
index c1ad8681e324dc8aa19935c89d3bcb69c43b330e..fbbcdfbbed73c0b53469d8fa830c17ed405b56d5 100644
--- a/src/api/Makefile.in
+++ b/src/api/Makefile.in
@@ -153,6 +153,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -178,6 +179,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 012c16840a7ba9556cecb4f79d176c55d19d4f05..627b7413ce31cbf97e30d5b91bf56104751ba3ea 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -12,8 +12,6 @@ endif
 
 INCLUDES     = -I$(top_srcdir) $(SSL_CPPFLAGS)
 
-CPPFLAGS = $(PGSQL_CFLAGS)
-
 noinst_LTLIBRARIES = 			\
 	libcommon.la 			\
 	libdaemonize.la 		\
@@ -108,6 +106,8 @@ libspank_la_SOURCES = \
 libcommon_la_LIBADD   = $(SSL_LIBS) -ldl $(PGSQL_LIBS) $(MYSQL_LIBS)
 
 libcommon_la_LDFLAGS  = $(LIB_LDFLAGS) $(SSL_LDFLAGS)
+libcommon_la_LIBS = $(PGSQL_LIBS) $(MYSQL_LIBS)
+libcommon_la_CFLAGS = $(PGSQL_CFLAGS) $(MYSQL_CFLAGS)
 
 global_defaults.c : $(top_builddir)/config.h Makefile
 	@( echo "/* This file autogenerated by src/common/Makefile */"; \
diff --git a/src/common/Makefile.in b/src/common/Makefile.in
index 0c3c9850ad7876cf1f18a057bb49a56d25f05a43..78362a0a27259fd75e08e1d5c384de15919e402d 100644
--- a/src/common/Makefile.in
+++ b/src/common/Makefile.in
@@ -98,27 +98,44 @@ am__libcommon_la_SOURCES_DIST = xmalloc.c xmalloc.h xassert.c \
 	job_options.c job_options.h global_defaults.c timers.c \
 	timers.h slurm_xlator.h stepd_api.c stepd_api.h proc_args.c \
 	proc_args.h
-@HAVE_UNSETENV_FALSE@am__objects_1 = unsetenv.lo
-am_libcommon_la_OBJECTS = xmalloc.lo xassert.lo xstring.lo xsignal.lo \
-	forward.lo strlcpy.lo list.lo net.lo fd.lo log.lo cbuf.lo \
-	safeopen.lo bitstring.lo mpi.lo mysql_common.lo pack.lo \
-	parse_config.lo parse_spec.lo pgsql_common.lo plugin.lo \
-	plugrack.lo read_config.lo node_select.lo env.lo slurm_cred.lo \
-	slurm_errno.lo slurm_protocol_api.lo slurm_protocol_pack.lo \
-	slurm_protocol_util.lo slurm_protocol_socket_implementation.lo \
-	slurm_protocol_defs.lo slurm_rlimits_info.lo uid.lo \
-	util-net.lo slurm_auth.lo jobacct_common.lo \
-	slurm_jobacct_gather.lo slurm_jobacct_storage.lo \
-	slurm_jobcomp.lo switch.lo arg_desc.lo malloc.lo getopt.lo \
-	getopt1.lo $(am__objects_1) slurm_selecttype_info.lo \
-	slurm_resource_info.lo hostlist.lo slurm_step_layout.lo \
-	checkpoint.lo parse_time.lo job_options.lo global_defaults.lo \
-	timers.lo stepd_api.lo proc_args.lo
+@HAVE_UNSETENV_FALSE@am__objects_1 = libcommon_la-unsetenv.lo
+am_libcommon_la_OBJECTS = libcommon_la-xmalloc.lo \
+	libcommon_la-xassert.lo libcommon_la-xstring.lo \
+	libcommon_la-xsignal.lo libcommon_la-forward.lo \
+	libcommon_la-strlcpy.lo libcommon_la-list.lo \
+	libcommon_la-net.lo libcommon_la-fd.lo libcommon_la-log.lo \
+	libcommon_la-cbuf.lo libcommon_la-safeopen.lo \
+	libcommon_la-bitstring.lo libcommon_la-mpi.lo \
+	libcommon_la-mysql_common.lo libcommon_la-pack.lo \
+	libcommon_la-parse_config.lo libcommon_la-parse_spec.lo \
+	libcommon_la-pgsql_common.lo libcommon_la-plugin.lo \
+	libcommon_la-plugrack.lo libcommon_la-read_config.lo \
+	libcommon_la-node_select.lo libcommon_la-env.lo \
+	libcommon_la-slurm_cred.lo libcommon_la-slurm_errno.lo \
+	libcommon_la-slurm_protocol_api.lo \
+	libcommon_la-slurm_protocol_pack.lo \
+	libcommon_la-slurm_protocol_util.lo \
+	libcommon_la-slurm_protocol_socket_implementation.lo \
+	libcommon_la-slurm_protocol_defs.lo \
+	libcommon_la-slurm_rlimits_info.lo libcommon_la-uid.lo \
+	libcommon_la-util-net.lo libcommon_la-slurm_auth.lo \
+	libcommon_la-jobacct_common.lo \
+	libcommon_la-slurm_jobacct_gather.lo \
+	libcommon_la-slurm_jobacct_storage.lo \
+	libcommon_la-slurm_jobcomp.lo libcommon_la-switch.lo \
+	libcommon_la-arg_desc.lo libcommon_la-malloc.lo \
+	libcommon_la-getopt.lo libcommon_la-getopt1.lo \
+	$(am__objects_1) libcommon_la-slurm_selecttype_info.lo \
+	libcommon_la-slurm_resource_info.lo libcommon_la-hostlist.lo \
+	libcommon_la-slurm_step_layout.lo libcommon_la-checkpoint.lo \
+	libcommon_la-parse_time.lo libcommon_la-job_options.lo \
+	libcommon_la-global_defaults.lo libcommon_la-timers.lo \
+	libcommon_la-stepd_api.lo libcommon_la-proc_args.lo
 am__EXTRA_libcommon_la_SOURCES_DIST = unsetenv.c unsetenv.h
 libcommon_la_OBJECTS = $(am_libcommon_la_OBJECTS)
 libcommon_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(libcommon_la_LDFLAGS) $(LDFLAGS) -o $@
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libcommon_la_CFLAGS) \
+	$(CFLAGS) $(libcommon_la_LDFLAGS) $(LDFLAGS) -o $@
 libdaemonize_la_LIBADD =
 am_libdaemonize_la_OBJECTS = daemonize.lo fd.lo
 libdaemonize_la_OBJECTS = $(am_libdaemonize_la_OBJECTS)
@@ -165,7 +182,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CMD_LDFLAGS = @CMD_LDFLAGS@
 CPP = @CPP@
-CPPFLAGS = $(PGSQL_CFLAGS)
+CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
@@ -186,6 +203,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -211,6 +229,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
@@ -411,6 +430,8 @@ libspank_la_SOURCES = \
 
 libcommon_la_LIBADD = $(SSL_LIBS) -ldl $(PGSQL_LIBS) $(MYSQL_LIBS)
 libcommon_la_LDFLAGS = $(LIB_LDFLAGS) $(SSL_LDFLAGS)
+libcommon_la_LIBS = $(PGSQL_LIBS) $(MYSQL_LIBS)
+libcommon_la_CFLAGS = $(PGSQL_CFLAGS) $(MYSQL_CFLAGS)
 all: all-am
 
 .SUFFIXES:
@@ -468,67 +489,68 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/arg_desc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bitstring.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cbuf.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checkpoint.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/daemonize.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eio.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/env.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fd.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/forward.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/global_defaults.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hostlist.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/io_hdr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/job_options.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobacct_common.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/log.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/malloc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpi.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mysql_common.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/net.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/node_select.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-arg_desc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-bitstring.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-cbuf.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-checkpoint.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-env.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-fd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-forward.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-getopt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-getopt1.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-global_defaults.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-hostlist.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-job_options.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-jobacct_common.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-list.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-log.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-malloc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-mpi.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-mysql_common.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-net.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-node_select.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-pack.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-parse_config.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-parse_spec.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-parse_time.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-pgsql_common.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-plugin.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-plugrack.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-proc_args.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-read_config.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-safeopen.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-slurm_auth.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-slurm_cred.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-slurm_errno.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-slurm_jobacct_gather.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-slurm_jobacct_storage.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-slurm_jobcomp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-slurm_protocol_api.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-slurm_protocol_defs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-slurm_protocol_pack.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-slurm_protocol_socket_implementation.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-slurm_protocol_util.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-slurm_resource_info.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-slurm_rlimits_info.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-slurm_selecttype_info.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-slurm_step_layout.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-stepd_api.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-strlcpy.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-switch.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-timers.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-uid.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-unsetenv.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-util-net.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-xassert.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-xmalloc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-xsignal.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_la-xstring.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/optz.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pack.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse_config.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse_spec.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse_time.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pgsql_common.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugin.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugrack.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugstack.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proc_args.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/read_config.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/safeopen.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slurm_auth.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slurm_cred.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slurm_errno.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slurm_jobacct_gather.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slurm_jobacct_storage.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slurm_jobcomp.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slurm_protocol_api.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slurm_protocol_defs.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slurm_protocol_pack.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slurm_protocol_socket_implementation.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slurm_protocol_util.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slurm_resource_info.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slurm_rlimits_info.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slurm_selecttype_info.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slurm_step_layout.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stepd_api.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strlcpy.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/switch.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timers.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uid.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unsetenv.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util-net.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xassert.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmalloc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsignal.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xstring.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -551,6 +573,398 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
+libcommon_la-xmalloc.lo: xmalloc.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-xmalloc.lo -MD -MP -MF $(DEPDIR)/libcommon_la-xmalloc.Tpo -c -o libcommon_la-xmalloc.lo `test -f 'xmalloc.c' || echo '$(srcdir)/'`xmalloc.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-xmalloc.Tpo $(DEPDIR)/libcommon_la-xmalloc.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xmalloc.c' object='libcommon_la-xmalloc.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-xmalloc.lo `test -f 'xmalloc.c' || echo '$(srcdir)/'`xmalloc.c
+
+libcommon_la-xassert.lo: xassert.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-xassert.lo -MD -MP -MF $(DEPDIR)/libcommon_la-xassert.Tpo -c -o libcommon_la-xassert.lo `test -f 'xassert.c' || echo '$(srcdir)/'`xassert.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-xassert.Tpo $(DEPDIR)/libcommon_la-xassert.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xassert.c' object='libcommon_la-xassert.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-xassert.lo `test -f 'xassert.c' || echo '$(srcdir)/'`xassert.c
+
+libcommon_la-xstring.lo: xstring.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-xstring.lo -MD -MP -MF $(DEPDIR)/libcommon_la-xstring.Tpo -c -o libcommon_la-xstring.lo `test -f 'xstring.c' || echo '$(srcdir)/'`xstring.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-xstring.Tpo $(DEPDIR)/libcommon_la-xstring.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xstring.c' object='libcommon_la-xstring.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-xstring.lo `test -f 'xstring.c' || echo '$(srcdir)/'`xstring.c
+
+libcommon_la-xsignal.lo: xsignal.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-xsignal.lo -MD -MP -MF $(DEPDIR)/libcommon_la-xsignal.Tpo -c -o libcommon_la-xsignal.lo `test -f 'xsignal.c' || echo '$(srcdir)/'`xsignal.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-xsignal.Tpo $(DEPDIR)/libcommon_la-xsignal.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xsignal.c' object='libcommon_la-xsignal.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-xsignal.lo `test -f 'xsignal.c' || echo '$(srcdir)/'`xsignal.c
+
+libcommon_la-forward.lo: forward.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-forward.lo -MD -MP -MF $(DEPDIR)/libcommon_la-forward.Tpo -c -o libcommon_la-forward.lo `test -f 'forward.c' || echo '$(srcdir)/'`forward.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-forward.Tpo $(DEPDIR)/libcommon_la-forward.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='forward.c' object='libcommon_la-forward.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-forward.lo `test -f 'forward.c' || echo '$(srcdir)/'`forward.c
+
+libcommon_la-strlcpy.lo: strlcpy.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-strlcpy.lo -MD -MP -MF $(DEPDIR)/libcommon_la-strlcpy.Tpo -c -o libcommon_la-strlcpy.lo `test -f 'strlcpy.c' || echo '$(srcdir)/'`strlcpy.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-strlcpy.Tpo $(DEPDIR)/libcommon_la-strlcpy.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='strlcpy.c' object='libcommon_la-strlcpy.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-strlcpy.lo `test -f 'strlcpy.c' || echo '$(srcdir)/'`strlcpy.c
+
+libcommon_la-list.lo: list.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-list.lo -MD -MP -MF $(DEPDIR)/libcommon_la-list.Tpo -c -o libcommon_la-list.lo `test -f 'list.c' || echo '$(srcdir)/'`list.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-list.Tpo $(DEPDIR)/libcommon_la-list.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='list.c' object='libcommon_la-list.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-list.lo `test -f 'list.c' || echo '$(srcdir)/'`list.c
+
+libcommon_la-net.lo: net.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-net.lo -MD -MP -MF $(DEPDIR)/libcommon_la-net.Tpo -c -o libcommon_la-net.lo `test -f 'net.c' || echo '$(srcdir)/'`net.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-net.Tpo $(DEPDIR)/libcommon_la-net.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='net.c' object='libcommon_la-net.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-net.lo `test -f 'net.c' || echo '$(srcdir)/'`net.c
+
+libcommon_la-fd.lo: fd.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-fd.lo -MD -MP -MF $(DEPDIR)/libcommon_la-fd.Tpo -c -o libcommon_la-fd.lo `test -f 'fd.c' || echo '$(srcdir)/'`fd.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-fd.Tpo $(DEPDIR)/libcommon_la-fd.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fd.c' object='libcommon_la-fd.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-fd.lo `test -f 'fd.c' || echo '$(srcdir)/'`fd.c
+
+libcommon_la-log.lo: log.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-log.lo -MD -MP -MF $(DEPDIR)/libcommon_la-log.Tpo -c -o libcommon_la-log.lo `test -f 'log.c' || echo '$(srcdir)/'`log.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-log.Tpo $(DEPDIR)/libcommon_la-log.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='log.c' object='libcommon_la-log.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-log.lo `test -f 'log.c' || echo '$(srcdir)/'`log.c
+
+libcommon_la-cbuf.lo: cbuf.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-cbuf.lo -MD -MP -MF $(DEPDIR)/libcommon_la-cbuf.Tpo -c -o libcommon_la-cbuf.lo `test -f 'cbuf.c' || echo '$(srcdir)/'`cbuf.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-cbuf.Tpo $(DEPDIR)/libcommon_la-cbuf.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cbuf.c' object='libcommon_la-cbuf.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-cbuf.lo `test -f 'cbuf.c' || echo '$(srcdir)/'`cbuf.c
+
+libcommon_la-safeopen.lo: safeopen.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-safeopen.lo -MD -MP -MF $(DEPDIR)/libcommon_la-safeopen.Tpo -c -o libcommon_la-safeopen.lo `test -f 'safeopen.c' || echo '$(srcdir)/'`safeopen.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-safeopen.Tpo $(DEPDIR)/libcommon_la-safeopen.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='safeopen.c' object='libcommon_la-safeopen.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-safeopen.lo `test -f 'safeopen.c' || echo '$(srcdir)/'`safeopen.c
+
+libcommon_la-bitstring.lo: bitstring.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-bitstring.lo -MD -MP -MF $(DEPDIR)/libcommon_la-bitstring.Tpo -c -o libcommon_la-bitstring.lo `test -f 'bitstring.c' || echo '$(srcdir)/'`bitstring.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-bitstring.Tpo $(DEPDIR)/libcommon_la-bitstring.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='bitstring.c' object='libcommon_la-bitstring.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-bitstring.lo `test -f 'bitstring.c' || echo '$(srcdir)/'`bitstring.c
+
+libcommon_la-mpi.lo: mpi.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-mpi.lo -MD -MP -MF $(DEPDIR)/libcommon_la-mpi.Tpo -c -o libcommon_la-mpi.lo `test -f 'mpi.c' || echo '$(srcdir)/'`mpi.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-mpi.Tpo $(DEPDIR)/libcommon_la-mpi.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mpi.c' object='libcommon_la-mpi.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-mpi.lo `test -f 'mpi.c' || echo '$(srcdir)/'`mpi.c
+
+libcommon_la-mysql_common.lo: mysql_common.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-mysql_common.lo -MD -MP -MF $(DEPDIR)/libcommon_la-mysql_common.Tpo -c -o libcommon_la-mysql_common.lo `test -f 'mysql_common.c' || echo '$(srcdir)/'`mysql_common.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-mysql_common.Tpo $(DEPDIR)/libcommon_la-mysql_common.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mysql_common.c' object='libcommon_la-mysql_common.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-mysql_common.lo `test -f 'mysql_common.c' || echo '$(srcdir)/'`mysql_common.c
+
+libcommon_la-pack.lo: pack.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-pack.lo -MD -MP -MF $(DEPDIR)/libcommon_la-pack.Tpo -c -o libcommon_la-pack.lo `test -f 'pack.c' || echo '$(srcdir)/'`pack.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-pack.Tpo $(DEPDIR)/libcommon_la-pack.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pack.c' object='libcommon_la-pack.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-pack.lo `test -f 'pack.c' || echo '$(srcdir)/'`pack.c
+
+libcommon_la-parse_config.lo: parse_config.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-parse_config.lo -MD -MP -MF $(DEPDIR)/libcommon_la-parse_config.Tpo -c -o libcommon_la-parse_config.lo `test -f 'parse_config.c' || echo '$(srcdir)/'`parse_config.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-parse_config.Tpo $(DEPDIR)/libcommon_la-parse_config.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='parse_config.c' object='libcommon_la-parse_config.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-parse_config.lo `test -f 'parse_config.c' || echo '$(srcdir)/'`parse_config.c
+
+libcommon_la-parse_spec.lo: parse_spec.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-parse_spec.lo -MD -MP -MF $(DEPDIR)/libcommon_la-parse_spec.Tpo -c -o libcommon_la-parse_spec.lo `test -f 'parse_spec.c' || echo '$(srcdir)/'`parse_spec.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-parse_spec.Tpo $(DEPDIR)/libcommon_la-parse_spec.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='parse_spec.c' object='libcommon_la-parse_spec.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-parse_spec.lo `test -f 'parse_spec.c' || echo '$(srcdir)/'`parse_spec.c
+
+libcommon_la-pgsql_common.lo: pgsql_common.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-pgsql_common.lo -MD -MP -MF $(DEPDIR)/libcommon_la-pgsql_common.Tpo -c -o libcommon_la-pgsql_common.lo `test -f 'pgsql_common.c' || echo '$(srcdir)/'`pgsql_common.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-pgsql_common.Tpo $(DEPDIR)/libcommon_la-pgsql_common.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pgsql_common.c' object='libcommon_la-pgsql_common.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-pgsql_common.lo `test -f 'pgsql_common.c' || echo '$(srcdir)/'`pgsql_common.c
+
+libcommon_la-plugin.lo: plugin.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-plugin.lo -MD -MP -MF $(DEPDIR)/libcommon_la-plugin.Tpo -c -o libcommon_la-plugin.lo `test -f 'plugin.c' || echo '$(srcdir)/'`plugin.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-plugin.Tpo $(DEPDIR)/libcommon_la-plugin.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='plugin.c' object='libcommon_la-plugin.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-plugin.lo `test -f 'plugin.c' || echo '$(srcdir)/'`plugin.c
+
+libcommon_la-plugrack.lo: plugrack.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-plugrack.lo -MD -MP -MF $(DEPDIR)/libcommon_la-plugrack.Tpo -c -o libcommon_la-plugrack.lo `test -f 'plugrack.c' || echo '$(srcdir)/'`plugrack.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-plugrack.Tpo $(DEPDIR)/libcommon_la-plugrack.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='plugrack.c' object='libcommon_la-plugrack.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-plugrack.lo `test -f 'plugrack.c' || echo '$(srcdir)/'`plugrack.c
+
+libcommon_la-read_config.lo: read_config.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-read_config.lo -MD -MP -MF $(DEPDIR)/libcommon_la-read_config.Tpo -c -o libcommon_la-read_config.lo `test -f 'read_config.c' || echo '$(srcdir)/'`read_config.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-read_config.Tpo $(DEPDIR)/libcommon_la-read_config.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='read_config.c' object='libcommon_la-read_config.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-read_config.lo `test -f 'read_config.c' || echo '$(srcdir)/'`read_config.c
+
+libcommon_la-node_select.lo: node_select.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-node_select.lo -MD -MP -MF $(DEPDIR)/libcommon_la-node_select.Tpo -c -o libcommon_la-node_select.lo `test -f 'node_select.c' || echo '$(srcdir)/'`node_select.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-node_select.Tpo $(DEPDIR)/libcommon_la-node_select.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='node_select.c' object='libcommon_la-node_select.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-node_select.lo `test -f 'node_select.c' || echo '$(srcdir)/'`node_select.c
+
+libcommon_la-env.lo: env.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-env.lo -MD -MP -MF $(DEPDIR)/libcommon_la-env.Tpo -c -o libcommon_la-env.lo `test -f 'env.c' || echo '$(srcdir)/'`env.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-env.Tpo $(DEPDIR)/libcommon_la-env.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='env.c' object='libcommon_la-env.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-env.lo `test -f 'env.c' || echo '$(srcdir)/'`env.c
+
+libcommon_la-slurm_cred.lo: slurm_cred.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-slurm_cred.lo -MD -MP -MF $(DEPDIR)/libcommon_la-slurm_cred.Tpo -c -o libcommon_la-slurm_cred.lo `test -f 'slurm_cred.c' || echo '$(srcdir)/'`slurm_cred.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-slurm_cred.Tpo $(DEPDIR)/libcommon_la-slurm_cred.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='slurm_cred.c' object='libcommon_la-slurm_cred.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-slurm_cred.lo `test -f 'slurm_cred.c' || echo '$(srcdir)/'`slurm_cred.c
+
+libcommon_la-slurm_errno.lo: slurm_errno.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-slurm_errno.lo -MD -MP -MF $(DEPDIR)/libcommon_la-slurm_errno.Tpo -c -o libcommon_la-slurm_errno.lo `test -f 'slurm_errno.c' || echo '$(srcdir)/'`slurm_errno.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-slurm_errno.Tpo $(DEPDIR)/libcommon_la-slurm_errno.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='slurm_errno.c' object='libcommon_la-slurm_errno.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-slurm_errno.lo `test -f 'slurm_errno.c' || echo '$(srcdir)/'`slurm_errno.c
+
+libcommon_la-slurm_protocol_api.lo: slurm_protocol_api.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-slurm_protocol_api.lo -MD -MP -MF $(DEPDIR)/libcommon_la-slurm_protocol_api.Tpo -c -o libcommon_la-slurm_protocol_api.lo `test -f 'slurm_protocol_api.c' || echo '$(srcdir)/'`slurm_protocol_api.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-slurm_protocol_api.Tpo $(DEPDIR)/libcommon_la-slurm_protocol_api.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='slurm_protocol_api.c' object='libcommon_la-slurm_protocol_api.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-slurm_protocol_api.lo `test -f 'slurm_protocol_api.c' || echo '$(srcdir)/'`slurm_protocol_api.c
+
+libcommon_la-slurm_protocol_pack.lo: slurm_protocol_pack.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-slurm_protocol_pack.lo -MD -MP -MF $(DEPDIR)/libcommon_la-slurm_protocol_pack.Tpo -c -o libcommon_la-slurm_protocol_pack.lo `test -f 'slurm_protocol_pack.c' || echo '$(srcdir)/'`slurm_protocol_pack.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-slurm_protocol_pack.Tpo $(DEPDIR)/libcommon_la-slurm_protocol_pack.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='slurm_protocol_pack.c' object='libcommon_la-slurm_protocol_pack.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-slurm_protocol_pack.lo `test -f 'slurm_protocol_pack.c' || echo '$(srcdir)/'`slurm_protocol_pack.c
+
+libcommon_la-slurm_protocol_util.lo: slurm_protocol_util.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-slurm_protocol_util.lo -MD -MP -MF $(DEPDIR)/libcommon_la-slurm_protocol_util.Tpo -c -o libcommon_la-slurm_protocol_util.lo `test -f 'slurm_protocol_util.c' || echo '$(srcdir)/'`slurm_protocol_util.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-slurm_protocol_util.Tpo $(DEPDIR)/libcommon_la-slurm_protocol_util.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='slurm_protocol_util.c' object='libcommon_la-slurm_protocol_util.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-slurm_protocol_util.lo `test -f 'slurm_protocol_util.c' || echo '$(srcdir)/'`slurm_protocol_util.c
+
+libcommon_la-slurm_protocol_socket_implementation.lo: slurm_protocol_socket_implementation.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-slurm_protocol_socket_implementation.lo -MD -MP -MF $(DEPDIR)/libcommon_la-slurm_protocol_socket_implementation.Tpo -c -o libcommon_la-slurm_protocol_socket_implementation.lo `test -f 'slurm_protocol_socket_implementation.c' || echo '$(srcdir)/'`slurm_protocol_socket_implementation.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-slurm_protocol_socket_implementation.Tpo $(DEPDIR)/libcommon_la-slurm_protocol_socket_implementation.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='slurm_protocol_socket_implementation.c' object='libcommon_la-slurm_protocol_socket_implementation.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-slurm_protocol_socket_implementation.lo `test -f 'slurm_protocol_socket_implementation.c' || echo '$(srcdir)/'`slurm_protocol_socket_implementation.c
+
+libcommon_la-slurm_protocol_defs.lo: slurm_protocol_defs.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-slurm_protocol_defs.lo -MD -MP -MF $(DEPDIR)/libcommon_la-slurm_protocol_defs.Tpo -c -o libcommon_la-slurm_protocol_defs.lo `test -f 'slurm_protocol_defs.c' || echo '$(srcdir)/'`slurm_protocol_defs.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-slurm_protocol_defs.Tpo $(DEPDIR)/libcommon_la-slurm_protocol_defs.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='slurm_protocol_defs.c' object='libcommon_la-slurm_protocol_defs.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-slurm_protocol_defs.lo `test -f 'slurm_protocol_defs.c' || echo '$(srcdir)/'`slurm_protocol_defs.c
+
+libcommon_la-slurm_rlimits_info.lo: slurm_rlimits_info.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-slurm_rlimits_info.lo -MD -MP -MF $(DEPDIR)/libcommon_la-slurm_rlimits_info.Tpo -c -o libcommon_la-slurm_rlimits_info.lo `test -f 'slurm_rlimits_info.c' || echo '$(srcdir)/'`slurm_rlimits_info.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-slurm_rlimits_info.Tpo $(DEPDIR)/libcommon_la-slurm_rlimits_info.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='slurm_rlimits_info.c' object='libcommon_la-slurm_rlimits_info.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-slurm_rlimits_info.lo `test -f 'slurm_rlimits_info.c' || echo '$(srcdir)/'`slurm_rlimits_info.c
+
+libcommon_la-uid.lo: uid.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-uid.lo -MD -MP -MF $(DEPDIR)/libcommon_la-uid.Tpo -c -o libcommon_la-uid.lo `test -f 'uid.c' || echo '$(srcdir)/'`uid.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-uid.Tpo $(DEPDIR)/libcommon_la-uid.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='uid.c' object='libcommon_la-uid.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-uid.lo `test -f 'uid.c' || echo '$(srcdir)/'`uid.c
+
+libcommon_la-util-net.lo: util-net.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-util-net.lo -MD -MP -MF $(DEPDIR)/libcommon_la-util-net.Tpo -c -o libcommon_la-util-net.lo `test -f 'util-net.c' || echo '$(srcdir)/'`util-net.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-util-net.Tpo $(DEPDIR)/libcommon_la-util-net.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='util-net.c' object='libcommon_la-util-net.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-util-net.lo `test -f 'util-net.c' || echo '$(srcdir)/'`util-net.c
+
+libcommon_la-slurm_auth.lo: slurm_auth.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-slurm_auth.lo -MD -MP -MF $(DEPDIR)/libcommon_la-slurm_auth.Tpo -c -o libcommon_la-slurm_auth.lo `test -f 'slurm_auth.c' || echo '$(srcdir)/'`slurm_auth.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-slurm_auth.Tpo $(DEPDIR)/libcommon_la-slurm_auth.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='slurm_auth.c' object='libcommon_la-slurm_auth.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-slurm_auth.lo `test -f 'slurm_auth.c' || echo '$(srcdir)/'`slurm_auth.c
+
+libcommon_la-jobacct_common.lo: jobacct_common.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-jobacct_common.lo -MD -MP -MF $(DEPDIR)/libcommon_la-jobacct_common.Tpo -c -o libcommon_la-jobacct_common.lo `test -f 'jobacct_common.c' || echo '$(srcdir)/'`jobacct_common.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-jobacct_common.Tpo $(DEPDIR)/libcommon_la-jobacct_common.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='jobacct_common.c' object='libcommon_la-jobacct_common.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-jobacct_common.lo `test -f 'jobacct_common.c' || echo '$(srcdir)/'`jobacct_common.c
+
+libcommon_la-slurm_jobacct_gather.lo: slurm_jobacct_gather.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-slurm_jobacct_gather.lo -MD -MP -MF $(DEPDIR)/libcommon_la-slurm_jobacct_gather.Tpo -c -o libcommon_la-slurm_jobacct_gather.lo `test -f 'slurm_jobacct_gather.c' || echo '$(srcdir)/'`slurm_jobacct_gather.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-slurm_jobacct_gather.Tpo $(DEPDIR)/libcommon_la-slurm_jobacct_gather.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='slurm_jobacct_gather.c' object='libcommon_la-slurm_jobacct_gather.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-slurm_jobacct_gather.lo `test -f 'slurm_jobacct_gather.c' || echo '$(srcdir)/'`slurm_jobacct_gather.c
+
+libcommon_la-slurm_jobacct_storage.lo: slurm_jobacct_storage.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-slurm_jobacct_storage.lo -MD -MP -MF $(DEPDIR)/libcommon_la-slurm_jobacct_storage.Tpo -c -o libcommon_la-slurm_jobacct_storage.lo `test -f 'slurm_jobacct_storage.c' || echo '$(srcdir)/'`slurm_jobacct_storage.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-slurm_jobacct_storage.Tpo $(DEPDIR)/libcommon_la-slurm_jobacct_storage.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='slurm_jobacct_storage.c' object='libcommon_la-slurm_jobacct_storage.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-slurm_jobacct_storage.lo `test -f 'slurm_jobacct_storage.c' || echo '$(srcdir)/'`slurm_jobacct_storage.c
+
+libcommon_la-slurm_jobcomp.lo: slurm_jobcomp.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-slurm_jobcomp.lo -MD -MP -MF $(DEPDIR)/libcommon_la-slurm_jobcomp.Tpo -c -o libcommon_la-slurm_jobcomp.lo `test -f 'slurm_jobcomp.c' || echo '$(srcdir)/'`slurm_jobcomp.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-slurm_jobcomp.Tpo $(DEPDIR)/libcommon_la-slurm_jobcomp.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='slurm_jobcomp.c' object='libcommon_la-slurm_jobcomp.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-slurm_jobcomp.lo `test -f 'slurm_jobcomp.c' || echo '$(srcdir)/'`slurm_jobcomp.c
+
+libcommon_la-switch.lo: switch.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-switch.lo -MD -MP -MF $(DEPDIR)/libcommon_la-switch.Tpo -c -o libcommon_la-switch.lo `test -f 'switch.c' || echo '$(srcdir)/'`switch.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-switch.Tpo $(DEPDIR)/libcommon_la-switch.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='switch.c' object='libcommon_la-switch.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-switch.lo `test -f 'switch.c' || echo '$(srcdir)/'`switch.c
+
+libcommon_la-arg_desc.lo: arg_desc.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-arg_desc.lo -MD -MP -MF $(DEPDIR)/libcommon_la-arg_desc.Tpo -c -o libcommon_la-arg_desc.lo `test -f 'arg_desc.c' || echo '$(srcdir)/'`arg_desc.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-arg_desc.Tpo $(DEPDIR)/libcommon_la-arg_desc.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='arg_desc.c' object='libcommon_la-arg_desc.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-arg_desc.lo `test -f 'arg_desc.c' || echo '$(srcdir)/'`arg_desc.c
+
+libcommon_la-malloc.lo: malloc.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-malloc.lo -MD -MP -MF $(DEPDIR)/libcommon_la-malloc.Tpo -c -o libcommon_la-malloc.lo `test -f 'malloc.c' || echo '$(srcdir)/'`malloc.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-malloc.Tpo $(DEPDIR)/libcommon_la-malloc.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='malloc.c' object='libcommon_la-malloc.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-malloc.lo `test -f 'malloc.c' || echo '$(srcdir)/'`malloc.c
+
+libcommon_la-getopt.lo: getopt.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-getopt.lo -MD -MP -MF $(DEPDIR)/libcommon_la-getopt.Tpo -c -o libcommon_la-getopt.lo `test -f 'getopt.c' || echo '$(srcdir)/'`getopt.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-getopt.Tpo $(DEPDIR)/libcommon_la-getopt.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='getopt.c' object='libcommon_la-getopt.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-getopt.lo `test -f 'getopt.c' || echo '$(srcdir)/'`getopt.c
+
+libcommon_la-getopt1.lo: getopt1.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-getopt1.lo -MD -MP -MF $(DEPDIR)/libcommon_la-getopt1.Tpo -c -o libcommon_la-getopt1.lo `test -f 'getopt1.c' || echo '$(srcdir)/'`getopt1.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-getopt1.Tpo $(DEPDIR)/libcommon_la-getopt1.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='getopt1.c' object='libcommon_la-getopt1.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-getopt1.lo `test -f 'getopt1.c' || echo '$(srcdir)/'`getopt1.c
+
+libcommon_la-unsetenv.lo: unsetenv.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-unsetenv.lo -MD -MP -MF $(DEPDIR)/libcommon_la-unsetenv.Tpo -c -o libcommon_la-unsetenv.lo `test -f 'unsetenv.c' || echo '$(srcdir)/'`unsetenv.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-unsetenv.Tpo $(DEPDIR)/libcommon_la-unsetenv.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='unsetenv.c' object='libcommon_la-unsetenv.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-unsetenv.lo `test -f 'unsetenv.c' || echo '$(srcdir)/'`unsetenv.c
+
+libcommon_la-slurm_selecttype_info.lo: slurm_selecttype_info.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-slurm_selecttype_info.lo -MD -MP -MF $(DEPDIR)/libcommon_la-slurm_selecttype_info.Tpo -c -o libcommon_la-slurm_selecttype_info.lo `test -f 'slurm_selecttype_info.c' || echo '$(srcdir)/'`slurm_selecttype_info.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-slurm_selecttype_info.Tpo $(DEPDIR)/libcommon_la-slurm_selecttype_info.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='slurm_selecttype_info.c' object='libcommon_la-slurm_selecttype_info.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-slurm_selecttype_info.lo `test -f 'slurm_selecttype_info.c' || echo '$(srcdir)/'`slurm_selecttype_info.c
+
+libcommon_la-slurm_resource_info.lo: slurm_resource_info.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-slurm_resource_info.lo -MD -MP -MF $(DEPDIR)/libcommon_la-slurm_resource_info.Tpo -c -o libcommon_la-slurm_resource_info.lo `test -f 'slurm_resource_info.c' || echo '$(srcdir)/'`slurm_resource_info.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-slurm_resource_info.Tpo $(DEPDIR)/libcommon_la-slurm_resource_info.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='slurm_resource_info.c' object='libcommon_la-slurm_resource_info.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-slurm_resource_info.lo `test -f 'slurm_resource_info.c' || echo '$(srcdir)/'`slurm_resource_info.c
+
+libcommon_la-hostlist.lo: hostlist.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-hostlist.lo -MD -MP -MF $(DEPDIR)/libcommon_la-hostlist.Tpo -c -o libcommon_la-hostlist.lo `test -f 'hostlist.c' || echo '$(srcdir)/'`hostlist.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-hostlist.Tpo $(DEPDIR)/libcommon_la-hostlist.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='hostlist.c' object='libcommon_la-hostlist.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-hostlist.lo `test -f 'hostlist.c' || echo '$(srcdir)/'`hostlist.c
+
+libcommon_la-slurm_step_layout.lo: slurm_step_layout.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-slurm_step_layout.lo -MD -MP -MF $(DEPDIR)/libcommon_la-slurm_step_layout.Tpo -c -o libcommon_la-slurm_step_layout.lo `test -f 'slurm_step_layout.c' || echo '$(srcdir)/'`slurm_step_layout.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-slurm_step_layout.Tpo $(DEPDIR)/libcommon_la-slurm_step_layout.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='slurm_step_layout.c' object='libcommon_la-slurm_step_layout.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-slurm_step_layout.lo `test -f 'slurm_step_layout.c' || echo '$(srcdir)/'`slurm_step_layout.c
+
+libcommon_la-checkpoint.lo: checkpoint.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-checkpoint.lo -MD -MP -MF $(DEPDIR)/libcommon_la-checkpoint.Tpo -c -o libcommon_la-checkpoint.lo `test -f 'checkpoint.c' || echo '$(srcdir)/'`checkpoint.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-checkpoint.Tpo $(DEPDIR)/libcommon_la-checkpoint.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='checkpoint.c' object='libcommon_la-checkpoint.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-checkpoint.lo `test -f 'checkpoint.c' || echo '$(srcdir)/'`checkpoint.c
+
+libcommon_la-parse_time.lo: parse_time.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-parse_time.lo -MD -MP -MF $(DEPDIR)/libcommon_la-parse_time.Tpo -c -o libcommon_la-parse_time.lo `test -f 'parse_time.c' || echo '$(srcdir)/'`parse_time.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-parse_time.Tpo $(DEPDIR)/libcommon_la-parse_time.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='parse_time.c' object='libcommon_la-parse_time.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-parse_time.lo `test -f 'parse_time.c' || echo '$(srcdir)/'`parse_time.c
+
+libcommon_la-job_options.lo: job_options.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-job_options.lo -MD -MP -MF $(DEPDIR)/libcommon_la-job_options.Tpo -c -o libcommon_la-job_options.lo `test -f 'job_options.c' || echo '$(srcdir)/'`job_options.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-job_options.Tpo $(DEPDIR)/libcommon_la-job_options.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='job_options.c' object='libcommon_la-job_options.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-job_options.lo `test -f 'job_options.c' || echo '$(srcdir)/'`job_options.c
+
+libcommon_la-global_defaults.lo: global_defaults.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-global_defaults.lo -MD -MP -MF $(DEPDIR)/libcommon_la-global_defaults.Tpo -c -o libcommon_la-global_defaults.lo `test -f 'global_defaults.c' || echo '$(srcdir)/'`global_defaults.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-global_defaults.Tpo $(DEPDIR)/libcommon_la-global_defaults.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='global_defaults.c' object='libcommon_la-global_defaults.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-global_defaults.lo `test -f 'global_defaults.c' || echo '$(srcdir)/'`global_defaults.c
+
+libcommon_la-timers.lo: timers.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-timers.lo -MD -MP -MF $(DEPDIR)/libcommon_la-timers.Tpo -c -o libcommon_la-timers.lo `test -f 'timers.c' || echo '$(srcdir)/'`timers.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-timers.Tpo $(DEPDIR)/libcommon_la-timers.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='timers.c' object='libcommon_la-timers.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-timers.lo `test -f 'timers.c' || echo '$(srcdir)/'`timers.c
+
+libcommon_la-stepd_api.lo: stepd_api.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-stepd_api.lo -MD -MP -MF $(DEPDIR)/libcommon_la-stepd_api.Tpo -c -o libcommon_la-stepd_api.lo `test -f 'stepd_api.c' || echo '$(srcdir)/'`stepd_api.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-stepd_api.Tpo $(DEPDIR)/libcommon_la-stepd_api.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='stepd_api.c' object='libcommon_la-stepd_api.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-stepd_api.lo `test -f 'stepd_api.c' || echo '$(srcdir)/'`stepd_api.c
+
+libcommon_la-proc_args.lo: proc_args.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -MT libcommon_la-proc_args.lo -MD -MP -MF $(DEPDIR)/libcommon_la-proc_args.Tpo -c -o libcommon_la-proc_args.lo `test -f 'proc_args.c' || echo '$(srcdir)/'`proc_args.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcommon_la-proc_args.Tpo $(DEPDIR)/libcommon_la-proc_args.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='proc_args.c' object='libcommon_la-proc_args.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_la_CFLAGS) $(CFLAGS) -c -o libcommon_la-proc_args.lo `test -f 'proc_args.c' || echo '$(srcdir)/'`proc_args.c
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
diff --git a/src/common/jobacct_common.c b/src/common/jobacct_common.c
index 4397ee46d153d107f3ba725390ea83a2c597cc17..32725600b19269327477b86287499fed2d502011 100644
--- a/src/common/jobacct_common.c
+++ b/src/common/jobacct_common.c
@@ -120,7 +120,9 @@ extern void free_jobacct_header(void *object)
 	jobacct_header_t *header = (jobacct_header_t *)object;
 	if(header) {
 		xfree(header->partition);
+#ifdef HAVE_BG
 		xfree(header->blockid);
+#endif
 	}
 }
 
diff --git a/src/common/jobacct_common.h b/src/common/jobacct_common.h
index 8f1024237b7597c726fdfa47738ca1eb30bd1ad1..3176fda3b24c18d55308b1215c763bd15618a3d5 100644
--- a/src/common/jobacct_common.h
+++ b/src/common/jobacct_common.h
@@ -112,7 +112,9 @@ typedef struct {
 typedef struct header {
 	uint32_t jobnum;
 	char	*partition;
+#ifdef HAVE_BG
 	char	*blockid;
+#endif
 	time_t 	job_submit;
 	time_t	timestamp;
 	uint32_t uid;
diff --git a/src/common/mysql_common.h b/src/common/mysql_common.h
index 1aaba0937c366c7f996d0b59ab29eb9841825117..9cbaf1425465e1ea69fa946a46ec5cb32ab84c6f 100644
--- a/src/common/mysql_common.h
+++ b/src/common/mysql_common.h
@@ -57,8 +57,8 @@
 #include "src/common/xstring.h"
 
 #ifdef HAVE_MYSQL
-#include <mysql/mysql.h>
-#include <mysql/mysqld_error.h>
+#include <mysql.h>
+#include <mysqld_error.h>
 
 typedef struct {
 	uint32_t port;	
diff --git a/src/common/slurm_jobcomp.c b/src/common/slurm_jobcomp.c
index 267dbff57816e7fa5bba684a85a31ad2c7db845d..f410aa429be86bcf92605cf2f97b0f07fdc38c50 100644
--- a/src/common/slurm_jobcomp.c
+++ b/src/common/slurm_jobcomp.c
@@ -199,7 +199,6 @@ jobcomp_destroy_job(void *object)
 	jobcomp_job_rec_t *job = (jobcomp_job_rec_t *)object;
 	if (job) {
 		xfree(job->partition);
-		xfree(job->blockid);
 		xfree(job->start_time);
 		xfree(job->end_time);
 		xfree(job->uid_name);
@@ -208,11 +207,14 @@ jobcomp_destroy_job(void *object)
 		xfree(job->jobname);
 		xfree(job->state);
 		xfree(job->timelimit);
+#ifdef HAVE_BG
+		xfree(job->blockid);
 		xfree(job->connection);
 		xfree(job->reboot);
 		xfree(job->rotate);
 		xfree(job->geo);
 		xfree(job->bg_start_point);
+#endif
 		xfree(job);
 	}
 }
diff --git a/src/common/slurm_jobcomp.h b/src/common/slurm_jobcomp.h
index 6723a8827204693a7e0dc15279bb7f05c3fc59e7..95ef8f1bbb6f7461099fe3887cf2a20a7777ba4c 100644
--- a/src/common/slurm_jobcomp.h
+++ b/src/common/slurm_jobcomp.h
@@ -57,7 +57,6 @@
 typedef struct {
 	uint32_t jobid;
 	char *partition;
-	char *blockid;
 	char *start_time;
 	char *end_time;
 	uint32_t uid;
@@ -69,12 +68,15 @@ typedef struct {
 	char *jobname;
 	char *state;
 	char *timelimit;
+#ifdef HAVE_BG
+	char *blockid;
 	char *connection;
 	char *reboot;
 	char *rotate;
 	uint32_t max_procs;
 	char *geo;
 	char *bg_start_point;
+#endif
 } jobcomp_job_rec_t;
 
 typedef struct slurm_jobcomp_context * slurm_jobcomp_context_t;
diff --git a/src/plugins/Makefile.in b/src/plugins/Makefile.in
index 1c75ad885ab8dc478a5590d7bafe949212b29bed..2224a33012cfb26b59f9c8ee34de30dec5a9491b 100644
--- a/src/plugins/Makefile.in
+++ b/src/plugins/Makefile.in
@@ -113,6 +113,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -138,6 +139,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/auth/Makefile.in b/src/plugins/auth/Makefile.in
index 1a8be5fb3d556d58ff2b3b68e121c55877d6ee0e..04a5a57fab40c09f313eb64b469fbb7d945fe2cf 100644
--- a/src/plugins/auth/Makefile.in
+++ b/src/plugins/auth/Makefile.in
@@ -115,6 +115,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -140,6 +141,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/auth/authd/Makefile.in b/src/plugins/auth/authd/Makefile.in
index 8f6d95424e1e897a43eb70ba1aa49b423a3082ab..3b272db293900d04c440ee1e512490ac50152322 100644
--- a/src/plugins/auth/authd/Makefile.in
+++ b/src/plugins/auth/authd/Makefile.in
@@ -134,6 +134,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -159,6 +160,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/auth/munge/Makefile.in b/src/plugins/auth/munge/Makefile.in
index dd9c95dbec86940687c90124e3078687ce3b71b8..fde2856d541a8b904d2103db7ca6e84f7481a096 100644
--- a/src/plugins/auth/munge/Makefile.in
+++ b/src/plugins/auth/munge/Makefile.in
@@ -135,6 +135,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -160,6 +161,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/auth/none/Makefile.in b/src/plugins/auth/none/Makefile.in
index abbfe2d07b302d1011f8f7df104acd44d1cd1fc4..d7f1b4f0d45c2fdb700227efe6e988eef8d26f8c 100644
--- a/src/plugins/auth/none/Makefile.in
+++ b/src/plugins/auth/none/Makefile.in
@@ -133,6 +133,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -158,6 +159,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/checkpoint/Makefile.in b/src/plugins/checkpoint/Makefile.in
index 97b43e4c0179f8bfecb8faa4a3e237e2b2211c4c..c7d135a376685eb4996f78bf18d6cd65553fe7de 100644
--- a/src/plugins/checkpoint/Makefile.in
+++ b/src/plugins/checkpoint/Makefile.in
@@ -115,6 +115,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -140,6 +141,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/checkpoint/aix/Makefile.in b/src/plugins/checkpoint/aix/Makefile.in
index a81c96d3d168b5fbc91e8965b93f108ae8d7a564..8bd48df924e8e20f3e43413ed817e9f6ebdc9a9c 100644
--- a/src/plugins/checkpoint/aix/Makefile.in
+++ b/src/plugins/checkpoint/aix/Makefile.in
@@ -138,6 +138,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -163,6 +164,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/checkpoint/none/Makefile.in b/src/plugins/checkpoint/none/Makefile.in
index 96c38d4a4108f5bbc82c92c96c86a2458b8bd111..e4882c7ed487e6941535cf1c591751853fad88cd 100644
--- a/src/plugins/checkpoint/none/Makefile.in
+++ b/src/plugins/checkpoint/none/Makefile.in
@@ -133,6 +133,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -158,6 +159,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/checkpoint/ompi/Makefile.in b/src/plugins/checkpoint/ompi/Makefile.in
index cc3a77a5b78013ac7548e67a82a6c9656f113558..5264b21b7229c32fdf0b73ff981e933798f7f583 100644
--- a/src/plugins/checkpoint/ompi/Makefile.in
+++ b/src/plugins/checkpoint/ompi/Makefile.in
@@ -133,6 +133,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -158,6 +159,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/checkpoint/xlch/Makefile.in b/src/plugins/checkpoint/xlch/Makefile.in
index 92d19602e1e5102011f2a980d066d795075f2c40..32c8f82731449abb6d45a7ab3bcb7a5a031aceff 100644
--- a/src/plugins/checkpoint/xlch/Makefile.in
+++ b/src/plugins/checkpoint/xlch/Makefile.in
@@ -133,6 +133,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -158,6 +159,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/crypto/Makefile.in b/src/plugins/crypto/Makefile.in
index bfbdefc44312a5a95794d451629ceef735098078..fdf61a89095b7e965ec11ad7ff6ff95e0d70af52 100644
--- a/src/plugins/crypto/Makefile.in
+++ b/src/plugins/crypto/Makefile.in
@@ -115,6 +115,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -140,6 +141,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/crypto/munge/Makefile.in b/src/plugins/crypto/munge/Makefile.in
index 52b9ea7868673c8b7f9d8e56d7d97984694dd4c1..89def915bc877cb93a42212f1f40307be1062d81 100644
--- a/src/plugins/crypto/munge/Makefile.in
+++ b/src/plugins/crypto/munge/Makefile.in
@@ -135,6 +135,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -160,6 +161,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/crypto/openssl/Makefile.in b/src/plugins/crypto/openssl/Makefile.in
index 68f923a4c88e2560e78c1966d90c9acd30b44c82..79a80170160a6b3e82f272d03dfbbbcc36a69c4f 100644
--- a/src/plugins/crypto/openssl/Makefile.in
+++ b/src/plugins/crypto/openssl/Makefile.in
@@ -141,6 +141,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -166,6 +167,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/jobacct_gather/Makefile.in b/src/plugins/jobacct_gather/Makefile.in
index be2cf6ec470b7ff95535714793d05f19042311a9..1fe83ede85844afcd7a02b719fb28f62b99d3bc1 100644
--- a/src/plugins/jobacct_gather/Makefile.in
+++ b/src/plugins/jobacct_gather/Makefile.in
@@ -115,6 +115,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -140,6 +141,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/jobacct_gather/aix/Makefile.in b/src/plugins/jobacct_gather/aix/Makefile.in
index 3b3ec6d96e37411e9c84df15ef5fa64965a7ef98..6cb688d9617216390c23c0f4d5ed240515b084e8 100644
--- a/src/plugins/jobacct_gather/aix/Makefile.in
+++ b/src/plugins/jobacct_gather/aix/Makefile.in
@@ -134,6 +134,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -159,6 +160,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/jobacct_gather/linux/Makefile.in b/src/plugins/jobacct_gather/linux/Makefile.in
index d42de0a9b96d29d207919d48c341d0c490783f4d..60563e5de4621193b50bdd512021fdfc9b90baeb 100644
--- a/src/plugins/jobacct_gather/linux/Makefile.in
+++ b/src/plugins/jobacct_gather/linux/Makefile.in
@@ -136,6 +136,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -161,6 +162,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/jobacct_gather/none/Makefile.in b/src/plugins/jobacct_gather/none/Makefile.in
index 4ab2d4a2f61ea1e04e8909a303f7a8621d3e6169..078d2dd077a9756f415311aaadd10382741c8f65 100644
--- a/src/plugins/jobacct_gather/none/Makefile.in
+++ b/src/plugins/jobacct_gather/none/Makefile.in
@@ -133,6 +133,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -158,6 +159,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/jobacct_storage/Makefile.in b/src/plugins/jobacct_storage/Makefile.in
index 6cab965a918c5282fd67e8d931e45e8fe2b46bc1..c5aecb80f3c6528411c9ae7c8bf2195a27019ef9 100644
--- a/src/plugins/jobacct_storage/Makefile.in
+++ b/src/plugins/jobacct_storage/Makefile.in
@@ -115,6 +115,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -140,6 +141,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/jobacct_storage/filetxt/Makefile.in b/src/plugins/jobacct_storage/filetxt/Makefile.in
index e90f53ee60464a4c4ec0f33a60cf3ad652fea7ac..b5d91994c92a2abb5d501e32758cfaf07879a93a 100644
--- a/src/plugins/jobacct_storage/filetxt/Makefile.in
+++ b/src/plugins/jobacct_storage/filetxt/Makefile.in
@@ -137,6 +137,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -162,6 +163,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/jobacct_storage/filetxt/filetxt_jobacct_process.c b/src/plugins/jobacct_storage/filetxt/filetxt_jobacct_process.c
index 50f6e1f59cdd9810acb37a316edfc03a3538dc4c..94bf55c58abdfc3bf7f0fcdd21be1cb8431b4bac 100644
--- a/src/plugins/jobacct_storage/filetxt/filetxt_jobacct_process.c
+++ b/src/plugins/jobacct_storage/filetxt/filetxt_jobacct_process.c
@@ -431,7 +431,9 @@ static int _parse_header(char *f[], jobacct_header_t *header)
 	header->timestamp = atoi(f[F_TIMESTAMP]);
 	header->uid = atoi(f[F_UID]);
 	header->gid = atoi(f[F_GID]);
+#ifdef HAVE_BG
 	header->blockid = xstrdup(f[F_BLOCKID]);
+#endif
 	return SLURM_SUCCESS;
 }
 
diff --git a/src/plugins/jobacct_storage/mysql/Makefile.am b/src/plugins/jobacct_storage/mysql/Makefile.am
index bf7e84d772797150ecad534f6f08366cce20ec49..d701b8d4267b020b65f6cc2a006b3ccab457162d 100644
--- a/src/plugins/jobacct_storage/mysql/Makefile.am
+++ b/src/plugins/jobacct_storage/mysql/Makefile.am
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic $(MYSQL_LIBS)
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
 
@@ -12,5 +12,7 @@ pkglib_LTLIBRARIES = jobacct_storage_mysql.la
 jobacct_storage_mysql_la_SOURCES = jobacct_storage_mysql.c \
 		mysql_jobacct_process.c mysql_jobacct_process.h 
 jobacct_storage_mysql_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
+jobacct_storage_mysql_la_LIBS = $(MYSQL_LIBS)
+jobacct_storage_mysql_la_CFLAGS = $(MYSQL_CFLAGS)
 jobacct_storage_mysql_la_LIBADD  = $(top_builddir)/src/common/libcommon.la
 
diff --git a/src/plugins/jobacct_storage/mysql/Makefile.in b/src/plugins/jobacct_storage/mysql/Makefile.in
index 706b15e7a8d21846b37ffacbde51a02d5a86f038..eff0d9edac517a1e3c2f0e99e49f0e4b28751055 100644
--- a/src/plugins/jobacct_storage/mysql/Makefile.in
+++ b/src/plugins/jobacct_storage/mysql/Makefile.in
@@ -76,12 +76,14 @@ pkglibLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 jobacct_storage_mysql_la_DEPENDENCIES =  \
 	$(top_builddir)/src/common/libcommon.la
-am_jobacct_storage_mysql_la_OBJECTS = jobacct_storage_mysql.lo \
-	mysql_jobacct_process.lo
+am_jobacct_storage_mysql_la_OBJECTS =  \
+	jobacct_storage_mysql_la-jobacct_storage_mysql.lo \
+	jobacct_storage_mysql_la-mysql_jobacct_process.lo
 jobacct_storage_mysql_la_OBJECTS =  \
 	$(am_jobacct_storage_mysql_la_OBJECTS)
 jobacct_storage_mysql_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(jobacct_storage_mysql_la_CFLAGS) $(CFLAGS) \
 	$(jobacct_storage_mysql_la_LDFLAGS) $(LDFLAGS) -o $@
 DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/slurm@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/auxdir/depcomp
@@ -136,6 +138,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -161,6 +164,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
@@ -263,7 +267,7 @@ target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic $(MYSQL_LIBS)
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
 pkglib_LTLIBRARIES = jobacct_storage_mysql.la
 
@@ -272,6 +276,8 @@ jobacct_storage_mysql_la_SOURCES = jobacct_storage_mysql.c \
 		mysql_jobacct_process.c mysql_jobacct_process.h 
 
 jobacct_storage_mysql_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
+jobacct_storage_mysql_la_LIBS = $(MYSQL_LIBS)
+jobacct_storage_mysql_la_CFLAGS = $(MYSQL_CFLAGS)
 jobacct_storage_mysql_la_LIBADD = $(top_builddir)/src/common/libcommon.la
 all: all-am
 
@@ -342,8 +348,8 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobacct_storage_mysql.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mysql_jobacct_process.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobacct_storage_mysql_la-jobacct_storage_mysql.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobacct_storage_mysql_la-mysql_jobacct_process.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -366,6 +372,20 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
+jobacct_storage_mysql_la-jobacct_storage_mysql.lo: jobacct_storage_mysql.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(jobacct_storage_mysql_la_CFLAGS) $(CFLAGS) -MT jobacct_storage_mysql_la-jobacct_storage_mysql.lo -MD -MP -MF $(DEPDIR)/jobacct_storage_mysql_la-jobacct_storage_mysql.Tpo -c -o jobacct_storage_mysql_la-jobacct_storage_mysql.lo `test -f 'jobacct_storage_mysql.c' || echo '$(srcdir)/'`jobacct_storage_mysql.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/jobacct_storage_mysql_la-jobacct_storage_mysql.Tpo $(DEPDIR)/jobacct_storage_mysql_la-jobacct_storage_mysql.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='jobacct_storage_mysql.c' object='jobacct_storage_mysql_la-jobacct_storage_mysql.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(jobacct_storage_mysql_la_CFLAGS) $(CFLAGS) -c -o jobacct_storage_mysql_la-jobacct_storage_mysql.lo `test -f 'jobacct_storage_mysql.c' || echo '$(srcdir)/'`jobacct_storage_mysql.c
+
+jobacct_storage_mysql_la-mysql_jobacct_process.lo: mysql_jobacct_process.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(jobacct_storage_mysql_la_CFLAGS) $(CFLAGS) -MT jobacct_storage_mysql_la-mysql_jobacct_process.lo -MD -MP -MF $(DEPDIR)/jobacct_storage_mysql_la-mysql_jobacct_process.Tpo -c -o jobacct_storage_mysql_la-mysql_jobacct_process.lo `test -f 'mysql_jobacct_process.c' || echo '$(srcdir)/'`mysql_jobacct_process.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/jobacct_storage_mysql_la-mysql_jobacct_process.Tpo $(DEPDIR)/jobacct_storage_mysql_la-mysql_jobacct_process.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mysql_jobacct_process.c' object='jobacct_storage_mysql_la-mysql_jobacct_process.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(jobacct_storage_mysql_la_CFLAGS) $(CFLAGS) -c -o jobacct_storage_mysql_la-mysql_jobacct_process.lo `test -f 'mysql_jobacct_process.c' || echo '$(srcdir)/'`mysql_jobacct_process.c
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
diff --git a/src/plugins/jobacct_storage/mysql/jobacct_storage_mysql.c b/src/plugins/jobacct_storage/mysql/jobacct_storage_mysql.c
index 554ec9fb7fb670a8261a508f73f81a3c0dd5d480..6548a1fddbb12997f1277ad07346217a458ad157 100644
--- a/src/plugins/jobacct_storage/mysql/jobacct_storage_mysql.c
+++ b/src/plugins/jobacct_storage/mysql/jobacct_storage_mysql.c
@@ -103,7 +103,9 @@ static int _mysql_jobacct_check_tables()
 		{ "submit", "int unsigned not null" },
 		{ "uid", "smallint unsigned not null" },
 		{ "gid", "smallint unsigned not null" },
+#ifdef HAVE_BG
 		{ "blockid", "tinytext" },
+#endif
 		{ NULL, NULL}		
 	};
 
@@ -316,7 +318,9 @@ extern int jobacct_storage_p_job_start(struct job_record *job_ptr)
 	char	*jname, *account, *nodes;
 	long	priority;
 	int track_steps = 0;
+#ifdef HAVE_BG
 	char *block_id = NULL;
+#endif
 	char query[1024];
 	int reinit = 0;
 
@@ -357,18 +361,29 @@ extern int jobacct_storage_p_job_start(struct job_record *job_ptr)
 			     &block_id);
 		
 #endif
-	if(!block_id)
-		block_id = xstrdup("-");
 
 	job_ptr->requid = -1; /* force to -1 for sacct to know this
 			       * hasn't been set yet */
 	snprintf(query, sizeof(query),
-		 "insert into %s (jobid, partition, submit, uid, gid, "
-		 "blockid) values (%u, '%s', %u, %d, %d, '%s')",
+		 "insert into %s (jobid, partition, submit, uid, gid"
+#ifdef HAVE_BG
+		 ", blockid"
+#endif
+		 ") values (%u, '%s', %u, %d, %d"
+#ifdef HAVE_BG
+		 ", '%s'"
+#endif
+		 ")",
 		 job_index, job_ptr->job_id, job_ptr->partition,
 		 (int)job_ptr->details->submit_time, job_ptr->user_id,
-		 job_ptr->group_id, block_id);
+		 job_ptr->group_id
+#ifdef HAVE_BG
+		 , block_id
+#endif
+		);
+#ifdef HAVE_BG
 	xfree(block_id);
+#endif
 
 try_again:
 	if((job_ptr->db_index =
diff --git a/src/plugins/jobacct_storage/mysql/mysql_jobacct_process.c b/src/plugins/jobacct_storage/mysql/mysql_jobacct_process.c
index c9edcb834d852a374ce70413074656f7e8fd955c..3937d7a35e686ef80b739f5979e061ca5ce4551f 100644
--- a/src/plugins/jobacct_storage/mysql/mysql_jobacct_process.c
+++ b/src/plugins/jobacct_storage/mysql/mysql_jobacct_process.c
@@ -84,7 +84,9 @@ extern void mysql_jobacct_process_get_jobs(List job_list,
 		"t2.suspended",
 		"t1.uid",
 		"t1.gid",
+#ifdef HAVE_BG
 		"t1.blockid",
+#endif
 		"t2.name",
 		"t2.track_steps",
 		"t2.state",
@@ -156,7 +158,9 @@ extern void mysql_jobacct_process_get_jobs(List job_list,
 		JOB_REQ_SUSPENDED,
 		JOB_REQ_UID,
 		JOB_REQ_GID,
+#ifdef HAVE_BG
 		JOB_REQ_BLOCKID,
+#endif
 		JOB_REQ_NAME,
 		JOB_REQ_TRACKSTEPS,
 		JOB_REQ_STATE,
@@ -285,8 +289,9 @@ extern void mysql_jobacct_process_get_jobs(List job_list,
 		header.timestamp = atoi(row[JOB_REQ_START]);
 		header.uid = atoi(row[JOB_REQ_UID]);
 		header.gid = atoi(row[JOB_REQ_GID]);
+#ifdef HAVE_BG
 		header.blockid = xstrdup(row[JOB_REQ_BLOCKID]);
-
+#endif
 		job = create_jobacct_job_rec(header);
 		job->show_full = 1;
 		job->status = atoi(row[JOB_REQ_STATE]);
@@ -366,7 +371,9 @@ extern void mysql_jobacct_process_get_jobs(List job_list,
 			   freed later.
 			*/
 			header.partition = xstrdup(row[JOB_REQ_PARTITION]);
+#ifdef HAVE_BG
 			header.blockid = xstrdup(row[JOB_REQ_BLOCKID]);
+#endif
 			header.timestamp = atoi(step_row[STEP_REQ_START]);
 			/* set start of job if not set */
 			if(job->header.timestamp < header.timestamp) {
diff --git a/src/plugins/jobacct_storage/none/Makefile.in b/src/plugins/jobacct_storage/none/Makefile.in
index 6308ad519f0b99c9ee8cc458f282432f73400d92..fb1bb5c5f984c28f9806241e478f76da5095141e 100644
--- a/src/plugins/jobacct_storage/none/Makefile.in
+++ b/src/plugins/jobacct_storage/none/Makefile.in
@@ -134,6 +134,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -159,6 +160,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/jobacct_storage/pgsql/Makefile.am b/src/plugins/jobacct_storage/pgsql/Makefile.am
index 4abe4b228b5295e323a69d833d16fcf2b2cff40e..3712764b6dddce94a721388aac434216e74b7e19 100644
--- a/src/plugins/jobacct_storage/pgsql/Makefile.am
+++ b/src/plugins/jobacct_storage/pgsql/Makefile.am
@@ -3,7 +3,7 @@
 CPPFLAGS = $(PGSQL_CFLAGS)
 AUTOMAKE_OPTIONS = foreign
 
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic $(PGSQL_LIBS)
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
 
@@ -13,5 +13,7 @@ pkglib_LTLIBRARIES = jobacct_storage_pgsql.la
 jobacct_storage_pgsql_la_SOURCES = jobacct_storage_pgsql.c \
 		pgsql_jobacct_process.c pgsql_jobacct_process.h 
 jobacct_storage_pgsql_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
+jobacct_storage_pgsql_la_LIBS = $(PGSQL_LIBS)
+jobacct_storage_pgsql_la_CFLAGS = $(PGSQL_CFLAGS)
 jobacct_storage_pgsql_la_LIBADD  = $(top_builddir)/src/common/libcommon.la
 
diff --git a/src/plugins/jobacct_storage/pgsql/Makefile.in b/src/plugins/jobacct_storage/pgsql/Makefile.in
index 5ac9a9367655375e9aaf57b1bdd54862a64b1d8f..c0d018c1314783710b0fd221e4e0a70ddfa8a34e 100644
--- a/src/plugins/jobacct_storage/pgsql/Makefile.in
+++ b/src/plugins/jobacct_storage/pgsql/Makefile.in
@@ -76,12 +76,14 @@ pkglibLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 jobacct_storage_pgsql_la_DEPENDENCIES =  \
 	$(top_builddir)/src/common/libcommon.la
-am_jobacct_storage_pgsql_la_OBJECTS = jobacct_storage_pgsql.lo \
-	pgsql_jobacct_process.lo
+am_jobacct_storage_pgsql_la_OBJECTS =  \
+	jobacct_storage_pgsql_la-jobacct_storage_pgsql.lo \
+	jobacct_storage_pgsql_la-pgsql_jobacct_process.lo
 jobacct_storage_pgsql_la_OBJECTS =  \
 	$(am_jobacct_storage_pgsql_la_OBJECTS)
 jobacct_storage_pgsql_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(jobacct_storage_pgsql_la_CFLAGS) $(CFLAGS) \
 	$(jobacct_storage_pgsql_la_LDFLAGS) $(LDFLAGS) -o $@
 DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/slurm@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/auxdir/depcomp
@@ -136,6 +138,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -161,6 +164,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
@@ -263,7 +267,7 @@ target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic $(PGSQL_LIBS)
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
 pkglib_LTLIBRARIES = jobacct_storage_pgsql.la
 
@@ -272,6 +276,8 @@ jobacct_storage_pgsql_la_SOURCES = jobacct_storage_pgsql.c \
 		pgsql_jobacct_process.c pgsql_jobacct_process.h 
 
 jobacct_storage_pgsql_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
+jobacct_storage_pgsql_la_LIBS = $(PGSQL_LIBS)
+jobacct_storage_pgsql_la_CFLAGS = $(PGSQL_CFLAGS)
 jobacct_storage_pgsql_la_LIBADD = $(top_builddir)/src/common/libcommon.la
 all: all-am
 
@@ -342,8 +348,8 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobacct_storage_pgsql.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pgsql_jobacct_process.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobacct_storage_pgsql_la-jobacct_storage_pgsql.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobacct_storage_pgsql_la-pgsql_jobacct_process.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -366,6 +372,20 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
+jobacct_storage_pgsql_la-jobacct_storage_pgsql.lo: jobacct_storage_pgsql.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(jobacct_storage_pgsql_la_CFLAGS) $(CFLAGS) -MT jobacct_storage_pgsql_la-jobacct_storage_pgsql.lo -MD -MP -MF $(DEPDIR)/jobacct_storage_pgsql_la-jobacct_storage_pgsql.Tpo -c -o jobacct_storage_pgsql_la-jobacct_storage_pgsql.lo `test -f 'jobacct_storage_pgsql.c' || echo '$(srcdir)/'`jobacct_storage_pgsql.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/jobacct_storage_pgsql_la-jobacct_storage_pgsql.Tpo $(DEPDIR)/jobacct_storage_pgsql_la-jobacct_storage_pgsql.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='jobacct_storage_pgsql.c' object='jobacct_storage_pgsql_la-jobacct_storage_pgsql.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(jobacct_storage_pgsql_la_CFLAGS) $(CFLAGS) -c -o jobacct_storage_pgsql_la-jobacct_storage_pgsql.lo `test -f 'jobacct_storage_pgsql.c' || echo '$(srcdir)/'`jobacct_storage_pgsql.c
+
+jobacct_storage_pgsql_la-pgsql_jobacct_process.lo: pgsql_jobacct_process.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(jobacct_storage_pgsql_la_CFLAGS) $(CFLAGS) -MT jobacct_storage_pgsql_la-pgsql_jobacct_process.lo -MD -MP -MF $(DEPDIR)/jobacct_storage_pgsql_la-pgsql_jobacct_process.Tpo -c -o jobacct_storage_pgsql_la-pgsql_jobacct_process.lo `test -f 'pgsql_jobacct_process.c' || echo '$(srcdir)/'`pgsql_jobacct_process.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/jobacct_storage_pgsql_la-pgsql_jobacct_process.Tpo $(DEPDIR)/jobacct_storage_pgsql_la-pgsql_jobacct_process.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pgsql_jobacct_process.c' object='jobacct_storage_pgsql_la-pgsql_jobacct_process.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(jobacct_storage_pgsql_la_CFLAGS) $(CFLAGS) -c -o jobacct_storage_pgsql_la-pgsql_jobacct_process.lo `test -f 'pgsql_jobacct_process.c' || echo '$(srcdir)/'`pgsql_jobacct_process.c
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
diff --git a/src/plugins/jobacct_storage/pgsql/jobacct_storage_pgsql.c b/src/plugins/jobacct_storage/pgsql/jobacct_storage_pgsql.c
index 47f5bfbac4f39b9648ea3a79ebb66549378e35b2..3aa1307e6fb2392fb2163160030cb0782d10d2c3 100644
--- a/src/plugins/jobacct_storage/pgsql/jobacct_storage_pgsql.c
+++ b/src/plugins/jobacct_storage/pgsql/jobacct_storage_pgsql.c
@@ -104,7 +104,9 @@ static int _pgsql_jobacct_check_tables(char *user)
 		{ "submit", "bigint not null" },
 		{ "uid", "smallint not null" },
 		{ "gid", "smallint not null" },
+#ifdef HAVE_BG
 		{ "blockid", "text" },
+#endif
 		{ NULL, NULL}		
 	};
 
@@ -375,7 +377,9 @@ extern int jobacct_storage_p_job_start(struct job_record *job_ptr)
 	char	*jname, *account, *nodes;
 	long	priority;
 	int track_steps = 0;
+#ifdef HAVE_BG
 	char *block_id = NULL;
+#endif
 	char query[1024];
 	int reinit = 0;
 
@@ -416,18 +420,29 @@ extern int jobacct_storage_p_job_start(struct job_record *job_ptr)
 			     &block_id);
 		
 #endif
-	if(!block_id)
-		block_id = xstrdup("-");
 
 	job_ptr->requid = -1; /* force to -1 for sacct to know this
 			       * hasn't been set yet */
 	snprintf(query, sizeof(query),
-		 "insert into %s (jobid, partition, submit, uid, gid, "
-		 "blockid) values (%u, '%s', %u, %d, %d, '%s')",
+		 "insert into %s (jobid, partition, submit, uid, gid"
+#ifdef HAVE_BG
+		 ", blockid"
+#endif
+		 ") values (%u, '%s', %u, %d, %d"
+#ifdef HAVE_BG
+		 ", '%s'"
+#endif
+		 ")",
 		 index_table, job_ptr->job_id, job_ptr->partition,
 		 (int)job_ptr->details->submit_time, job_ptr->user_id,
-		 job_ptr->group_id, block_id);
+		 job_ptr->group_id
+#ifdef HAVE_BG
+		 , block_id
+#endif
+		);
+#ifdef HAVE_BG
 	xfree(block_id);
+#endif
 
 try_again:
 	if((job_ptr->db_index = pgsql_insert_ret_id(
diff --git a/src/plugins/jobacct_storage/pgsql/pgsql_jobacct_process.c b/src/plugins/jobacct_storage/pgsql/pgsql_jobacct_process.c
index 49ff767a5e9224f38066d3b0c0735dfa1b35c83f..1c84ad91eabb7b546094ba7cce9eeda33ba20402 100644
--- a/src/plugins/jobacct_storage/pgsql/pgsql_jobacct_process.c
+++ b/src/plugins/jobacct_storage/pgsql/pgsql_jobacct_process.c
@@ -82,7 +82,9 @@ extern void pgsql_jobacct_process_get_jobs(List job_list,
 		"t2.suspended",
 		"t1.uid",
 		"t1.gid",
+#ifdef HAVE_BG
 		"t1.blockid",
+#endif
 		"t2.name",
 		"t2.track_steps",
 		"t2.state",
@@ -154,7 +156,9 @@ extern void pgsql_jobacct_process_get_jobs(List job_list,
 		JOB_REQ_SUSPENDED,
 		JOB_REQ_UID,
 		JOB_REQ_GID,
+#ifdef HAVE_BG
 		JOB_REQ_BLOCKID,
+#endif
 		JOB_REQ_NAME,
 		JOB_REQ_TRACKSTEPS,
 		JOB_REQ_STATE,
@@ -285,9 +289,10 @@ extern void pgsql_jobacct_process_get_jobs(List job_list,
 		header.timestamp = atoi(PQgetvalue(result, i, JOB_REQ_START));
 		header.uid = atoi(PQgetvalue(result, i, JOB_REQ_UID));
 		header.gid = atoi(PQgetvalue(result, i, JOB_REQ_GID));
+#ifdef HAVE_BG
 		header.blockid = xstrdup(PQgetvalue(result, i,
 						    JOB_REQ_BLOCKID));
-
+#endif
 		job = create_jobacct_job_rec(header);
 		job->show_full = 1;
 		job->status = atoi(PQgetvalue(result, i, JOB_REQ_STATE));
@@ -368,8 +373,10 @@ extern void pgsql_jobacct_process_get_jobs(List job_list,
 			*/
 			header.partition = xstrdup(
 				PQgetvalue(result, j, JOB_REQ_PARTITION));
+#ifdef HAVE_BG
 			header.blockid = xstrdup(
 				PQgetvalue(result, j, JOB_REQ_BLOCKID));
+#endif
 			header.timestamp = atoi(
 				PQgetvalue(step_result, j, STEP_REQ_START));
 			/* set start of job if not set */
diff --git a/src/plugins/jobcomp/Makefile.in b/src/plugins/jobcomp/Makefile.in
index 24736d25c254e55cba82ab26abbf950bb43d69a8..f0d20afdd25e0bb399770c74f1b1bf171f21cf6f 100644
--- a/src/plugins/jobcomp/Makefile.in
+++ b/src/plugins/jobcomp/Makefile.in
@@ -115,6 +115,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -140,6 +141,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/jobcomp/filetxt/Makefile.in b/src/plugins/jobcomp/filetxt/Makefile.in
index a21251b9e9a88193c7d2058c8cf2bab3b18823c7..d3c37428fe37c52a5f11bd298d299df4c074470e 100644
--- a/src/plugins/jobcomp/filetxt/Makefile.in
+++ b/src/plugins/jobcomp/filetxt/Makefile.in
@@ -134,6 +134,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -159,6 +160,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/jobcomp/filetxt/filetxt_jobcomp_process.c b/src/plugins/jobcomp/filetxt/filetxt_jobcomp_process.c
index 6479ee6671f1c02c27a650e3cda7a647a0e101dd..dd882778d57983d8707fe208c576795cf0d47a7b 100644
--- a/src/plugins/jobcomp/filetxt/filetxt_jobcomp_process.c
+++ b/src/plugins/jobcomp/filetxt/filetxt_jobcomp_process.c
@@ -143,20 +143,22 @@ static jobcomp_job_rec_t *_parse_line(List job_info_list)
 				job->gid = atoi(temp2);
 				job->gid_name = xstrdup(jobcomp_info->val);
 			}
-		} else if(!strcasecmp("Block_Id", jobcomp_info->name)) {
-			job->blockid = xstrdup(jobcomp_info->val);
 		} else if(!strcasecmp("Name", jobcomp_info->name)) {
 			job->jobname = xstrdup(jobcomp_info->val);
 		} else if(!strcasecmp("NodeList", jobcomp_info->name)) {
 			job->nodelist = xstrdup(jobcomp_info->val);
 		} else if(!strcasecmp("NodeCnt", jobcomp_info->name)) {
 			job->node_cnt = atoi(jobcomp_info->val);
-		} else if(!strcasecmp("MaxProcs", jobcomp_info->name)) {
-			job->max_procs = atoi(jobcomp_info->val);
 		} else if(!strcasecmp("JobState", jobcomp_info->name)) {
 			job->state = xstrdup(jobcomp_info->val);
 		} else if(!strcasecmp("Timelimit", jobcomp_info->name)) {
 			job->timelimit = xstrdup(jobcomp_info->val);
+		}
+#ifdef HAVE_BG
+		else if(!strcasecmp("MaxProcs", jobcomp_info->name)) {
+			job->max_procs = atoi(jobcomp_info->val);
+		} else if(!strcasecmp("Block_Id", jobcomp_info->name)) {
+			job->blockid = xstrdup(jobcomp_info->val);
 		} else if(!strcasecmp("Connection", jobcomp_info->name)) {
 			job->connection = xstrdup(jobcomp_info->val);
 		} else if(!strcasecmp("reboot", jobcomp_info->name)) {
@@ -167,7 +169,9 @@ static jobcomp_job_rec_t *_parse_line(List job_info_list)
 			job->geo = xstrdup(jobcomp_info->val);
 		} else if(!strcasecmp("start", jobcomp_info->name)) {
 			job->bg_start_point = xstrdup(jobcomp_info->val);
-		} else {
+		}
+#endif
+		else {
 			error("Unknown type %s: %s", jobcomp_info->name,
 			      jobcomp_info->val);
 		}
diff --git a/src/plugins/jobcomp/mysql/Makefile.am b/src/plugins/jobcomp/mysql/Makefile.am
index 64137191b556a569ddb2cc094c1f79de691500d2..0b32bb655436aa3a0fc6f92b1fdd236c97922484 100644
--- a/src/plugins/jobcomp/mysql/Makefile.am
+++ b/src/plugins/jobcomp/mysql/Makefile.am
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic $(MYSQL_LIBS)
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
 
@@ -12,5 +12,7 @@ pkglib_LTLIBRARIES = jobcomp_mysql.la
 jobcomp_mysql_la_SOURCES = jobcomp_mysql.c \
 			mysql_jobcomp_process.c mysql_jobcomp_process.h
 jobcomp_mysql_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
+jobcomp_mysql_la_LIBS = $(MYSQL_LIBS)
+jobcomp_mysql_la_CFLAGS = $(MYSQL_CFLAGS)
 jobcomp_mysql_la_LIBADD  = $(top_builddir)/src/common/libcommon.la
 
diff --git a/src/plugins/jobcomp/mysql/Makefile.in b/src/plugins/jobcomp/mysql/Makefile.in
index e394bac4cf627720fafc0ee8696965019e73685a..da1cf53f24be1d8e988d18fea522a6f419074965 100644
--- a/src/plugins/jobcomp/mysql/Makefile.in
+++ b/src/plugins/jobcomp/mysql/Makefile.in
@@ -76,12 +76,12 @@ pkglibLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 jobcomp_mysql_la_DEPENDENCIES =  \
 	$(top_builddir)/src/common/libcommon.la
-am_jobcomp_mysql_la_OBJECTS = jobcomp_mysql.lo \
-	mysql_jobcomp_process.lo
+am_jobcomp_mysql_la_OBJECTS = jobcomp_mysql_la-jobcomp_mysql.lo \
+	jobcomp_mysql_la-mysql_jobcomp_process.lo
 jobcomp_mysql_la_OBJECTS = $(am_jobcomp_mysql_la_OBJECTS)
 jobcomp_mysql_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(jobcomp_mysql_la_LDFLAGS) $(LDFLAGS) -o $@
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(jobcomp_mysql_la_CFLAGS) \
+	$(CFLAGS) $(jobcomp_mysql_la_LDFLAGS) $(LDFLAGS) -o $@
 DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/slurm@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/auxdir/depcomp
 am__depfiles_maybe = depfiles
@@ -135,6 +135,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -160,6 +161,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
@@ -262,7 +264,7 @@ target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic $(MYSQL_LIBS)
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
 pkglib_LTLIBRARIES = jobcomp_mysql.la
 
@@ -271,6 +273,8 @@ jobcomp_mysql_la_SOURCES = jobcomp_mysql.c \
 			mysql_jobcomp_process.c mysql_jobcomp_process.h
 
 jobcomp_mysql_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
+jobcomp_mysql_la_LIBS = $(MYSQL_LIBS)
+jobcomp_mysql_la_CFLAGS = $(MYSQL_CFLAGS)
 jobcomp_mysql_la_LIBADD = $(top_builddir)/src/common/libcommon.la
 all: all-am
 
@@ -341,8 +345,8 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobcomp_mysql.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mysql_jobcomp_process.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobcomp_mysql_la-jobcomp_mysql.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobcomp_mysql_la-mysql_jobcomp_process.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -365,6 +369,20 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
+jobcomp_mysql_la-jobcomp_mysql.lo: jobcomp_mysql.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(jobcomp_mysql_la_CFLAGS) $(CFLAGS) -MT jobcomp_mysql_la-jobcomp_mysql.lo -MD -MP -MF $(DEPDIR)/jobcomp_mysql_la-jobcomp_mysql.Tpo -c -o jobcomp_mysql_la-jobcomp_mysql.lo `test -f 'jobcomp_mysql.c' || echo '$(srcdir)/'`jobcomp_mysql.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/jobcomp_mysql_la-jobcomp_mysql.Tpo $(DEPDIR)/jobcomp_mysql_la-jobcomp_mysql.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='jobcomp_mysql.c' object='jobcomp_mysql_la-jobcomp_mysql.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(jobcomp_mysql_la_CFLAGS) $(CFLAGS) -c -o jobcomp_mysql_la-jobcomp_mysql.lo `test -f 'jobcomp_mysql.c' || echo '$(srcdir)/'`jobcomp_mysql.c
+
+jobcomp_mysql_la-mysql_jobcomp_process.lo: mysql_jobcomp_process.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(jobcomp_mysql_la_CFLAGS) $(CFLAGS) -MT jobcomp_mysql_la-mysql_jobcomp_process.lo -MD -MP -MF $(DEPDIR)/jobcomp_mysql_la-mysql_jobcomp_process.Tpo -c -o jobcomp_mysql_la-mysql_jobcomp_process.lo `test -f 'mysql_jobcomp_process.c' || echo '$(srcdir)/'`mysql_jobcomp_process.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/jobcomp_mysql_la-mysql_jobcomp_process.Tpo $(DEPDIR)/jobcomp_mysql_la-mysql_jobcomp_process.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mysql_jobcomp_process.c' object='jobcomp_mysql_la-mysql_jobcomp_process.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(jobcomp_mysql_la_CFLAGS) $(CFLAGS) -c -o jobcomp_mysql_la-mysql_jobcomp_process.lo `test -f 'mysql_jobcomp_process.c' || echo '$(srcdir)/'`mysql_jobcomp_process.c
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
diff --git a/src/plugins/jobcomp/mysql/jobcomp_mysql.c b/src/plugins/jobcomp/mysql/jobcomp_mysql.c
index c9f3875eaa7f92e0d8f2f30f71d72405ccfc46ba..7677e94212f8a8599fd981b9676234cd51a6769d 100644
--- a/src/plugins/jobcomp/mysql/jobcomp_mysql.c
+++ b/src/plugins/jobcomp/mysql/jobcomp_mysql.c
@@ -98,13 +98,15 @@ storage_field_t jobcomp_table_fields[] = {
 	{ "endtime", "int unsigned default 0 not null" },
 	{ "nodelist", "text" }, 
 	{ "nodecnt", "mediumint unsigned not null" },
-	{ "connection", "tinytext" },
+#ifdef HAVE_BG
+	{ "connect_type", "tinytext" },
 	{ "reboot", "tinytext" },
 	{ "rotate", "tinytext" },
 	{ "maxprocs", "mediumint unsigned default 0 not null" },
 	{ "geometry", "tinytext" },
 	{ "start", "tinytext" },
 	{ "blockid", "tinytext" },
+#endif
 	{ NULL, NULL}
 };
 
@@ -305,7 +307,7 @@ extern int slurm_jobcomp_log_record(struct job_record *job_ptr)
 	int rc = SLURM_SUCCESS;
 	char *usr_str = NULL, *grp_str = NULL, lim_str[32];
 #ifdef HAVE_BG
-	char connection[128];
+	char connect_type[128];
 	char reboot[4];
 	char rotate[4];
 	char maxprocs[20];
@@ -340,7 +342,7 @@ extern int slurm_jobcomp_log_record(struct job_record *job_ptr)
 
 #ifdef HAVE_BG
 	select_g_sprint_jobinfo(job_ptr->select_jobinfo,
-		connection, sizeof(connection), SELECT_PRINT_CONNECTION);
+		connect_type, sizeof(connect_type), SELECT_PRINT_CONNECTION);
 	select_g_sprint_jobinfo(job_ptr->select_jobinfo,
 		reboot, sizeof(reboot), SELECT_PRINT_REBOOT);
 	select_g_sprint_jobinfo(job_ptr->select_jobinfo,
@@ -359,7 +361,7 @@ extern int slurm_jobcomp_log_record(struct job_record *job_ptr)
 		 "name, state, "
 		 "partition, timelimit, starttime, endtime, nodelist, nodecnt"
 #ifdef HAVE_BG
-		 ", connection, reboot, rotate, maxprocs, geometry, "
+		 ", connect_type, reboot, rotate, maxprocs, geometry, "
 		 "start, blockid"
 #endif
 		 ") values (%u, %u, '%s', %u, '%s', '%s', %d, "
@@ -374,7 +376,7 @@ extern int slurm_jobcomp_log_record(struct job_record *job_ptr)
 		 (int)job_ptr->start_time, (int)job_ptr->end_time,
 		 job_ptr->nodes, job_ptr->node_cnt
 #ifdef HAVE_BG
-		 , connection, reboot, rotate, maxprocs, geometry,
+		 , connect_type, reboot, rotate, maxprocs, geometry,
 		 start, blockid
 #endif
 		 );
diff --git a/src/plugins/jobcomp/mysql/mysql_jobcomp_process.c b/src/plugins/jobcomp/mysql/mysql_jobcomp_process.c
index e129f05868ba3fcdaddd3916d1726bc69a8f3e6b..73c5619063e84a2c161f6bb915b72d16168be6e6 100644
--- a/src/plugins/jobcomp/mysql/mysql_jobcomp_process.c
+++ b/src/plugins/jobcomp/mysql/mysql_jobcomp_process.c
@@ -170,23 +170,25 @@ extern void mysql_jobcomp_process_get_jobs(List job_list,
 		if(row[JOBCOMP_REQ_GID])
 			job->gid = atoi(row[JOBCOMP_REQ_GID]);
 		job->gid_name = xstrdup(row[JOBCOMP_REQ_GROUP_NAME]);
-		job->blockid = xstrdup(row[JOBCOMP_REQ_BLOCKID]);
 		job->jobname = xstrdup(row[JOBCOMP_REQ_NAME]);
 		job->nodelist = xstrdup(row[JOBCOMP_REQ_NODELIST]);
 		if(row[JOBCOMP_REQ_NODECNT])
 			job->node_cnt = atoi(row[JOBCOMP_REQ_NODECNT]);
-		if(row[JOBCOMP_REQ_MAXPROCS])
-			job->max_procs = atoi(row[JOBCOMP_REQ_MAXPROCS]);
 		if(row[JOBCOMP_REQ_STATE]) {
 			i = atoi(row[JOBCOMP_REQ_STATE]);
 			job->state = xstrdup(job_state_string(i));
 		}
 		job->timelimit = xstrdup(row[JOBCOMP_REQ_TIMELIMIT]);
+#ifdef HAVE_BG
+		if(row[JOBCOMP_REQ_MAXPROCS])
+			job->max_procs = atoi(row[JOBCOMP_REQ_MAXPROCS]);
 		job->connection = xstrdup(row[JOBCOMP_REQ_CONNECTION]);
 		job->reboot = xstrdup(row[JOBCOMP_REQ_REBOOT]);
 		job->rotate = xstrdup(row[JOBCOMP_REQ_ROTATE]);
 		job->geo = xstrdup(row[JOBCOMP_REQ_GEOMETRY]);
 		job->bg_start_point = xstrdup(row[JOBCOMP_REQ_START]);
+		job->blockid = xstrdup(row[JOBCOMP_REQ_BLOCKID]);
+#endif
 		list_append(job_list, job);
 	}
 		
diff --git a/src/plugins/jobcomp/mysql/mysql_jobcomp_process.h b/src/plugins/jobcomp/mysql/mysql_jobcomp_process.h
index 85a5f7123b17e651c8cd2de4b86d01bca59c2274..90461c5344beb5aef178d19e460cd407918d9391 100644
--- a/src/plugins/jobcomp/mysql/mysql_jobcomp_process.h
+++ b/src/plugins/jobcomp/mysql/mysql_jobcomp_process.h
@@ -71,6 +71,7 @@ enum {
 	JOBCOMP_REQ_ENDTIME,
 	JOBCOMP_REQ_NODELIST,
 	JOBCOMP_REQ_NODECNT,
+#ifdef HAVE_BG
 	JOBCOMP_REQ_CONNECTION,
 	JOBCOMP_REQ_REBOOT,
 	JOBCOMP_REQ_ROTATE,
@@ -78,6 +79,7 @@ enum {
 	JOBCOMP_REQ_GEOMETRY,
 	JOBCOMP_REQ_START,
 	JOBCOMP_REQ_BLOCKID,
+#endif
 	JOBCOMP_REQ_COUNT		
 };
 
diff --git a/src/plugins/jobcomp/none/Makefile.in b/src/plugins/jobcomp/none/Makefile.in
index 603d323cab9bbda9f069300c3bca160ac1c866ed..3ae8c1172e3d9e89531a92371c52be50a66012fd 100644
--- a/src/plugins/jobcomp/none/Makefile.in
+++ b/src/plugins/jobcomp/none/Makefile.in
@@ -133,6 +133,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -158,6 +159,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/jobcomp/pgsql/Makefile.am b/src/plugins/jobcomp/pgsql/Makefile.am
index 2f3e59b7f51e0b40a34561572b852e949ada3c29..e3094eb9c7d0c1ee9dcc428630ccf005cd8d6f29 100644
--- a/src/plugins/jobcomp/pgsql/Makefile.am
+++ b/src/plugins/jobcomp/pgsql/Makefile.am
@@ -3,7 +3,7 @@
 CPPFLAGS = $(PGSQL_CFLAGS)
 AUTOMAKE_OPTIONS = foreign
 
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic $(PGSQL_LIBS)
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
 
@@ -13,5 +13,7 @@ pkglib_LTLIBRARIES = jobcomp_pgsql.la
 jobcomp_pgsql_la_SOURCES = jobcomp_pgsql.c \
 			pgsql_jobcomp_process.c pgsql_jobcomp_process.h
 jobcomp_pgsql_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
+jobcomp_pgsql_la_LIBS = $(PGSQL_LIBS)
+jobcomp_pgsql_la_CFLAGS = $(PGSQL_CFLAGS)
 jobcomp_pgsql_la_LIBADD  = $(top_builddir)/src/common/libcommon.la
 
diff --git a/src/plugins/jobcomp/pgsql/Makefile.in b/src/plugins/jobcomp/pgsql/Makefile.in
index 6e5885b594e85082bfe144e2253a9930357265dc..ddc4584507d2573e712336e63371903b0fb5580e 100644
--- a/src/plugins/jobcomp/pgsql/Makefile.in
+++ b/src/plugins/jobcomp/pgsql/Makefile.in
@@ -76,12 +76,12 @@ pkglibLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 jobcomp_pgsql_la_DEPENDENCIES =  \
 	$(top_builddir)/src/common/libcommon.la
-am_jobcomp_pgsql_la_OBJECTS = jobcomp_pgsql.lo \
-	pgsql_jobcomp_process.lo
+am_jobcomp_pgsql_la_OBJECTS = jobcomp_pgsql_la-jobcomp_pgsql.lo \
+	jobcomp_pgsql_la-pgsql_jobcomp_process.lo
 jobcomp_pgsql_la_OBJECTS = $(am_jobcomp_pgsql_la_OBJECTS)
 jobcomp_pgsql_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(jobcomp_pgsql_la_LDFLAGS) $(LDFLAGS) -o $@
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(jobcomp_pgsql_la_CFLAGS) \
+	$(CFLAGS) $(jobcomp_pgsql_la_LDFLAGS) $(LDFLAGS) -o $@
 DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/slurm@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/auxdir/depcomp
 am__depfiles_maybe = depfiles
@@ -135,6 +135,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -160,6 +161,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
@@ -262,7 +264,7 @@ target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic $(PGSQL_LIBS)
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
 pkglib_LTLIBRARIES = jobcomp_pgsql.la
 
@@ -271,6 +273,8 @@ jobcomp_pgsql_la_SOURCES = jobcomp_pgsql.c \
 			pgsql_jobcomp_process.c pgsql_jobcomp_process.h
 
 jobcomp_pgsql_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
+jobcomp_pgsql_la_LIBS = $(PGSQL_LIBS)
+jobcomp_pgsql_la_CFLAGS = $(PGSQL_CFLAGS)
 jobcomp_pgsql_la_LIBADD = $(top_builddir)/src/common/libcommon.la
 all: all-am
 
@@ -341,8 +345,8 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobcomp_pgsql.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pgsql_jobcomp_process.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobcomp_pgsql_la-jobcomp_pgsql.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobcomp_pgsql_la-pgsql_jobcomp_process.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -365,6 +369,20 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
+jobcomp_pgsql_la-jobcomp_pgsql.lo: jobcomp_pgsql.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(jobcomp_pgsql_la_CFLAGS) $(CFLAGS) -MT jobcomp_pgsql_la-jobcomp_pgsql.lo -MD -MP -MF $(DEPDIR)/jobcomp_pgsql_la-jobcomp_pgsql.Tpo -c -o jobcomp_pgsql_la-jobcomp_pgsql.lo `test -f 'jobcomp_pgsql.c' || echo '$(srcdir)/'`jobcomp_pgsql.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/jobcomp_pgsql_la-jobcomp_pgsql.Tpo $(DEPDIR)/jobcomp_pgsql_la-jobcomp_pgsql.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='jobcomp_pgsql.c' object='jobcomp_pgsql_la-jobcomp_pgsql.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(jobcomp_pgsql_la_CFLAGS) $(CFLAGS) -c -o jobcomp_pgsql_la-jobcomp_pgsql.lo `test -f 'jobcomp_pgsql.c' || echo '$(srcdir)/'`jobcomp_pgsql.c
+
+jobcomp_pgsql_la-pgsql_jobcomp_process.lo: pgsql_jobcomp_process.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(jobcomp_pgsql_la_CFLAGS) $(CFLAGS) -MT jobcomp_pgsql_la-pgsql_jobcomp_process.lo -MD -MP -MF $(DEPDIR)/jobcomp_pgsql_la-pgsql_jobcomp_process.Tpo -c -o jobcomp_pgsql_la-pgsql_jobcomp_process.lo `test -f 'pgsql_jobcomp_process.c' || echo '$(srcdir)/'`pgsql_jobcomp_process.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/jobcomp_pgsql_la-pgsql_jobcomp_process.Tpo $(DEPDIR)/jobcomp_pgsql_la-pgsql_jobcomp_process.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pgsql_jobcomp_process.c' object='jobcomp_pgsql_la-pgsql_jobcomp_process.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(jobcomp_pgsql_la_CFLAGS) $(CFLAGS) -c -o jobcomp_pgsql_la-pgsql_jobcomp_process.lo `test -f 'pgsql_jobcomp_process.c' || echo '$(srcdir)/'`pgsql_jobcomp_process.c
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
diff --git a/src/plugins/jobcomp/pgsql/jobcomp_pgsql.c b/src/plugins/jobcomp/pgsql/jobcomp_pgsql.c
index 6804b4429f50938611450918e38efca18c3d3b24..d4a794b447a0ff9974736165971a9fe30b20b4f0 100644
--- a/src/plugins/jobcomp/pgsql/jobcomp_pgsql.c
+++ b/src/plugins/jobcomp/pgsql/jobcomp_pgsql.c
@@ -98,13 +98,15 @@ storage_field_t jobcomp_table_fields[] = {
 	{ "endtime", "bigint default 0 not null" },
 	{ "nodelist", "text" }, 
 	{ "nodecnt", "integer not null" },
-	{ "connection", "text" },
+#ifdef HAVE_BG
+	{ "connect_type", "text" },
 	{ "reboot", "text" },
 	{ "rotate", "text" },
 	{ "maxprocs", "integer default 0 not null" },
 	{ "geometry", "text" },
 	{ "start", "text" },
 	{ "blockid", "text" },
+#endif
 	{ NULL, NULL}
 };
 
@@ -328,7 +330,7 @@ extern int slurm_jobcomp_log_record(struct job_record *job_ptr)
 	int rc = SLURM_SUCCESS;
 	char *usr_str = NULL, *grp_str = NULL, lim_str[32];
 #ifdef HAVE_BG
-	char connection[128];
+	char connect_type[128];
 	char reboot[4];
 	char rotate[4];
 	char maxprocs[20];
@@ -363,7 +365,7 @@ extern int slurm_jobcomp_log_record(struct job_record *job_ptr)
 
 #ifdef HAVE_BG
 	select_g_sprint_jobinfo(job_ptr->select_jobinfo,
-		connection, sizeof(connection), SELECT_PRINT_CONNECTION);
+		connect_type, sizeof(connect_type), SELECT_PRINT_CONNECTION);
 	select_g_sprint_jobinfo(job_ptr->select_jobinfo,
 		reboot, sizeof(reboot), SELECT_PRINT_REBOOT);
 	select_g_sprint_jobinfo(job_ptr->select_jobinfo,
@@ -382,7 +384,7 @@ extern int slurm_jobcomp_log_record(struct job_record *job_ptr)
 		 "name, state, "
 		 "partition, timelimit, starttime, endtime, nodelist, nodecnt"
 #ifdef HAVE_BG
-		 ", connection, reboot, rotate, maxprocs, geometry, "
+		 ", connect_type, reboot, rotate, maxprocs, geometry, "
 		 "start, blockid"
 #endif
 		 ") values (%u, %u, '%s', %u, '%s', '%s', %d, "
@@ -397,7 +399,7 @@ extern int slurm_jobcomp_log_record(struct job_record *job_ptr)
 		 (int)job_ptr->start_time, (int)job_ptr->end_time,
 		 job_ptr->nodes, job_ptr->node_cnt
 #ifdef HAVE_BG
-		 , connection, reboot, rotate, maxprocs, geometry,
+		 , connect_type, reboot, rotate, maxprocs, geometry,
 		 start, blockid
 #endif
 		 );
diff --git a/src/plugins/jobcomp/pgsql/pgsql_jobcomp_process.c b/src/plugins/jobcomp/pgsql/pgsql_jobcomp_process.c
index ff1a8f6a9a6cb50152651e390ce3ae180a4cfa5f..688faeb53acc1752d5e0414a57dac323e5827155 100644
--- a/src/plugins/jobcomp/pgsql/pgsql_jobcomp_process.c
+++ b/src/plugins/jobcomp/pgsql/pgsql_jobcomp_process.c
@@ -174,8 +174,6 @@ extern void pgsql_jobcomp_process_get_jobs(List job_list,
 				atoi(PQgetvalue(result, i, JOBCOMP_REQ_GID));
 		job->gid_name = 
 			xstrdup(PQgetvalue(result, i, JOBCOMP_REQ_GROUP_NAME));
-		job->blockid =
-			xstrdup(PQgetvalue(result, i, JOBCOMP_REQ_BLOCKID));
 		job->jobname =
 			xstrdup(PQgetvalue(result, i, JOBCOMP_REQ_NAME));
 		job->nodelist =
@@ -183,16 +181,19 @@ extern void pgsql_jobcomp_process_get_jobs(List job_list,
 		if(PQgetvalue(result, i, JOBCOMP_REQ_NODECNT))
 			job->node_cnt =
 				atoi(PQgetvalue(result, i, JOBCOMP_REQ_NODECNT));
-		if(PQgetvalue(result, i, JOBCOMP_REQ_MAXPROCS))
-			job->max_procs =
-				atoi(PQgetvalue(result, i, 
-						JOBCOMP_REQ_MAXPROCS));
 		if(PQgetvalue(result, i, JOBCOMP_REQ_STATE)) {
 			int j = atoi(PQgetvalue(result, i, JOBCOMP_REQ_STATE));
 			job->state = xstrdup(job_state_string(j));
 		}
 		job->timelimit =
 			xstrdup(PQgetvalue(result, i, JOBCOMP_REQ_TIMELIMIT));
+#ifdef HAVE_BG
+		if(PQgetvalue(result, i, JOBCOMP_REQ_MAXPROCS))
+			job->max_procs =
+				atoi(PQgetvalue(result, i, 
+						JOBCOMP_REQ_MAXPROCS));
+		job->blockid =
+			xstrdup(PQgetvalue(result, i, JOBCOMP_REQ_BLOCKID));
 		job->connection =
 			xstrdup(PQgetvalue(result, i, JOBCOMP_REQ_CONNECTION));
 		job->reboot =
@@ -203,6 +204,7 @@ extern void pgsql_jobcomp_process_get_jobs(List job_list,
 			xstrdup(PQgetvalue(result, i, JOBCOMP_REQ_GEOMETRY));
 		job->bg_start_point =
 			xstrdup(PQgetvalue(result, i, JOBCOMP_REQ_START));
+#endif
 		list_append(job_list, job);
 
 	}
diff --git a/src/plugins/jobcomp/script/Makefile.in b/src/plugins/jobcomp/script/Makefile.in
index 5b5d69a3b0788ea6175814039b9d9bdfc34cc5d7..21fecf3bd6f5dc33dd709ed33bc6aaad24a9ca33 100644
--- a/src/plugins/jobcomp/script/Makefile.in
+++ b/src/plugins/jobcomp/script/Makefile.in
@@ -133,6 +133,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -158,6 +159,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/mpi/Makefile.in b/src/plugins/mpi/Makefile.in
index 75817d1ece43161fbfabcd510f10e891e4bb29e1..47aea058a8a03359e2ee3f55ed4ddfbf593fc8ae 100644
--- a/src/plugins/mpi/Makefile.in
+++ b/src/plugins/mpi/Makefile.in
@@ -115,6 +115,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -140,6 +141,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/mpi/lam/Makefile.in b/src/plugins/mpi/lam/Makefile.in
index 47a27be77ad75fa6065cb076c4d44e76bd1a7839..bdd6069a027ba64654b668e86527d5b654d49ca8 100644
--- a/src/plugins/mpi/lam/Makefile.in
+++ b/src/plugins/mpi/lam/Makefile.in
@@ -133,6 +133,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -158,6 +159,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/mpi/mpich1_p4/Makefile.in b/src/plugins/mpi/mpich1_p4/Makefile.in
index 081edacf86b08c6ad8afe5a2e0d1793ad20c3899..203f5c1b93d5428e196ac2c5a1f54ae8e54a5dfe 100644
--- a/src/plugins/mpi/mpich1_p4/Makefile.in
+++ b/src/plugins/mpi/mpich1_p4/Makefile.in
@@ -133,6 +133,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -158,6 +159,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/mpi/mpich1_shmem/Makefile.in b/src/plugins/mpi/mpich1_shmem/Makefile.in
index 24151f127e7db211d967350f5474f635cb4ea519..e98ae05a198fa51491e2d488f7a649132369c5ef 100644
--- a/src/plugins/mpi/mpich1_shmem/Makefile.in
+++ b/src/plugins/mpi/mpich1_shmem/Makefile.in
@@ -133,6 +133,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -158,6 +159,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/mpi/mpichgm/Makefile.in b/src/plugins/mpi/mpichgm/Makefile.in
index 0f2d49059c50837bfa7144bcacf726a2b0d92ad1..d78a9f1ff6f15a526108d96b987592b91b6ddf2d 100644
--- a/src/plugins/mpi/mpichgm/Makefile.in
+++ b/src/plugins/mpi/mpichgm/Makefile.in
@@ -133,6 +133,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -158,6 +159,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/mpi/mpichmx/Makefile.in b/src/plugins/mpi/mpichmx/Makefile.in
index 75c17ff2c8b75956b716a65739f46751882e104c..2c62685ea062cd48a63318875c5b5d6eadb496a5 100644
--- a/src/plugins/mpi/mpichmx/Makefile.in
+++ b/src/plugins/mpi/mpichmx/Makefile.in
@@ -133,6 +133,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -158,6 +159,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/mpi/mvapich/Makefile.in b/src/plugins/mpi/mvapich/Makefile.in
index e7a86ebadb821ba73fdef56a7381d0ad843d0f93..9d0f0ff5c5c6f988b652d9fb2a7e900d4217a192 100644
--- a/src/plugins/mpi/mvapich/Makefile.in
+++ b/src/plugins/mpi/mvapich/Makefile.in
@@ -133,6 +133,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -158,6 +159,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/mpi/none/Makefile.in b/src/plugins/mpi/none/Makefile.in
index 77d4da20484ab6d0c5e9b4ab1e3a7eabc1c2a694..85f08f078b01f42122a4c222ec6e6f2ec4853118 100644
--- a/src/plugins/mpi/none/Makefile.in
+++ b/src/plugins/mpi/none/Makefile.in
@@ -133,6 +133,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -158,6 +159,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/mpi/openmpi/Makefile.in b/src/plugins/mpi/openmpi/Makefile.in
index 3a557734433d413926a3b7cbc0dd470a1811bfed..68da02c3c41dc0e4d014a3ee6760ec634b6b8849 100644
--- a/src/plugins/mpi/openmpi/Makefile.in
+++ b/src/plugins/mpi/openmpi/Makefile.in
@@ -133,6 +133,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -158,6 +159,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/proctrack/Makefile.in b/src/plugins/proctrack/Makefile.in
index 1f527e704f5ed38a5aa5df41fcdf9bd8d1356ff6..d8ac0a09a84f1907b1c105ae19fde10feae43afd 100644
--- a/src/plugins/proctrack/Makefile.in
+++ b/src/plugins/proctrack/Makefile.in
@@ -115,6 +115,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -140,6 +141,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/proctrack/aix/Makefile.in b/src/plugins/proctrack/aix/Makefile.in
index 9d6af5e65501192e0342e0aee3ad255039614194..126b62ee9de2bfc0cb732911f808492c8fe42e40 100644
--- a/src/plugins/proctrack/aix/Makefile.in
+++ b/src/plugins/proctrack/aix/Makefile.in
@@ -133,6 +133,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -158,6 +159,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/proctrack/linuxproc/Makefile.in b/src/plugins/proctrack/linuxproc/Makefile.in
index 953b9061f29da495af158d605c61f15231a998b2..77b60959840588789fd496f563c2ae52b0005fe9 100644
--- a/src/plugins/proctrack/linuxproc/Makefile.in
+++ b/src/plugins/proctrack/linuxproc/Makefile.in
@@ -134,6 +134,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -159,6 +160,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/proctrack/pgid/Makefile.in b/src/plugins/proctrack/pgid/Makefile.in
index d73cf5a7c6ed8a08779912c16b90f18c602f537b..4c082538221ba88afb057459b0d5ac1fdf40c5f1 100644
--- a/src/plugins/proctrack/pgid/Makefile.in
+++ b/src/plugins/proctrack/pgid/Makefile.in
@@ -133,6 +133,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -158,6 +159,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/proctrack/rms/Makefile.in b/src/plugins/proctrack/rms/Makefile.in
index f75d8bf9ffe6db8a52e161b386872c10dbf1a9d8..5b48659ff80c3c1cc25539df41ee5e405959b4dc 100644
--- a/src/plugins/proctrack/rms/Makefile.in
+++ b/src/plugins/proctrack/rms/Makefile.in
@@ -134,6 +134,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -159,6 +160,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/proctrack/sgi_job/Makefile.in b/src/plugins/proctrack/sgi_job/Makefile.in
index 23471fda54aee3730c90ea4d8ab11a5dab81b77c..0c62cd281184bc0562f6d87d9f8ecc9e1bf643d6 100644
--- a/src/plugins/proctrack/sgi_job/Makefile.in
+++ b/src/plugins/proctrack/sgi_job/Makefile.in
@@ -133,6 +133,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -158,6 +159,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/sched/Makefile.in b/src/plugins/sched/Makefile.in
index feeab256c98f7171d6370d2b7bf7c38eed4fd4b8..78d82c75eb27140f8495fba5cb4ee6b93ce90c6d 100644
--- a/src/plugins/sched/Makefile.in
+++ b/src/plugins/sched/Makefile.in
@@ -115,6 +115,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -140,6 +141,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/sched/backfill/Makefile.in b/src/plugins/sched/backfill/Makefile.in
index 01633784451c46276b78e4ab79190ab85f296d18..7379e1adbb1c8bf89a156d67f258d3ff22e83416 100644
--- a/src/plugins/sched/backfill/Makefile.in
+++ b/src/plugins/sched/backfill/Makefile.in
@@ -133,6 +133,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -158,6 +159,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/sched/builtin/Makefile.in b/src/plugins/sched/builtin/Makefile.in
index 0f866c7cf62894bdd2e88e75d0109dd3fdc1475d..d4b99517d9a0843310c833f53805a6701fabe1a1 100644
--- a/src/plugins/sched/builtin/Makefile.in
+++ b/src/plugins/sched/builtin/Makefile.in
@@ -133,6 +133,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -158,6 +159,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/sched/gang/Makefile.in b/src/plugins/sched/gang/Makefile.in
index 88000eafac044c89dc34919eb1c4f6322eeea3c6..e04af57cfaf156c1d9c5739d929f13d9e31f2f02 100644
--- a/src/plugins/sched/gang/Makefile.in
+++ b/src/plugins/sched/gang/Makefile.in
@@ -133,6 +133,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -158,6 +159,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/sched/hold/Makefile.in b/src/plugins/sched/hold/Makefile.in
index 4ac8f8dedfb55197b3563a6e00b05bb3da1a1b08..3a2b43e84285c965ef9ef8fda7b37553b35e75b5 100644
--- a/src/plugins/sched/hold/Makefile.in
+++ b/src/plugins/sched/hold/Makefile.in
@@ -133,6 +133,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -158,6 +159,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/sched/wiki/Makefile.in b/src/plugins/sched/wiki/Makefile.in
index 462a424c0401399b325a4eba8ecb9bf4528bbec1..01e161059895f240f2cda38186bfadec7a1be5eb 100644
--- a/src/plugins/sched/wiki/Makefile.in
+++ b/src/plugins/sched/wiki/Makefile.in
@@ -135,6 +135,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -160,6 +161,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/sched/wiki2/Makefile.in b/src/plugins/sched/wiki2/Makefile.in
index ef61b3399813dc6017f0c1ec70081e3886c46cf3..2744dc4f134efecb85e608682794ad5e89d08891 100644
--- a/src/plugins/sched/wiki2/Makefile.in
+++ b/src/plugins/sched/wiki2/Makefile.in
@@ -138,6 +138,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -163,6 +164,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/select/Makefile.in b/src/plugins/select/Makefile.in
index 74f3812f7e4d3aa55c6293d76333aa3cf918acdd..9b7479409ddbd6a7613a833ba3c8dd237f00c1a5 100644
--- a/src/plugins/select/Makefile.in
+++ b/src/plugins/select/Makefile.in
@@ -115,6 +115,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -140,6 +141,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/select/bluegene/Makefile.in b/src/plugins/select/bluegene/Makefile.in
index 4cd18d99801b403fd62481437cc0de31645be75c..0ff21f8ba1c6714b7dfa55c45f14d8fc1addb98a 100644
--- a/src/plugins/select/bluegene/Makefile.in
+++ b/src/plugins/select/bluegene/Makefile.in
@@ -115,6 +115,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -140,6 +141,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/select/bluegene/block_allocator/Makefile.in b/src/plugins/select/bluegene/block_allocator/Makefile.in
index 4a7c5a0241645ac0d57410247997a0c31c8ac22b..c842d014fa9bf02f03a3688c5eb466052c70e432 100644
--- a/src/plugins/select/bluegene/block_allocator/Makefile.in
+++ b/src/plugins/select/bluegene/block_allocator/Makefile.in
@@ -127,6 +127,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -152,6 +153,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/select/bluegene/plugin/Makefile.in b/src/plugins/select/bluegene/plugin/Makefile.in
index c9c0142354f4e68ad010f11a81bfa3fb16759445..a8ba7b1ba52fe1d675ea8daa6050d994a1df9cbd 100644
--- a/src/plugins/select/bluegene/plugin/Makefile.in
+++ b/src/plugins/select/bluegene/plugin/Makefile.in
@@ -174,6 +174,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -199,6 +200,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/select/cons_res/Makefile.in b/src/plugins/select/cons_res/Makefile.in
index fc9f3d808de5653f9299bf237e3a08d2d5ef7697..3ba27025d9a856c60df237fda3e444842327ef1a 100644
--- a/src/plugins/select/cons_res/Makefile.in
+++ b/src/plugins/select/cons_res/Makefile.in
@@ -134,6 +134,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -159,6 +160,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/select/linear/Makefile.in b/src/plugins/select/linear/Makefile.in
index c5601b035d056c62eb00acb149dc67bc445af138..bc6452eaecee7b1036439bdc4fc2d1105c9bb30a 100644
--- a/src/plugins/select/linear/Makefile.in
+++ b/src/plugins/select/linear/Makefile.in
@@ -134,6 +134,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -159,6 +160,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/switch/Makefile.in b/src/plugins/switch/Makefile.in
index 23f0922c9c0e042c06db0bbe04e6eb15a7dd8f1a..2f4948ec5e85fe7c041c63b127859a631ae4284c 100644
--- a/src/plugins/switch/Makefile.in
+++ b/src/plugins/switch/Makefile.in
@@ -115,6 +115,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -140,6 +141,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/switch/elan/Makefile.in b/src/plugins/switch/elan/Makefile.in
index 2b1bbfbe529aea6e128e59389e937a965b46d51e..48315348d8074b8ebd14411402e935dd9357feea 100644
--- a/src/plugins/switch/elan/Makefile.in
+++ b/src/plugins/switch/elan/Makefile.in
@@ -139,6 +139,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -164,6 +165,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/switch/federation/Makefile.in b/src/plugins/switch/federation/Makefile.in
index ae005dee6c1073f2801c1e22f4e2e3e00488739c..ca2659302fd802494d2352920d3deda56f038e13 100644
--- a/src/plugins/switch/federation/Makefile.in
+++ b/src/plugins/switch/federation/Makefile.in
@@ -143,6 +143,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -168,6 +169,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/switch/none/Makefile.in b/src/plugins/switch/none/Makefile.in
index f2a8b09ee389aa1624e07f097a4a2a5bd9de896c..82ac7bcf942b93b283445d207cd02801f83edc9a 100644
--- a/src/plugins/switch/none/Makefile.in
+++ b/src/plugins/switch/none/Makefile.in
@@ -134,6 +134,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -159,6 +160,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/task/Makefile.in b/src/plugins/task/Makefile.in
index 6b367539107abbfa4c71f9986c68394f5d67afdf..d74d87510927a7f2a1f0e3aeb32fb5c967e2b383 100644
--- a/src/plugins/task/Makefile.in
+++ b/src/plugins/task/Makefile.in
@@ -115,6 +115,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -140,6 +141,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/task/affinity/Makefile.in b/src/plugins/task/affinity/Makefile.in
index c35817fede310fbc91d047ebb92a30cf433788c9..df65ada23940b73285dd9b9434712e70393605b3 100644
--- a/src/plugins/task/affinity/Makefile.in
+++ b/src/plugins/task/affinity/Makefile.in
@@ -145,6 +145,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -170,6 +171,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/plugins/task/none/Makefile.in b/src/plugins/task/none/Makefile.in
index f76fb8df19409f5fd8d214cc987a761da07903fe..c583e7a42e6bccd15ae5d20895494df5622242ab 100644
--- a/src/plugins/task/none/Makefile.in
+++ b/src/plugins/task/none/Makefile.in
@@ -134,6 +134,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -159,6 +160,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/sacct/Makefile.in b/src/sacct/Makefile.in
index c8c8c1bb3ca779c11c8dfa08b4a3952990871300..0e8eac3da0b7cf4da77b5b2f1482f34357993ede 100644
--- a/src/sacct/Makefile.in
+++ b/src/sacct/Makefile.in
@@ -132,6 +132,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -157,6 +158,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/sacct/options.c b/src/sacct/options.c
index 02d2f3307314674c8fc0622350f3121c527ac2e8..5a69d7d055c1e7d0252e5b4bb16d0c82300cc956 100644
--- a/src/sacct/options.c
+++ b/src/sacct/options.c
@@ -88,7 +88,11 @@ void _dump_header(jobacct_header_t header)
 {
 	struct tm ts;
 	gmtime_r(&header.timestamp, &ts);
-	printf("%u %s %04d%02d%02d%02d%02d%02d %d %s %s ",
+	printf("%u %s %04d%02d%02d%02d%02d%02d %d"
+#ifdef HAVE_BG
+	       " %s"
+#endif
+	       " %s ",
 	       header.jobnum,
 	       header.partition,
 	       1900+(ts.tm_year),
@@ -98,7 +102,9 @@ void _dump_header(jobacct_header_t header)
 		  ts.tm_min,
 		  ts.tm_sec,
 	       (int)header.job_submit,
+#ifdef HAVE_BG
 	       header.blockid,	/* block id */
+#endif
 	       "-");	/* reserved 1 */
 }
 
@@ -1101,11 +1107,13 @@ void do_dump_completion(void)
 		       job->gid_name, job->node_cnt, job->nodelist, 
 		       job->jobname, job->state,
 		       job->timelimit);
+#ifdef HAVE_BG
 		if(job->blockid)
 			printf(" %s %s %s %s %u %s %s",
 			       job->blockid, job->connection, job->reboot,
 			       job->rotate, job->max_procs, job->geo,
 			       job->bg_start_point);
+#endif
 		printf("\n");
 	}
 	list_iterator_destroy(itr);
diff --git a/src/sacct/print.c b/src/sacct/print.c
index c4e27f3509d118301a50259888226082d9cd975c..0fd05b084f543ac5fb6e2ec6a8a4f8fb3f0d5f37 100644
--- a/src/sacct/print.c
+++ b/src/sacct/print.c
@@ -820,6 +820,7 @@ void print_partition(type_t type, void *object)
 	} 
 }
 
+#ifdef HAVE_BG
 void print_blockid(type_t type, void *object)
 { 
 	jobacct_job_rec_t *job = (jobacct_job_rec_t *)object;
@@ -865,6 +866,7 @@ void print_blockid(type_t type, void *object)
 		break;
 	} 
 }
+#endif
 
 void print_pages(type_t type, void *object)
 { 
diff --git a/src/sacct/sacct.c b/src/sacct/sacct.c
index 845eedd7ab59ec4180750e16345130e17e1ebe9e..339bce72d5771c7fdf666ebe883b80d13ef37fae 100644
--- a/src/sacct/sacct.c
+++ b/src/sacct/sacct.c
@@ -153,7 +153,9 @@ void _print_header(void);
  */
 sacct_parameters_t params;
 fields_t fields[] = {{"account", print_account},
+#ifdef HAVE_BG
 		     {"blockid", print_blockid},
+#endif
 		     {"cpu", print_cpu},
 		     {"cputime", print_cputime}, 
 		     {"elapsed", print_elapsed},
diff --git a/src/sacct/sacct.h b/src/sacct/sacct.h
index af2e4c67b36ae6a81e9ee948494d90533ea9a9aa..1048e5bc3a055ef8daf915dd9f833654500a5dad 100644
--- a/src/sacct/sacct.h
+++ b/src/sacct/sacct.h
@@ -140,7 +140,9 @@ void print_ntasks(type_t type, void *object);
 void print_nvcsw(type_t type, void *object);
 void print_outblocks(type_t type, void *object);
 void print_partition(type_t type, void *object);
+#ifdef HAVE_BG
 void print_blockid(type_t type, void *object);
+#endif
 void print_pages(type_t type, void *object);
 void print_rss(type_t type, void *object);
 void print_status(type_t type, void *object);
diff --git a/src/sacct/sacct_stat.c b/src/sacct/sacct_stat.c
index 1a9fe1f53937c1398419710a745d284195c326a4..48d99df8ec7a019ac6c5a1d438695d90351cd43d 100644
--- a/src/sacct/sacct_stat.c
+++ b/src/sacct/sacct_stat.c
@@ -75,7 +75,9 @@ int _sacct_query(slurm_step_layout_t *step_layout, uint32_t job_id,
 
 	step.header.jobnum = job_id;
 	step.header.partition = NULL;
+#ifdef HAVE_BG
 	step.header.blockid = NULL;
+#endif
 	step.stepnum = step_id;
 	step.nodes = step_layout->node_list;
 	step.stepname = NULL;
diff --git a/src/salloc/Makefile.in b/src/salloc/Makefile.in
index 2273e747b19663a608bab6e87a4f176854fce9bf..903d620d965477134fbd5636ad534fedf2084de5 100644
--- a/src/salloc/Makefile.in
+++ b/src/salloc/Makefile.in
@@ -128,6 +128,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -153,6 +154,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/sattach/Makefile.in b/src/sattach/Makefile.in
index 8b296a4ae1ff5b8dc1ce9f14f9ad0bfaa6c164e9..e8e8cfceaf2d6d2ea95d57f157103b623e0fa9a9 100644
--- a/src/sattach/Makefile.in
+++ b/src/sattach/Makefile.in
@@ -129,6 +129,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -154,6 +155,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/sbatch/Makefile.in b/src/sbatch/Makefile.in
index 3d1ee45bb684fa7e9f5850300c181ebb3687e585..30c464e8abb319b644ee05aa6db3e9a487804a76 100644
--- a/src/sbatch/Makefile.in
+++ b/src/sbatch/Makefile.in
@@ -128,6 +128,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -153,6 +154,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/sbcast/Makefile.in b/src/sbcast/Makefile.in
index fb21d22702a615e59f4d7f8c73cc923d22e2c84c..3aee727c2071a3441cbfc5bc4ae2b376d59241f5 100644
--- a/src/sbcast/Makefile.in
+++ b/src/sbcast/Makefile.in
@@ -132,6 +132,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -157,6 +158,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/scancel/Makefile.in b/src/scancel/Makefile.in
index 684f49389ee826005b3d04a23af6a60807b1995f..1289a87ec9db67f9f04e1b73e721078d9f94a174 100644
--- a/src/scancel/Makefile.in
+++ b/src/scancel/Makefile.in
@@ -131,6 +131,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -156,6 +157,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/scontrol/Makefile.in b/src/scontrol/Makefile.in
index 170d382b3dd9e30305dc5efa1cb6015fb46c8b68..3cbeeeeffbd6d20d7a132be0c690bc8f96c710d7 100644
--- a/src/scontrol/Makefile.in
+++ b/src/scontrol/Makefile.in
@@ -131,6 +131,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -156,6 +157,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/sinfo/Makefile.in b/src/sinfo/Makefile.in
index 1835f3accaac3a668a44b2c676856a12edd6cb0f..2c93f007256513d28430f143137ef0893ba09648 100644
--- a/src/sinfo/Makefile.in
+++ b/src/sinfo/Makefile.in
@@ -133,6 +133,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -158,6 +159,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/slurmctld/Makefile.in b/src/slurmctld/Makefile.in
index 2aef521d4319ea5b3e9fa4d5151c8bb99f9e6f8b..3d73446210f9a7545640f56875f85a722900d30d 100644
--- a/src/slurmctld/Makefile.in
+++ b/src/slurmctld/Makefile.in
@@ -136,6 +136,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -161,6 +162,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/slurmd/Makefile.in b/src/slurmd/Makefile.in
index 477940b59f48d5b6f035b7fc882f94b5df204f10..e29cfa6be1a6199657d80aaf6ee68cfaa3d32d54 100644
--- a/src/slurmd/Makefile.in
+++ b/src/slurmd/Makefile.in
@@ -113,6 +113,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -138,6 +139,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/slurmd/slurmd/Makefile.in b/src/slurmd/slurmd/Makefile.in
index 4e923700018e8759100f2298264befae301cd57c..5c41c5570fe59ac3354aca89ce8580b62c161e87 100644
--- a/src/slurmd/slurmd/Makefile.in
+++ b/src/slurmd/slurmd/Makefile.in
@@ -149,6 +149,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -174,6 +175,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/slurmd/slurmstepd/Makefile.in b/src/slurmd/slurmstepd/Makefile.in
index 0cf5801e80bbd6ab59f944ed9ff24f5ff88ad6d7..30ed2bbe4dedc650a38341e8773cdd928b017271 100644
--- a/src/slurmd/slurmstepd/Makefile.in
+++ b/src/slurmd/slurmstepd/Makefile.in
@@ -141,6 +141,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -166,6 +167,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/smap/Makefile.in b/src/smap/Makefile.in
index fb0bb915d445f55340bf9ff095a2856f13b453df..1e6801b4cd89dda353e778fda4e9926a5fba64ec 100644
--- a/src/smap/Makefile.in
+++ b/src/smap/Makefile.in
@@ -146,6 +146,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -171,6 +172,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/squeue/Makefile.in b/src/squeue/Makefile.in
index b3347b5a260deae22144dddc6be5db225daca545..4fc5683074949cd9e53d32f999d3ae7e88430849 100644
--- a/src/squeue/Makefile.in
+++ b/src/squeue/Makefile.in
@@ -133,6 +133,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -158,6 +159,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/srun/Makefile.in b/src/srun/Makefile.in
index f6853b630c433fd65ae4fd671a938b1ba824ed4e..10444622d64bfd4ce02cdb2fb507a7f1d2eed1c0 100644
--- a/src/srun/Makefile.in
+++ b/src/srun/Makefile.in
@@ -131,6 +131,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -156,6 +157,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/strigger/Makefile.in b/src/strigger/Makefile.in
index af996d724cb839b564d6de6840012a59c82b1d5b..9759dbab23fcf459c1e217d7613b2a91a99540ed 100644
--- a/src/strigger/Makefile.in
+++ b/src/strigger/Makefile.in
@@ -132,6 +132,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -157,6 +158,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/src/sview/Makefile.in b/src/sview/Makefile.in
index 67af27bd946a65152cfbb2103f9bc1a02b2fc5fa..794f67d53d3a4034cf1cf571418061e0284cc645 100644
--- a/src/sview/Makefile.in
+++ b/src/sview/Makefile.in
@@ -150,6 +150,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -175,6 +176,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index 72e2142a884fff9c36617b0d1513c403ab932aa6..7aecd517f7393e6bc591b9673c346d7f286c29c2 100644
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -120,6 +120,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -145,6 +146,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/testsuite/expect/Makefile.in b/testsuite/expect/Makefile.in
index d3292489749d47ec16b3935aecc0302267242980..a39aba991962b4289b9943c94257261e8c3cafa9 100644
--- a/testsuite/expect/Makefile.in
+++ b/testsuite/expect/Makefile.in
@@ -101,6 +101,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -126,6 +127,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/testsuite/slurm_unit/Makefile.in b/testsuite/slurm_unit/Makefile.in
index d46bcfdfea81840081ccb476cc672f7c3253230a..5188dd7e6f195eba21d7f09566bc1b88955379d5 100644
--- a/testsuite/slurm_unit/Makefile.in
+++ b/testsuite/slurm_unit/Makefile.in
@@ -113,6 +113,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -138,6 +139,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/testsuite/slurm_unit/api/Makefile.in b/testsuite/slurm_unit/api/Makefile.in
index 13266dcf69acaba659ea816ff35e85fd5d634014..fcc49945d862ed44418d794a1f7f8ac0d934c655 100644
--- a/testsuite/slurm_unit/api/Makefile.in
+++ b/testsuite/slurm_unit/api/Makefile.in
@@ -133,6 +133,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -158,6 +159,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/testsuite/slurm_unit/api/manual/Makefile.in b/testsuite/slurm_unit/api/manual/Makefile.in
index ba86450a10a1f9ac21c562d6f1c92b81a37e634f..d6152bf97ce59ead2e9609de4e83603bfe198aa0 100644
--- a/testsuite/slurm_unit/api/manual/Makefile.in
+++ b/testsuite/slurm_unit/api/manual/Makefile.in
@@ -155,6 +155,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -180,6 +181,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/testsuite/slurm_unit/common/Makefile.in b/testsuite/slurm_unit/common/Makefile.in
index 637e92d7dbfb1def45b82d74103057ba41a66c79..425fd989dfe33d7f3299949da918872d01724364 100644
--- a/testsuite/slurm_unit/common/Makefile.in
+++ b/testsuite/slurm_unit/common/Makefile.in
@@ -141,6 +141,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -166,6 +167,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/testsuite/slurm_unit/slurmctld/Makefile.in b/testsuite/slurm_unit/slurmctld/Makefile.in
index 48e8e1785d9b4fd95c6ae8612a8fd66ff4cea73e..5c4041703b2e5acfddcbf5ad69e5d790c1864623 100644
--- a/testsuite/slurm_unit/slurmctld/Makefile.in
+++ b/testsuite/slurm_unit/slurmctld/Makefile.in
@@ -104,6 +104,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -129,6 +130,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@
diff --git a/testsuite/slurm_unit/slurmd/Makefile.in b/testsuite/slurm_unit/slurmd/Makefile.in
index 2b2121c13edde8d46ef45727de2a6a5b73f2905e..9bec79c90eb4a9d44921bc4889c3e5fd44f89168 100644
--- a/testsuite/slurm_unit/slurmd/Makefile.in
+++ b/testsuite/slurm_unit/slurmd/Makefile.in
@@ -104,6 +104,7 @@ FFLAGS = @FFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
 HAVEPGCONFIG = @HAVEPGCONFIG@
 HAVEPKGCONFIG = @HAVEPKGCONFIG@
 HAVE_AIX = @HAVE_AIX@
@@ -129,6 +130,7 @@ MKDIR_P = @MKDIR_P@
 MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
 MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
 MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
 MYSQL_LIBS = @MYSQL_LIBS@
 NCURSES = @NCURSES@
 NUMA_LIBS = @NUMA_LIBS@