diff options
| author | Kim Alvefur <zash@zash.se> | 2017-03-02 23:01:12 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-03-02 23:01:12 +0100 |
| commit | fdf81e53aa57c68f330deecf4f97cfefb05f5044 (patch) | |
| tree | 24aa0a298ca27c8c7a1504a199c97444e991b439 | |
| parent | 5e95987f9731d62d6abbe05d622d6b150806367a (diff) | |
| download | prosody-fdf81e53aa57c68f330deecf4f97cfefb05f5044.tar.gz prosody-fdf81e53aa57c68f330deecf4f97cfefb05f5044.zip | |
configure: Set RUNWITH to lua + lua-suffix unless --runwith is given (fixes #721, #777)
| -rwxr-xr-x | configure | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -170,7 +170,6 @@ do LUA_SUFFIX="5.1"; LUA_SUFFIX_SET=yes fi - RUNWITH="lua$LUA_SUFFIX" LUA_INCDIR="/usr/include/lua$LUA_SUFFIX" LUA_INCDIR_SET=yes CFLAGS="$CFLAGS -ggdb" @@ -207,7 +206,6 @@ do LUA_INCDIR_SET="yes" fi if [ "$OSTYPE" = "netbsd" ]; then - RUNWITH="lua5.1" LUA_INCDIR="/usr/pkg/include/lua-5.1" LUA_INCDIR_SET=yes LUA_LIBDIR="/usr/pkg/lib/lua/5.1" @@ -308,6 +306,7 @@ do ;; --runwith) RUNWITH="$value" + RUNWITH_SET=yes ;; --no-example-certs) EXCERTS= @@ -528,6 +527,10 @@ if [ -f config.unix ]; then rm -f config.unix fi +if [ "$RUNWITH_SET" != yes ]; then + RUNWITH="lua$LUA_SUFFIX" +fi + OPENSSL_LIBS="-l$OPENSSL_LIB" if [ "$PRNG" = "OPENSSL" ]; then |