From b0662b17179492f475f78cc17a83ac6948d10a31 Mon Sep 17 00:00:00 2001 From: Danny Auble <da@llnl.gov> Date: Tue, 11 Sep 2007 21:57:14 +0000 Subject: [PATCH] ran autogen.sh also removed non-used vars in a bgl env --- src/plugins/jobacct_gather/Makefile.in | 2 ++ src/plugins/jobacct_gather/aix/Makefile.in | 2 ++ src/plugins/jobacct_gather/linux/Makefile.in | 2 ++ src/plugins/jobacct_gather/none/Makefile.in | 2 ++ src/plugins/jobacct_storage/Makefile.in | 2 ++ src/plugins/jobacct_storage/filetxt/Makefile.in | 2 ++ src/plugins/jobacct_storage/mysql/Makefile.in | 2 ++ src/plugins/jobacct_storage/mysql/jobacct_storage_mysql.c | 3 --- src/plugins/jobacct_storage/none/Makefile.in | 2 ++ src/plugins/jobacct_storage/pgsql/Makefile.in | 2 ++ src/plugins/jobacct_storage/pgsql/jobacct_storage_pgsql.c | 3 --- src/plugins/jobcomp/mysql/Makefile.in | 2 ++ src/plugins/jobcomp/pgsql/Makefile.in | 2 ++ 13 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/plugins/jobacct_gather/Makefile.in b/src/plugins/jobacct_gather/Makefile.in index 813e391c1da..9075112c952 100644 --- a/src/plugins/jobacct_gather/Makefile.in +++ b/src/plugins/jobacct_gather/Makefile.in @@ -120,6 +120,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@ HAVE_AIX = @HAVE_AIX@ HAVE_ELAN = @HAVE_ELAN@ HAVE_FEDERATION = @HAVE_FEDERATION@ +HAVE_OPENSSL = @HAVE_OPENSSL@ HAVE_SOME_CURSES = @HAVE_SOME_CURSES@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -182,6 +183,7 @@ SSL_CPPFLAGS = @SSL_CPPFLAGS@ SSL_LDFLAGS = @SSL_LDFLAGS@ SSL_LIBS = @SSL_LIBS@ STRIP = @STRIP@ +UTIL_LIBS = @UTIL_LIBS@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ diff --git a/src/plugins/jobacct_gather/aix/Makefile.in b/src/plugins/jobacct_gather/aix/Makefile.in index 32516b09432..6a086734101 100644 --- a/src/plugins/jobacct_gather/aix/Makefile.in +++ b/src/plugins/jobacct_gather/aix/Makefile.in @@ -139,6 +139,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@ HAVE_AIX = @HAVE_AIX@ HAVE_ELAN = @HAVE_ELAN@ HAVE_FEDERATION = @HAVE_FEDERATION@ +HAVE_OPENSSL = @HAVE_OPENSSL@ HAVE_SOME_CURSES = @HAVE_SOME_CURSES@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -201,6 +202,7 @@ SSL_CPPFLAGS = @SSL_CPPFLAGS@ SSL_LDFLAGS = @SSL_LDFLAGS@ SSL_LIBS = @SSL_LIBS@ STRIP = @STRIP@ +UTIL_LIBS = @UTIL_LIBS@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ diff --git a/src/plugins/jobacct_gather/linux/Makefile.in b/src/plugins/jobacct_gather/linux/Makefile.in index d2bc5454b16..62cc2dc49d8 100644 --- a/src/plugins/jobacct_gather/linux/Makefile.in +++ b/src/plugins/jobacct_gather/linux/Makefile.in @@ -141,6 +141,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@ HAVE_AIX = @HAVE_AIX@ HAVE_ELAN = @HAVE_ELAN@ HAVE_FEDERATION = @HAVE_FEDERATION@ +HAVE_OPENSSL = @HAVE_OPENSSL@ HAVE_SOME_CURSES = @HAVE_SOME_CURSES@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -203,6 +204,7 @@ SSL_CPPFLAGS = @SSL_CPPFLAGS@ SSL_LDFLAGS = @SSL_LDFLAGS@ SSL_LIBS = @SSL_LIBS@ STRIP = @STRIP@ +UTIL_LIBS = @UTIL_LIBS@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ diff --git a/src/plugins/jobacct_gather/none/Makefile.in b/src/plugins/jobacct_gather/none/Makefile.in index 78a08c1301a..8107b9c1d32 100644 --- a/src/plugins/jobacct_gather/none/Makefile.in +++ b/src/plugins/jobacct_gather/none/Makefile.in @@ -138,6 +138,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@ HAVE_AIX = @HAVE_AIX@ HAVE_ELAN = @HAVE_ELAN@ HAVE_FEDERATION = @HAVE_FEDERATION@ +HAVE_OPENSSL = @HAVE_OPENSSL@ HAVE_SOME_CURSES = @HAVE_SOME_CURSES@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -200,6 +201,7 @@ SSL_CPPFLAGS = @SSL_CPPFLAGS@ SSL_LDFLAGS = @SSL_LDFLAGS@ SSL_LIBS = @SSL_LIBS@ STRIP = @STRIP@ +UTIL_LIBS = @UTIL_LIBS@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ diff --git a/src/plugins/jobacct_storage/Makefile.in b/src/plugins/jobacct_storage/Makefile.in index 96a1324c134..8a0abd40b8b 100644 --- a/src/plugins/jobacct_storage/Makefile.in +++ b/src/plugins/jobacct_storage/Makefile.in @@ -120,6 +120,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@ HAVE_AIX = @HAVE_AIX@ HAVE_ELAN = @HAVE_ELAN@ HAVE_FEDERATION = @HAVE_FEDERATION@ +HAVE_OPENSSL = @HAVE_OPENSSL@ HAVE_SOME_CURSES = @HAVE_SOME_CURSES@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -182,6 +183,7 @@ SSL_CPPFLAGS = @SSL_CPPFLAGS@ SSL_LDFLAGS = @SSL_LDFLAGS@ SSL_LIBS = @SSL_LIBS@ STRIP = @STRIP@ +UTIL_LIBS = @UTIL_LIBS@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ diff --git a/src/plugins/jobacct_storage/filetxt/Makefile.in b/src/plugins/jobacct_storage/filetxt/Makefile.in index 755d5fc93e4..3f2c667024d 100644 --- a/src/plugins/jobacct_storage/filetxt/Makefile.in +++ b/src/plugins/jobacct_storage/filetxt/Makefile.in @@ -142,6 +142,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@ HAVE_AIX = @HAVE_AIX@ HAVE_ELAN = @HAVE_ELAN@ HAVE_FEDERATION = @HAVE_FEDERATION@ +HAVE_OPENSSL = @HAVE_OPENSSL@ HAVE_SOME_CURSES = @HAVE_SOME_CURSES@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -204,6 +205,7 @@ SSL_CPPFLAGS = @SSL_CPPFLAGS@ SSL_LDFLAGS = @SSL_LDFLAGS@ SSL_LIBS = @SSL_LIBS@ STRIP = @STRIP@ +UTIL_LIBS = @UTIL_LIBS@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ diff --git a/src/plugins/jobacct_storage/mysql/Makefile.in b/src/plugins/jobacct_storage/mysql/Makefile.in index 070789fa8ac..45d731de9bf 100644 --- a/src/plugins/jobacct_storage/mysql/Makefile.in +++ b/src/plugins/jobacct_storage/mysql/Makefile.in @@ -141,6 +141,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@ HAVE_AIX = @HAVE_AIX@ HAVE_ELAN = @HAVE_ELAN@ HAVE_FEDERATION = @HAVE_FEDERATION@ +HAVE_OPENSSL = @HAVE_OPENSSL@ HAVE_SOME_CURSES = @HAVE_SOME_CURSES@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -203,6 +204,7 @@ SSL_CPPFLAGS = @SSL_CPPFLAGS@ SSL_LDFLAGS = @SSL_LDFLAGS@ SSL_LIBS = @SSL_LIBS@ STRIP = @STRIP@ +UTIL_LIBS = @UTIL_LIBS@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ diff --git a/src/plugins/jobacct_storage/mysql/jobacct_storage_mysql.c b/src/plugins/jobacct_storage/mysql/jobacct_storage_mysql.c index 395b84c8fab..14c1ea50ba1 100644 --- a/src/plugins/jobacct_storage/mysql/jobacct_storage_mysql.c +++ b/src/plugins/jobacct_storage/mysql/jobacct_storage_mysql.c @@ -548,9 +548,6 @@ extern int jobacct_storage_p_step_complete(struct step_record *step_ptr) int comp_status; int cpus = 0; struct jobacctinfo *jobacct = (struct jobacctinfo *)step_ptr->jobacct; -#ifdef HAVE_BG - char *ionodes = NULL; -#endif float ave_vsize = 0, ave_rss = 0, ave_pages = 0; float ave_cpu = 0, ave_cpu2 = 0; char *account; diff --git a/src/plugins/jobacct_storage/none/Makefile.in b/src/plugins/jobacct_storage/none/Makefile.in index 055140e11af..efda9605bb9 100644 --- a/src/plugins/jobacct_storage/none/Makefile.in +++ b/src/plugins/jobacct_storage/none/Makefile.in @@ -139,6 +139,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@ HAVE_AIX = @HAVE_AIX@ HAVE_ELAN = @HAVE_ELAN@ HAVE_FEDERATION = @HAVE_FEDERATION@ +HAVE_OPENSSL = @HAVE_OPENSSL@ HAVE_SOME_CURSES = @HAVE_SOME_CURSES@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -201,6 +202,7 @@ SSL_CPPFLAGS = @SSL_CPPFLAGS@ SSL_LDFLAGS = @SSL_LDFLAGS@ SSL_LIBS = @SSL_LIBS@ STRIP = @STRIP@ +UTIL_LIBS = @UTIL_LIBS@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ diff --git a/src/plugins/jobacct_storage/pgsql/Makefile.in b/src/plugins/jobacct_storage/pgsql/Makefile.in index 40be1ff5368..b7eb604c5e7 100644 --- a/src/plugins/jobacct_storage/pgsql/Makefile.in +++ b/src/plugins/jobacct_storage/pgsql/Makefile.in @@ -141,6 +141,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@ HAVE_AIX = @HAVE_AIX@ HAVE_ELAN = @HAVE_ELAN@ HAVE_FEDERATION = @HAVE_FEDERATION@ +HAVE_OPENSSL = @HAVE_OPENSSL@ HAVE_SOME_CURSES = @HAVE_SOME_CURSES@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -203,6 +204,7 @@ SSL_CPPFLAGS = @SSL_CPPFLAGS@ SSL_LDFLAGS = @SSL_LDFLAGS@ SSL_LIBS = @SSL_LIBS@ STRIP = @STRIP@ +UTIL_LIBS = @UTIL_LIBS@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ diff --git a/src/plugins/jobacct_storage/pgsql/jobacct_storage_pgsql.c b/src/plugins/jobacct_storage/pgsql/jobacct_storage_pgsql.c index 1af56d43e98..593ca0396f8 100644 --- a/src/plugins/jobacct_storage/pgsql/jobacct_storage_pgsql.c +++ b/src/plugins/jobacct_storage/pgsql/jobacct_storage_pgsql.c @@ -608,9 +608,6 @@ extern int jobacct_storage_p_step_complete(struct step_record *step_ptr) int comp_status; int cpus = 0; struct jobacctinfo *jobacct = (struct jobacctinfo *)step_ptr->jobacct; -#ifdef HAVE_BG - char *ionodes = NULL; -#endif float ave_vsize = 0, ave_rss = 0, ave_pages = 0; float ave_cpu = 0, ave_cpu2 = 0; char *account; diff --git a/src/plugins/jobcomp/mysql/Makefile.in b/src/plugins/jobcomp/mysql/Makefile.in index 6f49491c4cf..e5691a8c1e9 100644 --- a/src/plugins/jobcomp/mysql/Makefile.in +++ b/src/plugins/jobcomp/mysql/Makefile.in @@ -140,6 +140,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@ HAVE_AIX = @HAVE_AIX@ HAVE_ELAN = @HAVE_ELAN@ HAVE_FEDERATION = @HAVE_FEDERATION@ +HAVE_OPENSSL = @HAVE_OPENSSL@ HAVE_SOME_CURSES = @HAVE_SOME_CURSES@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -202,6 +203,7 @@ SSL_CPPFLAGS = @SSL_CPPFLAGS@ SSL_LDFLAGS = @SSL_LDFLAGS@ SSL_LIBS = @SSL_LIBS@ STRIP = @STRIP@ +UTIL_LIBS = @UTIL_LIBS@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ diff --git a/src/plugins/jobcomp/pgsql/Makefile.in b/src/plugins/jobcomp/pgsql/Makefile.in index dec612586cf..fe309639e1e 100644 --- a/src/plugins/jobcomp/pgsql/Makefile.in +++ b/src/plugins/jobcomp/pgsql/Makefile.in @@ -140,6 +140,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@ HAVE_AIX = @HAVE_AIX@ HAVE_ELAN = @HAVE_ELAN@ HAVE_FEDERATION = @HAVE_FEDERATION@ +HAVE_OPENSSL = @HAVE_OPENSSL@ HAVE_SOME_CURSES = @HAVE_SOME_CURSES@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -202,6 +203,7 @@ SSL_CPPFLAGS = @SSL_CPPFLAGS@ SSL_LDFLAGS = @SSL_LDFLAGS@ SSL_LIBS = @SSL_LIBS@ STRIP = @STRIP@ +UTIL_LIBS = @UTIL_LIBS@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ -- GitLab