prosody
da791f11e20c
configure
Software / code / prosody
Comparison
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 |
comparison
equal
deleted
inserted
replaced
| 7942:21a25b29ebeb | 7943:da791f11e20c |
|---|---|
| 168 if [ "$OSTYPE" = "debian" ]; then | 168 if [ "$OSTYPE" = "debian" ]; then |
| 169 if [ "$LUA_SUFFIX_SET" != "yes" ]; then | 169 if [ "$LUA_SUFFIX_SET" != "yes" ]; then |
| 170 LUA_SUFFIX="5.1"; | 170 LUA_SUFFIX="5.1"; |
| 171 LUA_SUFFIX_SET=yes | 171 LUA_SUFFIX_SET=yes |
| 172 fi | 172 fi |
| 173 RUNWITH="lua$LUA_SUFFIX" | |
| 174 LUA_INCDIR="/usr/include/lua$LUA_SUFFIX" | 173 LUA_INCDIR="/usr/include/lua$LUA_SUFFIX" |
| 175 LUA_INCDIR_SET=yes | 174 LUA_INCDIR_SET=yes |
| 176 CFLAGS="$CFLAGS -ggdb" | 175 CFLAGS="$CFLAGS -ggdb" |
| 177 fi | 176 fi |
| 178 if [ "$OSTYPE" = "macosx" ]; then | 177 if [ "$OSTYPE" = "macosx" ]; then |
| 205 if [ "$OSTYPE" = "openbsd" ]; then | 204 if [ "$OSTYPE" = "openbsd" ]; then |
| 206 LUA_INCDIR="/usr/local/include"; | 205 LUA_INCDIR="/usr/local/include"; |
| 207 LUA_INCDIR_SET="yes" | 206 LUA_INCDIR_SET="yes" |
| 208 fi | 207 fi |
| 209 if [ "$OSTYPE" = "netbsd" ]; then | 208 if [ "$OSTYPE" = "netbsd" ]; then |
| 210 RUNWITH="lua5.1" | |
| 211 LUA_INCDIR="/usr/pkg/include/lua-5.1" | 209 LUA_INCDIR="/usr/pkg/include/lua-5.1" |
| 212 LUA_INCDIR_SET=yes | 210 LUA_INCDIR_SET=yes |
| 213 LUA_LIBDIR="/usr/pkg/lib/lua/5.1" | 211 LUA_LIBDIR="/usr/pkg/lib/lua/5.1" |
| 214 LUA_LIBDIR_SET=yes | 212 LUA_LIBDIR_SET=yes |
| 215 CFLAGS="-Wall -fPIC -I/usr/pkg/include" | 213 CFLAGS="-Wall -fPIC -I/usr/pkg/include" |
| 306 --linker) | 304 --linker) |
| 307 LD="$value" | 305 LD="$value" |
| 308 ;; | 306 ;; |
| 309 --runwith) | 307 --runwith) |
| 310 RUNWITH="$value" | 308 RUNWITH="$value" |
| 309 RUNWITH_SET=yes | |
| 311 ;; | 310 ;; |
| 312 --no-example-certs) | 311 --no-example-certs) |
| 313 EXCERTS= | 312 EXCERTS= |
| 314 ;; | 313 ;; |
| 315 --compiler-wrapper) | 314 --compiler-wrapper) |
| 524 IDNA_LIBS="-l$IDN_LIB" | 523 IDNA_LIBS="-l$IDN_LIB" |
| 525 fi | 524 fi |
| 526 | 525 |
| 527 if [ -f config.unix ]; then | 526 if [ -f config.unix ]; then |
| 528 rm -f config.unix | 527 rm -f config.unix |
| 528 fi | |
| 529 | |
| 530 if [ "$RUNWITH_SET" != yes ]; then | |
| 531 RUNWITH="lua$LUA_SUFFIX" | |
| 529 fi | 532 fi |
| 530 | 533 |
| 531 OPENSSL_LIBS="-l$OPENSSL_LIB" | 534 OPENSSL_LIBS="-l$OPENSSL_LIB" |
| 532 | 535 |
| 533 if [ "$PRNG" = "OPENSSL" ]; then | 536 if [ "$PRNG" = "OPENSSL" ]; then |
