Merge pull request #6 from garlick/ubuntu-fixes

Various minor fixes when building on ubuntu 14.04.1 LTS Trusty Tahr

README.md

@@ -15,6 +15,8 @@ zeromq4-devel >= 4.0.4   # built --with-libsodium
 czmq-devel >= 2.2.0
 munge-devel
 json-c-devel
+lua-5.1-devel
+asciidoc
 ```
 Spec files for building zeromq4 and czmq packages on a RHEL 6 based
 system are provided for your convenience in foreign/rpm.

doc/cmd/Makefile.am

@@ -25,10 +25,14 @@ SUFFIXES = .adoc .1
 	    --attribute manmanual="Flux Manual" \
 	    --doctype manpage --format manpage $<
 
-EXTRA_DIST = $(ADOC_FILES) COPYRIGHT.adoc spellcheck spell.en.pws
+EXTRA_DIST = $(ADOC_FILES) COPYRIGHT.adoc spell.en.pws
 
 CLEANFILES = $(MAN1_FILES) $(XML_FILES)
 
-TESTS_ENVIRONMENT = $(srcdir)/spellcheck $(abs_srcdir)/spell.en.pws
+noinst_SCRIPTS = spellcheck
 
-TESTS = $(MAN1_FILES)
+TESTS_ENVIRONMENT = \
+	pws_dict=$(abs_srcdir)/spell.en.pws \
+	man_dir=$(abs_builddir)
+
+TESTS = spellcheck

doc/cmd/spell.en.pws

@@ -105,3 +105,8 @@ noexec
 pre
 slurm
 srun
+cryptographic
+unlink
+timestamped
+libs
+scalable

doc/cmd/spellcheck

@@ -1,19 +1,26 @@
 #!/bin/bash
 
-if test $# != 2; then
-    echo Usage: spellcheck pws-dict file >&2
+if test $man_dir; then
+    set ${man_dir}/*.[1-9]
+fi
+
+if test $# == 0; then
+    echo "Usage: spellcheck file [file...]" >&2
     exit 1
 fi
-declare dict=$1
-declare file=$2
 
+dict=${pws_dict:-./spell.en.pws}
 if ! test -r $dict; then
    echo Dictionary $dict not found >&2
    exit 1
 fi
 
-tmpfile=$(mktemp)
-rc=$(cat $file | aspell -p $dict -n list | sort | uniq | tee $tmpfile | wc -l)
-cat $tmpfile
-rm -f $tmpfile
-exit $rc
+exit_val=0
+for f in $*; do
+    tmpfile=$(mktemp)
+    rc=$(cat $f | aspell -p $dict -n list | sort | uniq | tee $tmpfile | wc -l)
+    test $rc == 0 || exit_val=$rc
+    cat $tmpfile | sed -e "s!^!$(basename $f): !"
+    rm -f $tmpfile
+done
+exit $exit_val

src/bindings/lua/Makefile.am

@@ -38,7 +38,8 @@ flux_la_LIBADD = \
 	$(top_builddir)/src/common/liblsd/liblsd.la \
 	$(JSON_LIBS) \
 	$(LIBZMQ) \
-	$(LIBCZMQ)
+	$(LIBCZMQ) \
+	$(LIBUTIL)
 
 flux_la_SOURCES = \
 	flux-lua.c \

src/cmd/flux-start.c

@@ -27,6 +27,8 @@
 #endif
 #include <stdio.h>
 #include <getopt.h>
+#include <sys/time.h>
+#include <sys/resource.h>
 #include <flux/core.h>
 
 #include "src/common/libutil/xzmalloc.h"

src/lib/libcore/Makefile.am

@@ -15,7 +15,8 @@ libflux_core_la_LIBADD = \
 	$(top_builddir)/src/common/libflux/libflux.la \
 	$(top_builddir)/src/common/libutil/libutil.la \
 	$(top_builddir)/src/common/liblsd/liblsd.la \
-	$(LIBMUNGE) $(JSON_LIBS) $(LIBZMQ) $(LIBCZMQ) $(LIBPTHREAD) $(LIBUTIL)
+	$(LIBMUNGE) $(JSON_LIBS) $(LIBZMQ) $(LIBCZMQ) $(LIBPTHREAD) $(LIBUTIL) \
+	$(LIBDL)
 
 libflux_core_la_LDFLAGS = -Wl,--version-script=$(srcdir)/version.map
 

src/modules/wreck/Makefile.am

@@ -1,6 +1,7 @@
 AM_CFLAGS = @GCCWARN@
 
 AM_CPPFLAGS = \
+	$(LUA_INCLUDE) \
 	$(JSON_CFLAGS) \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/src/include \
@@ -76,7 +77,7 @@ wrexecd_LDADD = \
 	$(top_builddir)/src/modules/kvs/libkvs.la \
 	$(top_builddir)/src/common/liblsd/liblsd.la \
 	$(top_builddir)/src/common/libutil/libutil.la \
-	$(JSON_LIBS) $(LIBZMQ) $(LIBCZMQ) $(LUA_LIB)
+	$(JSON_LIBS) $(LIBZMQ) $(LIBCZMQ) $(LUA_LIB) $(LIBPTHREAD)
 
 dist_wreckscripts_SCRIPTS = \
 	lua.d/01-env.lua