Merge pull request #373 from grondo/lua-5.2

rdl: Lua 5.2 compatibility

.travis.yml

@@ -2,24 +2,23 @@ language: c
 
 sudo: false
 
-compiler:
-  - gcc
-  - clang
-
 matrix:
   include:
     - compiler: gcc
-      env: COVERAGE=t
+      env: LUA_VERSION=5.1
+    - compiler: clang
+      env: LUA_VERSION=5.1
+    - compiler: gcc
+      env: LUA_VERSION=5.1 COVERAGE=t
     - compiler: gcc
-      env: TEST_INSTALL=t
+      env: LUA_VERSION=5.2 TEST_INSTALL=t
     - compiler: clang
-      env: CC=clang-3.8 CXX=clang++-3.8
+      env: LUA_VERSION=5.2 CC=clang-3.8 CXX=clang++-3.8
     - compiler: clang
-      env: CPPCHECK=t
+      env: LUA_VERSION=5.1 CPPCHECK=t
 cache:
   directories:
     - $HOME/local
-    - $HOME/.luarocks
     - $HOME/.ccache
     - $HOME/.local
 
@@ -35,9 +34,6 @@ addons:
       - clang-3.8
       - gcc-4.9
       - g++-4.9
-      - lua5.1
-      - liblua5.1-0-dev
-      - luarocks
       - uuid-dev
       - aspell
       - libopenmpi-dev
@@ -54,6 +50,7 @@ addons:
       - libevent-dev
 
 before_install:
+  - rm -rf $HOME/.luarocks
   - wget https://raw.githubusercontent.com/flux-framework/flux-core/master/src/test/travis-dep-builder.sh
   - eval $(bash ./travis-dep-builder.sh --printenv)
   - export PKG_CONFIG_PATH=$HOME/local2/lib/pkgconfig:${PKG_CONFIG_PATH}

configure.ac

@@ -49,6 +49,17 @@ AX_VALGRIND_H
 AX_PROG_LUA([5.1],[5.3])
 AX_LUA_HEADERS
 AX_LUA_LIBS
+#  Glean liblua name from LUA_LIB set by AX_LUA_LIBS
+LIBLUA_SONAME=`echo $LUA_LIB | sed 's/.*-l\(lua[[0-9.-]]*\).*/lib\1.so/'`
+AC_MSG_CHECKING([for liblua DSO name])
+AS_IF([test "x$LIBLUA_SONAME" != "x"],
+      [AC_MSG_RESULT([$LIBLUA_SONAME])],
+      [AC_MSG_RESULT([no])
+       AC_MSG_ERROR([Unable to determine name of the liblua shared library])
+      ])
+AC_DEFINE_UNQUOTED([LIBLUA_SO], ["$LIBLUA_SONAME"],
+                   [Define the liblua DSO filename])
+
 PKG_CHECK_MODULES([UUID], [uuid], [], [])
 AX_FLUX_CORE
 AX_BOOST_BASE([1.53.0], [], [AC_MSG_ERROR([Please install boost >= 1.53)])])