Software / code / prosody
Diff
configure @ 7943:da791f11e20c
configure: Set RUNWITH to lua + lua-suffix unless --runwith is given (fixes #721, #777)
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 02 Mar 2017 23:01:12 +0100 |
| parent | 7942:21a25b29ebeb |
| child | 7945:1f4a0e0b7167 |
line wrap: on
line diff
--- a/configure Thu Mar 02 22:58:34 2017 +0100 +++ b/configure Thu Mar 02 23:01:12 2017 +0100 @@ -170,7 +170,6 @@ 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 @@ 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 @@ ;; --runwith) RUNWITH="$value" + RUNWITH_SET=yes ;; --no-example-certs) EXCERTS= @@ -528,6 +527,10 @@ rm -f config.unix fi +if [ "$RUNWITH_SET" != yes ]; then + RUNWITH="lua$LUA_SUFFIX" +fi + OPENSSL_LIBS="-l$OPENSSL_LIB" if [ "$PRNG" = "OPENSSL" ]; then
