X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=configure;h=df62cc05b80a094c9281bac2fc40a0111bdf17f9;hb=9ae83d514b47d31e5b18612484f78aa6f9888449;hp=af046223933d8f18b477bc9b5b5d3b8b8befedc2;hpb=c269396a37a8bef1b71982f2cdd336324eb72d07;p=prosody.git diff --git a/configure b/configure index af046223..df62cc05 100755 --- a/configure +++ b/configure @@ -16,6 +16,7 @@ OPENSSL_LIB=crypto CC=gcc CXX=g++ LD=gcc +RUNWITH=lua CFLAGS="-fPIC -Wall" LDFLAGS="-shared" @@ -96,6 +97,7 @@ do LUA_SUFFIX_SET=yes LUA_INCDIR=/usr/include/lua5.1; LUA_INCDIR_SET=yes + CFLAGS="$CFLAGS -D_GNU_SOURCE" fi if [ "$OSTYPE" = "macosx" ] then LUA_INCDIR=/usr/local/include; @@ -110,9 +112,10 @@ do LUA_LIBDIR=/usr/local/lib LUA_LIBDIR_SET=yes CFLAGS="-Wall -fPIC" + CFLAGS="$CFLAGS -D_GNU_SOURCE" LDFLAGS="-shared" fi - if [ "$OSTYPE" = "freebsd" ] + if [ "$OSTYPE" = "freebsd" -o "$OSTYPE" = "openbsd" ] then LUA_INCDIR="/usr/local/include/lua51" LUA_INCDIR_SET=yes CFLAGS="-Wall -fPIC -I/usr/local/include" @@ -122,6 +125,9 @@ do LUA_DIR=/usr/local LUA_DIR_SET=yes fi + if [ "$OSTYPE" = "openbsd" ] + then LUA_INCDIR="/usr/local/include"; + fi ;; --datadir=*) DATADIR="$value" @@ -166,6 +172,9 @@ do --linker=*) LD="$value" ;; + --runwith=*) + RUNWITH="$value" + ;; *) echo "Error: Unknown flag: $1" exit 1 @@ -336,6 +345,7 @@ LDFLAGS=$LDFLAGS CC=$CC CXX=$CXX LD=$LD +RUNWITH=$RUNWITH EOF