Software `/` code `/` prosody

Annotate

configure @ 7944:36a9a4af1873

Merge 0.10->trunk

author	Kim Alvefur <zash@zash.se>
date	Thu, 02 Mar 2017 23:03:02 +0100
parent	7943:da791f11e20c
child	7945:1f4a0e0b7167

rev	line source
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	1 #!/bin/sh
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	2
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	3 # Defaults
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	4
7609 01df17dc06a4 configure: Quote strings Kim Alvefur <zash@zash.se> parents: 7608 diff changeset	5 PREFIX="/usr/local"
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	6 SYSCONFDIR="$PREFIX/etc/prosody"
6574 cd0088c73daf configure, Makefile: Add --libdir option to ./configure, allowing you to override the $PREFIX/lib/ default. Fixes #470. Matthew Wild <mwild1@gmail.com> parents: 5933 diff changeset	7 LIBDIR="$PREFIX/lib"
502 21dc299387a6 Installation improvements (auto-creation of data directories) Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	8 DATADIR="$PREFIX/var/lib/prosody"
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	9 LUA_SUFFIX=""
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	10 LUA_DIR="/usr"
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	11 LUA_BINDIR="/usr/bin"
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	12 LUA_INCDIR="/usr/include"
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	13 LUA_LIBDIR="/usr/lib"
7609 01df17dc06a4 configure: Quote strings Kim Alvefur <zash@zash.se> parents: 7608 diff changeset	14 IDN_LIB="idn"
3762 f02bac902a1e util.encodings: Support for ICU for IDNA operations. Tobias Markmann <tm@ayena.de> parents: 3352 diff changeset	15 ICU_FLAGS="-licui18n -licudata -licuuc"
7609 01df17dc06a4 configure: Quote strings Kim Alvefur <zash@zash.se> parents: 7608 diff changeset	16 OPENSSL_LIB="crypto"
01df17dc06a4 configure: Quote strings Kim Alvefur <zash@zash.se> parents: 7608 diff changeset	17 CC="gcc"
01df17dc06a4 configure: Quote strings Kim Alvefur <zash@zash.se> parents: 7608 diff changeset	18 LD="gcc"
01df17dc06a4 configure: Quote strings Kim Alvefur <zash@zash.se> parents: 7608 diff changeset	19 RUNWITH="lua"
01df17dc06a4 configure: Quote strings Kim Alvefur <zash@zash.se> parents: 7608 diff changeset	20 EXCERTS="yes"
7187 3d2c2f0809ee util.crand: C binding to one of OpenSSL, Linux getrandom() or OpenBSD arc4random() CSPRNG Kim Alvefur <zash@zash.se> parents: 6886 diff changeset	21 PRNG=
3d2c2f0809ee util.crand: C binding to one of OpenSSL, Linux getrandom() or OpenBSD arc4random() CSPRNG Kim Alvefur <zash@zash.se> parents: 6886 diff changeset	22 PRNGLIBS=
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	23
7935 96fa5ef5d613 configure: Set C standard to C99 Kim Alvefur <zash@zash.se> parents: 7931 diff changeset	24 CFLAGS="-fPIC -Wall -pedantic -std=c99"
2315 174b4a83f5b7 configure: Add 'linux' ostype and rename lflags to LDFLAGS to match expectations. Brian Cully <bjc@junctionnetworks.com> parents: 1081 diff changeset	25 LDFLAGS="-shared"
511 f9ab28562fda Potential fixes for building on Mac OSX Matthew Wild <mwild1@gmail.com> parents: 502 diff changeset	26
7609 01df17dc06a4 configure: Quote strings Kim Alvefur <zash@zash.se> parents: 7608 diff changeset	27 IDN_LIBRARY="idn"
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	28 # Help
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	29
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	30 show_help() {
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	31 cat <<EOF
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	32 Configure Prosody prior to building.
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	33
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	34 --help This help.
7632 2b14e2121700 configure: Add ostype preset for NetBSD Holger Weiss <holger@zedat.fu-berlin.de> parents: 7618 diff changeset	35 --ostype=OS Use one of the OS presets. May be one of:
2b14e2121700 configure: Add ostype preset for NetBSD Holger Weiss <holger@zedat.fu-berlin.de> parents: 7618 diff changeset	36 debian, macosx, linux, freebsd, openbsd, netbsd
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	37 --prefix=DIR Prefix where Prosody should be installed.
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	38 Default is $PREFIX
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	39 --sysconfdir=DIR Location where the config file should be installed.
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	40 Default is \$PREFIX/etc/prosody
6574 cd0088c73daf configure, Makefile: Add --libdir option to ./configure, allowing you to override the $PREFIX/lib/ default. Fixes #470. Matthew Wild <mwild1@gmail.com> parents: 5933 diff changeset	41 --libdir=DIR Location where the server files should be stored.
cd0088c73daf configure, Makefile: Add --libdir option to ./configure, allowing you to override the $PREFIX/lib/ default. Fixes #470. Matthew Wild <mwild1@gmail.com> parents: 5933 diff changeset	42 Default is \$PREFIX/lib
502 21dc299387a6 Installation improvements (auto-creation of data directories) Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	43 --datadir=DIR Location where the server data should be stored.
21dc299387a6 Installation improvements (auto-creation of data directories) Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	44 Default is \$PREFIX/var/lib/prosody
7942 21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	45 --lua-version=VERSION Use specific Lua version: 5.1, 5.2, or 5.3
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	46 Default is auto-detected.
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	47 --lua-suffix=SUFFIX Versioning suffix to use in Lua filenames.
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	48 Default is "$LUA_SUFFIX" (lua$LUA_SUFFIX...)
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	49 --with-lua=PREFIX Use Lua from given prefix.
7942 21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	50 Default is auto-detected (the parent directory of \$LUA_BINDIR).
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	51 --with-lua-bin=DIR You can also specify Lua's bin dir.
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	52 Default is the directory of the auto-detected Lua interpreter,
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	53 or \$LUA_DIR/bin if --with-lua is used.
5421 a3f0fe9431cf configure: Add RUNWITH to --help Kim Alvefur <zash@zash.se> parents: 5401 diff changeset	54 --runwith=BINARY What Lua binary to set as runtime environment.
a3f0fe9431cf configure: Add RUNWITH to --help Kim Alvefur <zash@zash.se> parents: 5401 diff changeset	55 Default is $RUNWITH
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	56 --with-lua-include=DIR You can also specify Lua's includes dir.
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	57 Default is \$LUA_DIR/include
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	58 --with-lua-lib=DIR You can also specify Lua's libraries dir.
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	59 Default is \$LUA_DIR/lib
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	60 --with-idn=LIB The name of the IDN library to link with.
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	61 Default is $IDN_LIB
5422 396072d62695 configure: Replaces tabs with spaces in --help Kim Alvefur <zash@zash.se> parents: 5421 diff changeset	62 --idn-library=(idn\|icu) Select library to use for IDNA functionality.
396072d62695 configure: Replaces tabs with spaces in --help Kim Alvefur <zash@zash.se> parents: 5421 diff changeset	63 idn: use GNU libidn (default)
396072d62695 configure: Replaces tabs with spaces in --help Kim Alvefur <zash@zash.se> parents: 5421 diff changeset	64 icu: use ICU from IBM
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	65 --with-ssl=LIB The name of the SSL to link with.
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	66 Default is $OPENSSL_LIB
7187 3d2c2f0809ee util.crand: C binding to one of OpenSSL, Linux getrandom() or OpenBSD arc4random() CSPRNG Kim Alvefur <zash@zash.se> parents: 6886 diff changeset	67 --with-random=METHOD CSPRNG backend to use. One of
3d2c2f0809ee util.crand: C binding to one of OpenSSL, Linux getrandom() or OpenBSD arc4random() CSPRNG Kim Alvefur <zash@zash.se> parents: 6886 diff changeset	68 getrandom: Linux kernel
3d2c2f0809ee util.crand: C binding to one of OpenSSL, Linux getrandom() or OpenBSD arc4random() CSPRNG Kim Alvefur <zash@zash.se> parents: 6886 diff changeset	69 arc4random: OpenBSD kernel
3d2c2f0809ee util.crand: C binding to one of OpenSSL, Linux getrandom() or OpenBSD arc4random() CSPRNG Kim Alvefur <zash@zash.se> parents: 6886 diff changeset	70 openssl: OpenSSL RAND method
3d2c2f0809ee util.crand: C binding to one of OpenSSL, Linux getrandom() or OpenBSD arc4random() CSPRNG Kim Alvefur <zash@zash.se> parents: 6886 diff changeset	71 Default is to use /dev/urandom
511 f9ab28562fda Potential fixes for building on Mac OSX Matthew Wild <mwild1@gmail.com> parents: 502 diff changeset	72 --cflags=FLAGS Flags to pass to the compiler
f9ab28562fda Potential fixes for building on Mac OSX Matthew Wild <mwild1@gmail.com> parents: 502 diff changeset	73 Default is $CFLAGS
2315 174b4a83f5b7 configure: Add 'linux' ostype and rename lflags to LDFLAGS to match expectations. Brian Cully <bjc@junctionnetworks.com> parents: 1081 diff changeset	74 --ldflags=FLAGS Flags to pass to the linker
174b4a83f5b7 configure: Add 'linux' ostype and rename lflags to LDFLAGS to match expectations. Brian Cully <bjc@junctionnetworks.com> parents: 1081 diff changeset	75 Default is $LDFLAGS
798 2a92b58144a9 Use $CC, $LD in Makefile. Add --c-compiler, --linker flags to ./configure script. Add --lflags to ./configure script. Thanks to Lorenzo for the initial patch! Matthew Wild <mwild1@gmail.com> parents: 536 diff changeset	76 --c-compiler=CC The C compiler to use when building modules.
2a92b58144a9 Use $CC, $LD in Makefile. Add --c-compiler, --linker flags to ./configure script. Add --lflags to ./configure script. Thanks to Lorenzo for the initial patch! Matthew Wild <mwild1@gmail.com> parents: 536 diff changeset	77 Default is $CC
2a92b58144a9 Use $CC, $LD in Makefile. Add --c-compiler, --linker flags to ./configure script. Add --lflags to ./configure script. Thanks to Lorenzo for the initial patch! Matthew Wild <mwild1@gmail.com> parents: 536 diff changeset	78 --linker=CC The linker to use when building modules.
2a92b58144a9 Use $CC, $LD in Makefile. Add --c-compiler, --linker flags to ./configure script. Add --lflags to ./configure script. Thanks to Lorenzo for the initial patch! Matthew Wild <mwild1@gmail.com> parents: 536 diff changeset	79 Default is $LD
4451 70275ab52ab2 configure: Add 'openbsd' preset (thanks xavier) Matthew Wild <mwild1@gmail.com> parents: 4444 diff changeset	80 --require-config Will cause Prosody to refuse to run when
70275ab52ab2 configure: Add 'openbsd' preset (thanks xavier) Matthew Wild <mwild1@gmail.com> parents: 4444 diff changeset	81 it fails to find a configuration file
5933 56b1f151f4a3 Makefile, configure: Add option for disabling generation of example certificates Kim Alvefur <zash@zash.se> parents: 5422 diff changeset	82 --no-example-certs Disables generation of example certificates.
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	83 EOF
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	84 }
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	85
7942 21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	86 # Helper functions
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	87
7942 21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	88 find_program() {
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	89 prog=`command -v "$1" 2>/dev/null`
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	90 if [ -n "$prog" ]
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	91 then
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	92 dirname "$prog"
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	93 fi
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	94 }
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	95
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	96 die() {
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	97 echo "$*"
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	98 echo
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	99 echo "configure failed."
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	100 echo
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	101 exit 1
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	102 }
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	103
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	104 find_helper() {
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	105 explanation="$1"
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	106 shift
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	107 tried="$*"
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	108 while [ -n "$1" ]
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	109 do
7942 21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	110 found=`find_program "$1"`
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	111 if [ -n "$found" ]
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	112 then
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	113 echo "$1 found at $found"
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	114 HELPER=$1
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	115 return
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	116 fi
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	117 shift
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	118 done
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	119 echo "Could not find $explanation. Tried: $tried."
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	120 die "Make sure one of them is installed and available in your PATH."
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	121 }
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	122
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	123 case `echo -n x` in
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	124 -n*) echo_n_flag='';;
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	125 *) echo_n_flag='-n';;
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	126 esac
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	127
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	128 echo_n() {
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	129 echo $echo_n_flag "$*"
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	130 }
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	131
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	132 # ----------------------------------------------------------------------------
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	133 # MAIN PROGRAM
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	134 # ----------------------------------------------------------------------------
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	135
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	136 # Parse options
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	137
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	138 while [ -n "$1" ]
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	139 do
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	140 value="`echo $1 \| sed 's/[^=].$.$/\1/'`"
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	141 key="`echo $1 \| sed 's/=.*//'`"
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	142 if `echo "$value" \| grep "~" >/dev/null 2>/dev/null`
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	143 then
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	144 echo
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	145 echo 'WARNING: the "~" sign is not expanded in flags.'
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	146 echo 'If you mean the home directory, use $HOME instead.'
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	147 echo
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	148 fi
7942 21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	149 case "$key" in
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	150 --help)
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	151 show_help
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	152 exit 0
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	153 ;;
7942 21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	154 --prefix)
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	155 [ -n "$value" ] \|\| die "Missing value in flag $key."
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	156 PREFIX="$value"
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	157 PREFIX_SET=yes
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	158 ;;
7942 21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	159 --sysconfdir)
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	160 [ -n "$value" ] \|\| die "Missing value in flag $key."
1063 b873715ffd96 configure: Honour --sysconfdir parameter; thanks to Michael Scherer Matthew Wild <mwild1@gmail.com> parents: 998 diff changeset	161 SYSCONFDIR="$value"
b873715ffd96 configure: Honour --sysconfdir parameter; thanks to Michael Scherer Matthew Wild <mwild1@gmail.com> parents: 998 diff changeset	162 SYSCONFDIR_SET=yes
b873715ffd96 configure: Honour --sysconfdir parameter; thanks to Michael Scherer Matthew Wild <mwild1@gmail.com> parents: 998 diff changeset	163 ;;
7942 21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	164 --ostype)
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	165 # TODO make this a switch?
511 f9ab28562fda Potential fixes for building on Mac OSX Matthew Wild <mwild1@gmail.com> parents: 502 diff changeset	166 OSTYPE="$value"
f9ab28562fda Potential fixes for building on Mac OSX Matthew Wild <mwild1@gmail.com> parents: 502 diff changeset	167 OSTYPE_SET=yes
5641 92ffddd02c96 configure: Fix poor layout James Callahan <james@chatid.com> parents: 5422 diff changeset	168 if [ "$OSTYPE" = "debian" ]; then
7608 2306d261ca0a configure: Respect Lua suffix in Debian preset if already set Kim Alvefur <zash@zash.se> parents: 7607 diff changeset	169 if [ "$LUA_SUFFIX_SET" != "yes" ]; then
2306d261ca0a configure: Respect Lua suffix in Debian preset if already set Kim Alvefur <zash@zash.se> parents: 7607 diff changeset	170 LUA_SUFFIX="5.1";
2306d261ca0a configure: Respect Lua suffix in Debian preset if already set Kim Alvefur <zash@zash.se> parents: 7607 diff changeset	171 LUA_SUFFIX_SET=yes
2306d261ca0a configure: Respect Lua suffix in Debian preset if already set Kim Alvefur <zash@zash.se> parents: 7607 diff changeset	172 fi
2306d261ca0a configure: Respect Lua suffix in Debian preset if already set Kim Alvefur <zash@zash.se> parents: 7607 diff changeset	173 LUA_INCDIR="/usr/include/lua$LUA_SUFFIX"
7607 d17bc0d0748e configure: Normalize whitespace Kim Alvefur <zash@zash.se> parents: 7548 diff changeset	174 LUA_INCDIR_SET=yes
7931 b619b85e01aa util.pposix, configure: Move _GNU_SOURCE macro into source files Kim Alvefur <zash@zash.se> parents: 7749 diff changeset	175 CFLAGS="$CFLAGS -ggdb"
7607 d17bc0d0748e configure: Normalize whitespace Kim Alvefur <zash@zash.se> parents: 7548 diff changeset	176 fi
d17bc0d0748e configure: Normalize whitespace Kim Alvefur <zash@zash.se> parents: 7548 diff changeset	177 if [ "$OSTYPE" = "macosx" ]; then
d17bc0d0748e configure: Normalize whitespace Kim Alvefur <zash@zash.se> parents: 7548 diff changeset	178 LUA_INCDIR=/usr/local/include;
d17bc0d0748e configure: Normalize whitespace Kim Alvefur <zash@zash.se> parents: 7548 diff changeset	179 LUA_INCDIR_SET=yes
d17bc0d0748e configure: Normalize whitespace Kim Alvefur <zash@zash.se> parents: 7548 diff changeset	180 LUA_LIBDIR=/usr/local/lib
d17bc0d0748e configure: Normalize whitespace Kim Alvefur <zash@zash.se> parents: 7548 diff changeset	181 LUA_LIBDIR_SET=yes
d17bc0d0748e configure: Normalize whitespace Kim Alvefur <zash@zash.se> parents: 7548 diff changeset	182 CFLAGS="$CFLAGS -mmacosx-version-min=10.3"
d17bc0d0748e configure: Normalize whitespace Kim Alvefur <zash@zash.se> parents: 7548 diff changeset	183 LDFLAGS="-bundle -undefined dynamic_lookup"
d17bc0d0748e configure: Normalize whitespace Kim Alvefur <zash@zash.se> parents: 7548 diff changeset	184 fi
5641 92ffddd02c96 configure: Fix poor layout James Callahan <james@chatid.com> parents: 5422 diff changeset	185 if [ "$OSTYPE" = "linux" ]; then
7607 d17bc0d0748e configure: Normalize whitespace Kim Alvefur <zash@zash.se> parents: 7548 diff changeset	186 LUA_INCDIR=/usr/local/include;
d17bc0d0748e configure: Normalize whitespace Kim Alvefur <zash@zash.se> parents: 7548 diff changeset	187 LUA_INCDIR_SET=yes
d17bc0d0748e configure: Normalize whitespace Kim Alvefur <zash@zash.se> parents: 7548 diff changeset	188 LUA_LIBDIR=/usr/local/lib
d17bc0d0748e configure: Normalize whitespace Kim Alvefur <zash@zash.se> parents: 7548 diff changeset	189 LUA_LIBDIR_SET=yes
7931 b619b85e01aa util.pposix, configure: Move _GNU_SOURCE macro into source files Kim Alvefur <zash@zash.se> parents: 7749 diff changeset	190 CFLAGS="$CFLAGS -ggdb"
5641 92ffddd02c96 configure: Fix poor layout James Callahan <james@chatid.com> parents: 5422 diff changeset	191 fi
92ffddd02c96 configure: Fix poor layout James Callahan <james@chatid.com> parents: 5422 diff changeset	192 if [ "$OSTYPE" = "freebsd" -o "$OSTYPE" = "openbsd" ]; then
7607 d17bc0d0748e configure: Normalize whitespace Kim Alvefur <zash@zash.se> parents: 7548 diff changeset	193 LUA_INCDIR="/usr/local/include/lua51"
d17bc0d0748e configure: Normalize whitespace Kim Alvefur <zash@zash.se> parents: 7548 diff changeset	194 LUA_INCDIR_SET=yes
d17bc0d0748e configure: Normalize whitespace Kim Alvefur <zash@zash.se> parents: 7548 diff changeset	195 CFLAGS="-Wall -fPIC -I/usr/local/include"
d17bc0d0748e configure: Normalize whitespace Kim Alvefur <zash@zash.se> parents: 7548 diff changeset	196 LDFLAGS="-I/usr/local/include -L/usr/local/lib -shared"
d17bc0d0748e configure: Normalize whitespace Kim Alvefur <zash@zash.se> parents: 7548 diff changeset	197 LUA_SUFFIX="-5.1"
d17bc0d0748e configure: Normalize whitespace Kim Alvefur <zash@zash.se> parents: 7548 diff changeset	198 LUA_SUFFIX_SET=yes
d17bc0d0748e configure: Normalize whitespace Kim Alvefur <zash@zash.se> parents: 7548 diff changeset	199 LUA_DIR=/usr/local
d17bc0d0748e configure: Normalize whitespace Kim Alvefur <zash@zash.se> parents: 7548 diff changeset	200 LUA_DIR_SET=yes
d17bc0d0748e configure: Normalize whitespace Kim Alvefur <zash@zash.se> parents: 7548 diff changeset	201 CC=cc
d17bc0d0748e configure: Normalize whitespace Kim Alvefur <zash@zash.se> parents: 7548 diff changeset	202 LD=ld
5641 92ffddd02c96 configure: Fix poor layout James Callahan <james@chatid.com> parents: 5422 diff changeset	203 fi
92ffddd02c96 configure: Fix poor layout James Callahan <james@chatid.com> parents: 5422 diff changeset	204 if [ "$OSTYPE" = "openbsd" ]; then
7607 d17bc0d0748e configure: Normalize whitespace Kim Alvefur <zash@zash.se> parents: 7548 diff changeset	205 LUA_INCDIR="/usr/local/include";
7610 8c60d7b4a0c1 configure: Indicate that LUA_INCDIR is set in openbsd preset Kim Alvefur <zash@zash.se> parents: 7609 diff changeset	206 LUA_INCDIR_SET="yes"
5641 92ffddd02c96 configure: Fix poor layout James Callahan <james@chatid.com> parents: 5422 diff changeset	207 fi
7632 2b14e2121700 configure: Add ostype preset for NetBSD Holger Weiss <holger@zedat.fu-berlin.de> parents: 7618 diff changeset	208 if [ "$OSTYPE" = "netbsd" ]; then
2b14e2121700 configure: Add ostype preset for NetBSD Holger Weiss <holger@zedat.fu-berlin.de> parents: 7618 diff changeset	209 LUA_INCDIR="/usr/pkg/include/lua-5.1"
2b14e2121700 configure: Add ostype preset for NetBSD Holger Weiss <holger@zedat.fu-berlin.de> parents: 7618 diff changeset	210 LUA_INCDIR_SET=yes
2b14e2121700 configure: Add ostype preset for NetBSD Holger Weiss <holger@zedat.fu-berlin.de> parents: 7618 diff changeset	211 LUA_LIBDIR="/usr/pkg/lib/lua/5.1"
2b14e2121700 configure: Add ostype preset for NetBSD Holger Weiss <holger@zedat.fu-berlin.de> parents: 7618 diff changeset	212 LUA_LIBDIR_SET=yes
2b14e2121700 configure: Add ostype preset for NetBSD Holger Weiss <holger@zedat.fu-berlin.de> parents: 7618 diff changeset	213 CFLAGS="-Wall -fPIC -I/usr/pkg/include"
2b14e2121700 configure: Add ostype preset for NetBSD Holger Weiss <holger@zedat.fu-berlin.de> parents: 7618 diff changeset	214 LDFLAGS="-L/usr/pkg/lib -Wl,-rpath,/usr/pkg/lib -shared"
2b14e2121700 configure: Add ostype preset for NetBSD Holger Weiss <holger@zedat.fu-berlin.de> parents: 7618 diff changeset	215 fi
7617 c6d18ee93e34 configure: Add initial attempt at pkg-config preset Kim Alvefur <zash@zash.se> parents: 7616 diff changeset	216 if [ "$OSTYPE" = "pkg-config" ]; then
c6d18ee93e34 configure: Add initial attempt at pkg-config preset Kim Alvefur <zash@zash.se> parents: 7616 diff changeset	217 if [ "$LUA_SUFFIX_SET" != "yes" ]; then
c6d18ee93e34 configure: Add initial attempt at pkg-config preset Kim Alvefur <zash@zash.se> parents: 7616 diff changeset	218 LUA_SUFFIX="5.1";
c6d18ee93e34 configure: Add initial attempt at pkg-config preset Kim Alvefur <zash@zash.se> parents: 7616 diff changeset	219 LUA_SUFFIX_SET=yes
c6d18ee93e34 configure: Add initial attempt at pkg-config preset Kim Alvefur <zash@zash.se> parents: 7616 diff changeset	220 fi
c6d18ee93e34 configure: Add initial attempt at pkg-config preset Kim Alvefur <zash@zash.se> parents: 7616 diff changeset	221 LUA_CF="$(pkg-config --cflags-only-I lua$LUA_SUFFIX)"
c6d18ee93e34 configure: Add initial attempt at pkg-config preset Kim Alvefur <zash@zash.se> parents: 7616 diff changeset	222 LUA_CF="${LUA_CF#*-I}"
c6d18ee93e34 configure: Add initial attempt at pkg-config preset Kim Alvefur <zash@zash.se> parents: 7616 diff changeset	223 LUA_CF="${LUA_CF%% *}"
c6d18ee93e34 configure: Add initial attempt at pkg-config preset Kim Alvefur <zash@zash.se> parents: 7616 diff changeset	224 if [ "$LUA_CF" != "" ]; then
c6d18ee93e34 configure: Add initial attempt at pkg-config preset Kim Alvefur <zash@zash.se> parents: 7616 diff changeset	225 LUA_INCDIR="$LUA_CF"
c6d18ee93e34 configure: Add initial attempt at pkg-config preset Kim Alvefur <zash@zash.se> parents: 7616 diff changeset	226 LUA_INCDIR_SET=yes
c6d18ee93e34 configure: Add initial attempt at pkg-config preset Kim Alvefur <zash@zash.se> parents: 7616 diff changeset	227 fi
7931 b619b85e01aa util.pposix, configure: Move _GNU_SOURCE macro into source files Kim Alvefur <zash@zash.se> parents: 7749 diff changeset	228 CFLAGS="$CFLAGS"
7617 c6d18ee93e34 configure: Add initial attempt at pkg-config preset Kim Alvefur <zash@zash.se> parents: 7616 diff changeset	229 fi
511 f9ab28562fda Potential fixes for building on Mac OSX Matthew Wild <mwild1@gmail.com> parents: 502 diff changeset	230 ;;
7942 21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	231 --libdir)
6574 cd0088c73daf configure, Makefile: Add --libdir option to ./configure, allowing you to override the $PREFIX/lib/ default. Fixes #470. Matthew Wild <mwild1@gmail.com> parents: 5933 diff changeset	232 LIBDIR="$value"
6579 5a82ee60e07e configure: Fix for commit cd0088c73daf - update LIBDIR if --prefix is set and --libdir isn't (thanks Medics) Matthew Wild <mwild1@gmail.com> parents: 6574 diff changeset	233 LIBDIR_SET=yes
6574 cd0088c73daf configure, Makefile: Add --libdir option to ./configure, allowing you to override the $PREFIX/lib/ default. Fixes #470. Matthew Wild <mwild1@gmail.com> parents: 5933 diff changeset	234 ;;
7942 21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	235 --datadir)
7607 d17bc0d0748e configure: Normalize whitespace Kim Alvefur <zash@zash.se> parents: 7548 diff changeset	236 DATADIR="$value"
d17bc0d0748e configure: Normalize whitespace Kim Alvefur <zash@zash.se> parents: 7548 diff changeset	237 DATADIR_SET=yes
502 21dc299387a6 Installation improvements (auto-creation of data directories) Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	238 ;;
4451 70275ab52ab2 configure: Add 'openbsd' preset (thanks xavier) Matthew Wild <mwild1@gmail.com> parents: 4444 diff changeset	239 --require-config)
70275ab52ab2 configure: Add 'openbsd' preset (thanks xavier) Matthew Wild <mwild1@gmail.com> parents: 4444 diff changeset	240 REQUIRE_CONFIG=yes
70275ab52ab2 configure: Add 'openbsd' preset (thanks xavier) Matthew Wild <mwild1@gmail.com> parents: 4444 diff changeset	241 ;;
7942 21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	242 --lua-suffix)
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	243 [ -n "$value" ] \|\| die "Missing value in flag $key."
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	244 LUA_SUFFIX="$value"
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	245 LUA_SUFFIX_SET=yes
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	246 ;;
7942 21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	247 --lua-version\|--with-lua-version)
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	248 [ -n "$value" ] \|\| die "Missing value in flag $key."
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	249 LUA_VERSION="$value"
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	250 [ "$LUA_VERSION" = "5.1" -o "$LUA_VERSION" = "5.2" -o "$LUA_VERSION" = "5.3" ] \|\| die "Invalid Lua version in flag $key."
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	251 LUA_VERSION_SET=yes
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	252 ;;
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	253 --with-lua)
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	254 [ -n "$value" ] \|\| die "Missing value in flag $key."
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	255 LUA_DIR="$value"
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	256 LUA_DIR_SET=yes
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	257 ;;
7942 21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	258 --with-lua-bin)
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	259 [ -n "$value" ] \|\| die "Missing value in flag $key."
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	260 LUA_BINDIR="$value"
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	261 LUA_BINDIR_SET=yes
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	262 ;;
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	263 --with-lua-include)
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	264 [ -n "$value" ] \|\| die "Missing value in flag $key."
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	265 LUA_INCDIR="$value"
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	266 LUA_INCDIR_SET=yes
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	267 ;;
7942 21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	268 --with-lua-lib)
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	269 [ -n "$value" ] \|\| die "Missing value in flag $key."
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	270 LUA_LIBDIR="$value"
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	271 LUA_LIBDIR_SET=yes
2315 174b4a83f5b7 configure: Add 'linux' ostype and rename lflags to LDFLAGS to match expectations. Brian Cully <bjc@junctionnetworks.com> parents: 1081 diff changeset	272 ;;
7942 21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	273 --with-idn)
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	274 IDN_LIB="$value"
2315 174b4a83f5b7 configure: Add 'linux' ostype and rename lflags to LDFLAGS to match expectations. Brian Cully <bjc@junctionnetworks.com> parents: 1081 diff changeset	275 ;;
7942 21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	276 --idn-library)
7607 d17bc0d0748e configure: Normalize whitespace Kim Alvefur <zash@zash.se> parents: 7548 diff changeset	277 IDN_LIBRARY="$value"
d17bc0d0748e configure: Normalize whitespace Kim Alvefur <zash@zash.se> parents: 7548 diff changeset	278 ;;
7942 21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	279 --with-ssl)
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	280 OPENSSL_LIB="$value"
2315 174b4a83f5b7 configure: Add 'linux' ostype and rename lflags to LDFLAGS to match expectations. Brian Cully <bjc@junctionnetworks.com> parents: 1081 diff changeset	281 ;;
7942 21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	282 --with-random)
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	283 case "$value" in
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	284 getrandom)
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	285 PRNG=GETRANDOM
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	286 ;;
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	287 openssl)
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	288 PRNG=OPENSSL
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	289 ;;
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	290 arc4random)
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	291 PRNG=ARC4RANDOM
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	292 ;;
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	293 esac
7187 3d2c2f0809ee util.crand: C binding to one of OpenSSL, Linux getrandom() or OpenBSD arc4random() CSPRNG Kim Alvefur <zash@zash.se> parents: 6886 diff changeset	294 ;;
7942 21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	295 --cflags)
511 f9ab28562fda Potential fixes for building on Mac OSX Matthew Wild <mwild1@gmail.com> parents: 502 diff changeset	296 CFLAGS="$value"
2315 174b4a83f5b7 configure: Add 'linux' ostype and rename lflags to LDFLAGS to match expectations. Brian Cully <bjc@junctionnetworks.com> parents: 1081 diff changeset	297 ;;
7942 21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	298 --ldflags)
2315 174b4a83f5b7 configure: Add 'linux' ostype and rename lflags to LDFLAGS to match expectations. Brian Cully <bjc@junctionnetworks.com> parents: 1081 diff changeset	299 LDFLAGS="$value"
174b4a83f5b7 configure: Add 'linux' ostype and rename lflags to LDFLAGS to match expectations. Brian Cully <bjc@junctionnetworks.com> parents: 1081 diff changeset	300 ;;
7942 21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	301 --c-compiler)
798 2a92b58144a9 Use $CC, $LD in Makefile. Add --c-compiler, --linker flags to ./configure script. Add --lflags to ./configure script. Thanks to Lorenzo for the initial patch! Matthew Wild <mwild1@gmail.com> parents: 536 diff changeset	302 CC="$value"
2315 174b4a83f5b7 configure: Add 'linux' ostype and rename lflags to LDFLAGS to match expectations. Brian Cully <bjc@junctionnetworks.com> parents: 1081 diff changeset	303 ;;
7942 21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	304 --linker)
798 2a92b58144a9 Use $CC, $LD in Makefile. Add --c-compiler, --linker flags to ./configure script. Add --lflags to ./configure script. Thanks to Lorenzo for the initial patch! Matthew Wild <mwild1@gmail.com> parents: 536 diff changeset	305 LD="$value"
2315 174b4a83f5b7 configure: Add 'linux' ostype and rename lflags to LDFLAGS to match expectations. Brian Cully <bjc@junctionnetworks.com> parents: 1081 diff changeset	306 ;;
7942 21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	307 --runwith)
5145 53f741a5a73a configure, Makefile: Allow runtime to be overridden. Kim Alvefur <zash@zash.se> parents: 5048 diff changeset	308 RUNWITH="$value"
7943 da791f11e20c configure: Set RUNWITH to lua + lua-suffix unless --runwith is given (fixes #721, #777) Kim Alvefur <zash@zash.se> parents: 7942 diff changeset	309 RUNWITH_SET=yes
5145 53f741a5a73a configure, Makefile: Allow runtime to be overridden. Kim Alvefur <zash@zash.se> parents: 5048 diff changeset	310 ;;
5933 56b1f151f4a3 Makefile, configure: Add option for disabling generation of example certificates Kim Alvefur <zash@zash.se> parents: 5422 diff changeset	311 --no-example-certs)
56b1f151f4a3 Makefile, configure: Add option for disabling generation of example certificates Kim Alvefur <zash@zash.se> parents: 5422 diff changeset	312 EXCERTS=
56b1f151f4a3 Makefile, configure: Add option for disabling generation of example certificates Kim Alvefur <zash@zash.se> parents: 5422 diff changeset	313 ;;
7942 21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	314 --compiler-wrapper)
7618 5a09c1166d89 configure: Add --compiler-wrapper flag for using things like ccache or distcc Kim Alvefur <zash@zash.se> parents: 7617 diff changeset	315 CC="$value $CC"
5a09c1166d89 configure: Add --compiler-wrapper flag for using things like ccache or distcc Kim Alvefur <zash@zash.se> parents: 7617 diff changeset	316 LD="$value $LD"
5a09c1166d89 configure: Add --compiler-wrapper flag for using things like ccache or distcc Kim Alvefur <zash@zash.se> parents: 7617 diff changeset	317 ;;
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	318 *)
7942 21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	319 die "Error: Unknown flag: $1"
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	320 ;;
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	321 esac
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	322 shift
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	323 done
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	324
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	325 if [ "$PREFIX_SET" = "yes" -a ! "$SYSCONFDIR_SET" = "yes" ]
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	326 then
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	327 if [ "$PREFIX" = "/usr" ]
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	328 then SYSCONFDIR=/etc/prosody
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	329 else SYSCONFDIR=$PREFIX/etc/prosody
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	330 fi
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	331 fi
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	332
502 21dc299387a6 Installation improvements (auto-creation of data directories) Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	333 if [ "$PREFIX_SET" = "yes" -a ! "$DATADIR_SET" = "yes" ]
21dc299387a6 Installation improvements (auto-creation of data directories) Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	334 then
21dc299387a6 Installation improvements (auto-creation of data directories) Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	335 if [ "$PREFIX" = "/usr" ]
21dc299387a6 Installation improvements (auto-creation of data directories) Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	336 then DATADIR=/var/lib/prosody
21dc299387a6 Installation improvements (auto-creation of data directories) Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	337 else DATADIR=$PREFIX/var/lib/prosody
21dc299387a6 Installation improvements (auto-creation of data directories) Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	338 fi
21dc299387a6 Installation improvements (auto-creation of data directories) Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	339 fi
21dc299387a6 Installation improvements (auto-creation of data directories) Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	340
7942 21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	341 detect_lua_version() {
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	342 detected_lua=`$1 -e 'print(_VERSION:match(" (5%.[123])$"))' 2> /dev/null`
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	343 if [ "$detected_lua" != "nil" ]
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	344 then
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	345 if [ "$LUA_VERSION_SET" != "yes" ]
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	346 then
7942 21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	347 echo "Lua version detected: $detected_lua"
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	348 LUA_VERSION=$detected_lua
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	349 return 0
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	350 elif [ "$LUA_VERSION" = "$detected_lua" ]
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	351 then
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	352 return 0
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	353 fi
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	354 fi
7942 21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	355 return 1
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	356 }
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	357
7942 21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	358 search_interpreter() {
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	359 suffix="$1"
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	360 if [ "$LUA_BINDIR_SET" = "yes" ]
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	361 then
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	362 find_lua="$LUA_BINDIR"
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	363 elif [ "$LUA_DIR_SET" = "yes" ]
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	364 then
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	365 LUA_BINDIR="$LUA_DIR/bin"
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	366 if [ -f "$LUA_BINDIR/lua$suffix" ]
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	367 then
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	368 find_lua="$LUA_BINDIR"
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	369 fi
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	370 else
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	371 find_lua=`find_program lua$suffix`
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	372 fi
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	373 if [ -n "$find_lua" -a -x "$find_lua/lua$suffix" ]
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	374 then
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	375 if detect_lua_version "$find_lua/lua$suffix"
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	376 then
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	377 echo "Lua interpreter found: $find_lua/lua$suffix..."
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	378 if [ "$LUA_BINDIR_SET" != "yes" ]
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	379 then
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	380 LUA_BINDIR="$find_lua"
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	381 fi
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	382 if [ "$LUA_DIR_SET" != "yes" ]
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	383 then
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	384 LUA_DIR=`dirname "$find_lua"`
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	385 fi
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	386 LUA_SUFFIX="$suffix"
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	387 return 0
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	388 fi
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	389 fi
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	390 return 1
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	391 }
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	392
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	393 lua_interp_found=no
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	394 if [ "$LUA_SUFFIX_SET" != "yes" ]
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	395 then
7942 21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	396 if [ "$LUA_VERSION_SET" = "yes" -a "$LUA_VERSION" = "5.1" ]
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	397 then
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	398 suffixes="5.1 51 -5.1 -51"
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	399 elif [ "$LUA_VERSION_SET" = "yes" -a "$LUA_VERSION" = "5.2" ]
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	400 then
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	401 suffixes="5.2 52 -5.2 -52"
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	402 elif [ "$LUA_VERSION_SET" = "yes" -a "$LUA_VERSION" = "5.3" ]
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	403 then
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	404 suffixes="5.3 53 -5.3 -53"
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	405 else
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	406 suffixes="5.1 51 -5.1 -51 5.2 52 -5.2 -52 5.3 53 -5.3 -53"
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	407 fi
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	408 for suffix in "" `echo $suffixes`
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	409 do
7942 21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	410 search_interpreter "$suffix" && {
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	411 lua_interp_found=yes
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	412 break
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	413 }
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	414 done
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	415 else
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	416 search_interpreter "$LUA_SUFFIX" && {
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	417 lua_interp_found=yes
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	418 }
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	419 fi
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	420
7942 21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	421 if [ "$lua_interp_found" != "yes" ]
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	422 then
7942 21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	423 [ "$LUA_VERSION_SET" ] && { interp="Lua $LUA_VERSION" ;} \|\| { interp="Lua" ;}
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	424 [ "$LUA_DIR_SET" -o "$LUA_BINDIR_SET" ] && { where="$LUA_BINDIR" ;} \|\| { interp="\$PATH" ;}
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	425 echo "$interp interpreter not found in $where"
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	426 die "You may want to use the flags --with-lua, --with-lua-bin and/or --lua-suffix. See --help."
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	427 fi
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	428
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	429 if [ "$LUA_VERSION_SET" = "yes" ]
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	430 then
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	431 echo_n "Checking if $LUA_BINDIR/lua$LUA_SUFFIX is Lua version $LUA_VERSION... "
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	432 if detect_lua_version "$LUA_BINDIR/lua$LUA_SUFFIX"
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	433 then
7942 21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	434 echo "yes"
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	435 else
7942 21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	436 echo "no"
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	437 die "You may want to use the flags --with-lua, --with-lua-bin and/or --lua-suffix. See --help."
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	438 fi
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	439 fi
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	440
6810 533fd843d91f configure, Makefile: Make compatible with plain Bourne shell as used on Solaris. Fixes #418 (thanks jcea) Matthew Wild <mwild1@gmail.com> parents: 6635 diff changeset	441 if [ "$LUA_INCDIR_SET" != "yes" ]
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	442 then
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	443 LUA_INCDIR="$LUA_DIR/include"
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	444 fi
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	445
6810 533fd843d91f configure, Makefile: Make compatible with plain Bourne shell as used on Solaris. Fixes #418 (thanks jcea) Matthew Wild <mwild1@gmail.com> parents: 6635 diff changeset	446 if [ "$LUA_LIBDIR_SET" != "yes" ]
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	447 then
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	448 LUA_LIBDIR="$LUA_DIR/lib"
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	449 fi
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	450
7942 21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	451 echo_n "Checking Lua includes... "
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	452 lua_h="$LUA_INCDIR/lua.h"
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	453 if [ -f "$lua_h" ]
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	454 then
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	455 echo "lua.h found in $lua_h"
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	456 else
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	457 v_dir="$LUA_INCDIR/lua/$LUA_VERSION"
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	458 lua_h="$v_dir/lua.h"
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	459 if [ -f "$lua_h" ]
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	460 then
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	461 echo "lua.h found in $lua_h"
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	462 LUA_INCDIR="$v_dir"
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	463 else
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	464 d_dir="$LUA_INCDIR/lua$LUA_VERSION"
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	465 lua_h="$d_dir/lua.h"
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	466 if [ -f "$lua_h" ]
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	467 then
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	468 echo "lua.h found in $lua_h (Debian/Ubuntu)"
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	469 LUA_INCDIR="$d_dir"
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	470 else
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	471 echo "lua.h not found (looked in $LUA_INCDIR, $v_dir, $d_dir)"
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	472 die "You may want to use the flag --with-lua or --with-lua-include. See --help."
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	473 fi
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	474 fi
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	475 fi
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	476
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	477 echo_n "Checking if Lua header version matches that of the interpreter... "
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	478 header_version=$(sed -n 's/.LUA_VERSION_NUM.5.$.$.*/5.\1/p' "$lua_h")
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	479 if [ "$header_version" = "$LUA_VERSION" ]
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	480 then
7942 21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	481 echo "yes"
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	482 else
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	483 echo "no"
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	484 echo "lua.h version mismatch (interpreter: $LUA_VERSION; lua.h: $header_version)."
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	485 die "You may want to use the flag --with-lua or --with-lua-include. See --help."
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	486 fi
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	487
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	488 echo_n "Configuring for system... "
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	489 if uname -s
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	490 then
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	491 UNAME_S=`uname -s`
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	492 else
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	493 die "Could not determine operating system. 'uname -s' failed."
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	494 fi
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	495 echo_n "Configuring for architecture... "
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	496 if uname -m
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	497 then
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	498 UNAME_M=`uname -m`
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	499 else
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	500 die "Could not determine processor architecture. 'uname -m' failed."
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	501 fi
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	502
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	503 if [ "$UNAME_S" = Linux ]
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	504 then
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	505 GCC_ARCH=`gcc -print-multiarch 2>/dev/null`
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	506 if [ -n "$GCC_ARCH" -a -d "/usr/lib/$GCC_ARCH" ]
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	507 then
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	508 MULTIARCH_SUBDIR="lib/$GCC_ARCH"
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	509 elif [ -d "/usr/lib64" ]
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	510 then
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	511 # Useful for Fedora systems
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	512 MULTIARCH_SUBDIR="lib64"
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	513 fi
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	514 fi
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	515
3762 f02bac902a1e util.encodings: Support for ICU for IDNA operations. Tobias Markmann <tm@ayena.de> parents: 3352 diff changeset	516 if [ "$IDN_LIBRARY" = "icu" ]
f02bac902a1e util.encodings: Support for ICU for IDNA operations. Tobias Markmann <tm@ayena.de> parents: 3352 diff changeset	517 then
7607 d17bc0d0748e configure: Normalize whitespace Kim Alvefur <zash@zash.se> parents: 7548 diff changeset	518 IDNA_LIBS="$ICU_FLAGS"
d17bc0d0748e configure: Normalize whitespace Kim Alvefur <zash@zash.se> parents: 7548 diff changeset	519 CFLAGS="$CFLAGS -DUSE_STRINGPREP_ICU"
3762 f02bac902a1e util.encodings: Support for ICU for IDNA operations. Tobias Markmann <tm@ayena.de> parents: 3352 diff changeset	520 fi
5641 92ffddd02c96 configure: Fix poor layout James Callahan <james@chatid.com> parents: 5422 diff changeset	521 if [ "$IDN_LIBRARY" = "idn" ]
3764 323169f229fa Make libidn default when not specifiying a IDN lib. Tobias Markmann <tm@ayena.de> parents: 3763 diff changeset	522 then
7607 d17bc0d0748e configure: Normalize whitespace Kim Alvefur <zash@zash.se> parents: 7548 diff changeset	523 IDNA_LIBS="-l$IDN_LIB"
3764 323169f229fa Make libidn default when not specifiying a IDN lib. Tobias Markmann <tm@ayena.de> parents: 3763 diff changeset	524 fi
323169f229fa Make libidn default when not specifiying a IDN lib. Tobias Markmann <tm@ayena.de> parents: 3763 diff changeset	525
7942 21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	526 if [ -f config.unix ]; then
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	527 rm -f config.unix
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	528 fi
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	529
7943 da791f11e20c configure: Set RUNWITH to lua + lua-suffix unless --runwith is given (fixes #721, #777) Kim Alvefur <zash@zash.se> parents: 7942 diff changeset	530 if [ "$RUNWITH_SET" != yes ]; then
da791f11e20c configure: Set RUNWITH to lua + lua-suffix unless --runwith is given (fixes #721, #777) Kim Alvefur <zash@zash.se> parents: 7942 diff changeset	531 RUNWITH="lua$LUA_SUFFIX"
da791f11e20c configure: Set RUNWITH to lua + lua-suffix unless --runwith is given (fixes #721, #777) Kim Alvefur <zash@zash.se> parents: 7942 diff changeset	532 fi
da791f11e20c configure: Set RUNWITH to lua + lua-suffix unless --runwith is given (fixes #721, #777) Kim Alvefur <zash@zash.se> parents: 7942 diff changeset	533
6886 27f5a76e3fa5 configure,util-src/Makefile: Make a variable that includes -l for OpenSSL (like with IDNA_LIBS) Kim Alvefur <zash@zash.se> parents: 6878 diff changeset	534 OPENSSL_LIBS="-l$OPENSSL_LIB"
27f5a76e3fa5 configure,util-src/Makefile: Make a variable that includes -l for OpenSSL (like with IDNA_LIBS) Kim Alvefur <zash@zash.se> parents: 6878 diff changeset	535
7942 21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	536 if [ "$PRNG" = "OPENSSL" ]; then
21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	537 PRNGLIBS=$OPENSSL_LIBS
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	538 fi
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	539
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	540 # Write config
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	541
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	542 echo "Writing configuration..."
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	543 echo
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	544
7942 21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	545 rm -f built
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	546 cat <<EOF > config.unix
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	547 # This file was automatically generated by the configure script.
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	548 # Run "./configure --help" for details.
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	549
7942 21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	550 LUA_VERSION=$LUA_VERSION
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	551 PREFIX=$PREFIX
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	552 SYSCONFDIR=$SYSCONFDIR
6574 cd0088c73daf configure, Makefile: Add --libdir option to ./configure, allowing you to override the $PREFIX/lib/ default. Fixes #470. Matthew Wild <mwild1@gmail.com> parents: 5933 diff changeset	553 LIBDIR=$LIBDIR
502 21dc299387a6 Installation improvements (auto-creation of data directories) Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	554 DATADIR=$DATADIR
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	555 LUA_SUFFIX=$LUA_SUFFIX
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	556 LUA_DIR=$LUA_DIR
7942 21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	557 LUA_DIR_SET=$LUA_DIR_SET
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	558 LUA_INCDIR=$LUA_INCDIR
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	559 LUA_LIBDIR=$LUA_LIBDIR
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	560 LUA_BINDIR=$LUA_BINDIR
7942 21a25b29ebeb configure: Merge with configure from LuaRocks (which it was originally based on apparently) Kim Alvefur <zash@zash.se> parents: 7935 diff changeset	561 MULTIARCH_SUBDIR=$MULTIARCH_SUBDIR
4451 70275ab52ab2 configure: Add 'openbsd' preset (thanks xavier) Matthew Wild <mwild1@gmail.com> parents: 4444 diff changeset	562 REQUIRE_CONFIG=$REQUIRE_CONFIG
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	563 IDN_LIB=$IDN_LIB
3762 f02bac902a1e util.encodings: Support for ICU for IDNA operations. Tobias Markmann <tm@ayena.de> parents: 3352 diff changeset	564 IDNA_LIBS=$IDNA_LIBS
6886 27f5a76e3fa5 configure,util-src/Makefile: Make a variable that includes -l for OpenSSL (like with IDNA_LIBS) Kim Alvefur <zash@zash.se> parents: 6878 diff changeset	565 OPENSSL_LIBS=$OPENSSL_LIBS
511 f9ab28562fda Potential fixes for building on Mac OSX Matthew Wild <mwild1@gmail.com> parents: 502 diff changeset	566 CFLAGS=$CFLAGS
2315 174b4a83f5b7 configure: Add 'linux' ostype and rename lflags to LDFLAGS to match expectations. Brian Cully <bjc@junctionnetworks.com> parents: 1081 diff changeset	567 LDFLAGS=$LDFLAGS
798 2a92b58144a9 Use $CC, $LD in Makefile. Add --c-compiler, --linker flags to ./configure script. Add --lflags to ./configure script. Thanks to Lorenzo for the initial patch! Matthew Wild <mwild1@gmail.com> parents: 536 diff changeset	568 CC=$CC
2a92b58144a9 Use $CC, $LD in Makefile. Add --c-compiler, --linker flags to ./configure script. Add --lflags to ./configure script. Thanks to Lorenzo for the initial patch! Matthew Wild <mwild1@gmail.com> parents: 536 diff changeset	569 LD=$LD
5145 53f741a5a73a configure, Makefile: Allow runtime to be overridden. Kim Alvefur <zash@zash.se> parents: 5048 diff changeset	570 RUNWITH=$RUNWITH
5933 56b1f151f4a3 Makefile, configure: Add option for disabling generation of example certificates Kim Alvefur <zash@zash.se> parents: 5422 diff changeset	571 EXCERTS=$EXCERTS
7187 3d2c2f0809ee util.crand: C binding to one of OpenSSL, Linux getrandom() or OpenBSD arc4random() CSPRNG Kim Alvefur <zash@zash.se> parents: 6886 diff changeset	572 RANDOM=$PRNG
3d2c2f0809ee util.crand: C binding to one of OpenSSL, Linux getrandom() or OpenBSD arc4random() CSPRNG Kim Alvefur <zash@zash.se> parents: 6886 diff changeset	573 RANDOM_LIBS=$PRNGLIBS
3d2c2f0809ee util.crand: C binding to one of OpenSSL, Linux getrandom() or OpenBSD arc4random() CSPRNG Kim Alvefur <zash@zash.se> parents: 6886 diff changeset	574
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	575
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	576 EOF
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	577
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	578 echo "Installation prefix: $PREFIX"
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	579 echo "Prosody configuration directory: $SYSCONFDIR"
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	580 echo "Using Lua from: $LUA_DIR"
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	581
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	582 make clean > /dev/null 2> /dev/null
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	583
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	584 echo
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	585 echo "Done. You can now run 'make' to build."
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	586 echo

prosody

36a9a4af1873

configure

Software / code / prosody

Annotate

configure @ 7944:36a9a4af1873

Software `/` code `/` prosody