prosody
39c5c49616ab
configure

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

configure @ 6888:39c5c49616ab

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 27 Sep 2015 00:37:18 +0200
parent 6886:27f5a76e3fa5
child 7187:3d2c2f0809ee
comparison
equal deleted inserted replaced
6871:e4b5885b7712 6888:39c5c49616ab
110 if [ "$OSTYPE" = "macosx" ]; then 110 if [ "$OSTYPE" = "macosx" ]; then
111 LUA_INCDIR=/usr/local/include; 111 LUA_INCDIR=/usr/local/include;
112 LUA_INCDIR_SET=yes 112 LUA_INCDIR_SET=yes
113 LUA_LIBDIR=/usr/local/lib 113 LUA_LIBDIR=/usr/local/lib
114 LUA_LIBDIR_SET=yes 114 LUA_LIBDIR_SET=yes
115 CFLAGS="$CFLAGS -mmacosx-version-min=10.3"
115 LDFLAGS="-bundle -undefined dynamic_lookup" 116 LDFLAGS="-bundle -undefined dynamic_lookup"
116 fi 117 fi
117 if [ "$OSTYPE" = "linux" ]; then 118 if [ "$OSTYPE" = "linux" ]; then
118 LUA_INCDIR=/usr/local/include; 119 LUA_INCDIR=/usr/local/include;
119 LUA_INCDIR_SET=yes 120 LUA_INCDIR_SET=yes
306 fi 307 fi
307 if [ "$IDN_LIBRARY" = "idn" ] 308 if [ "$IDN_LIBRARY" = "idn" ]
308 then 309 then
309 IDNA_LIBS="-l$IDN_LIB" 310 IDNA_LIBS="-l$IDN_LIB"
310 fi 311 fi
312
313 OPENSSL_LIBS="-l$OPENSSL_LIB"
311 314
312 echo -n "Checking Lua includes... " 315 echo -n "Checking Lua includes... "
313 lua_h="$LUA_INCDIR/lua.h" 316 lua_h="$LUA_INCDIR/lua.h"
314 if [ -f "$lua_h" ] 317 if [ -f "$lua_h" ]
315 then 318 then
359 LUA_LIBDIR=$LUA_LIBDIR 362 LUA_LIBDIR=$LUA_LIBDIR
360 LUA_BINDIR=$LUA_BINDIR 363 LUA_BINDIR=$LUA_BINDIR
361 REQUIRE_CONFIG=$REQUIRE_CONFIG 364 REQUIRE_CONFIG=$REQUIRE_CONFIG
362 IDN_LIB=$IDN_LIB 365 IDN_LIB=$IDN_LIB
363 IDNA_LIBS=$IDNA_LIBS 366 IDNA_LIBS=$IDNA_LIBS
364 OPENSSL_LIB=$OPENSSL_LIB 367 OPENSSL_LIBS=$OPENSSL_LIBS
365 CFLAGS=$CFLAGS 368 CFLAGS=$CFLAGS
366 LDFLAGS=$LDFLAGS 369 LDFLAGS=$LDFLAGS
367 CC=$CC 370 CC=$CC
368 CXX=$CXX 371 CXX=$CXX
369 LD=$LD 372 LD=$LD