Fix broken build.

file_2168.txt

---- slurm-llnl-15.08.4.orig/src/sacct/options.c
-+++ slurm-llnl-15.08.4/src/sacct/options.c
-@@ -320,7 +320,7 @@
-      -j, --jobs:                                                            \n\
- 	           Format is <job(.step)>. Display information about this   \n\
-                    job or comma-separated list of jobs. The default is all  \n\
--                   jobs. Adding .step will display the specfic job step of  \n\
-+                   jobs. Adding .step will display the specific job step of \n\
-                    that job. (A step id of 'batch' will display the         \n\
-                    information about the batch step.)                       \n\
-      -k, --timelimit-min:                                                   \n\

src/common/xlua.c

@@ -47,20 +47,20 @@ int xlua_dlopen(void)
 	 *   ensure symbols from liblua are available to libs opened
 	 *   by any lua scripts.
 	 */
-	if (
 #ifdef HAVE_LUA_5_2
-	    !dlopen("liblua-5.2.so",   RTLD_NOW | RTLD_GLOBAL) &&
-	    !dlopen("liblua5.2.so",    RTLD_NOW | RTLD_GLOBAL) &&
-	    !dlopen("liblua5.2.so.0",  RTLD_NOW | RTLD_GLOBAL)
+	if (!dlopen("liblua-5.2.so", RTLD_NOW | RTLD_GLOBAL)
+	    && !dlopen("liblua5.2.so", RTLD_NOW | RTLD_GLOBAL)
+	    && !dlopen("liblua5.2.so.0", RTLD_NOW | RTLD_GLOBAL)) {
+		error("Failed to open liblua.so: %s", dlerror());
+		return SLURM_ERROR;
+	}
 #elif HAVE_LUA_5_1
-	    !dlopen("liblua-5.1.so",   RTLD_NOW | RTLD_GLOBAL) &&
-	    !dlopen("liblua5.1.so",    RTLD_NOW | RTLD_GLOBAL) &&
-	    !dlopen("liblua5.1.so.0",  RTLD_NOW | RTLD_GLOBAL)
-#endif
-	   ) {
+	if (!dlopen("liblua-5.1.so", RTLD_NOW | RTLD_GLOBAL)
+	    && !dlopen("liblua5.1.so", RTLD_NOW | RTLD_GLOBAL)
+	    && !dlopen("liblua5.1.so.0", RTLD_NOW | RTLD_GLOBAL) {
 		error("Failed to open liblua.so: %s", dlerror());
 		return SLURM_ERROR;
 	}
-
+#endif
 	return SLURM_SUCCESS;
 }