Software `/` code `/` prosody

Annotate

configure @ 3962:c77eff3ac5e1

configure: Don't add -llua to LDFLAGS, it's unnecessary

author	Matthew Wild <mwild1@gmail.com>
date	Sun, 26 Dec 2010 05:00:45 +0000
parent	3764:323169f229fa
child	4444:498eaeff6a05

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
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	5 PREFIX=/usr/local
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"
502 21dc299387a6 Installation improvements (auto-creation of data directories) Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	7 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	8 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	9 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	10 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	11 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	12 LUA_LIBDIR="/usr/lib"
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	13 IDN_LIB=idn
3762 f02bac902a1e util.encodings: Support for ICU for IDNA operations. Tobias Markmann <tm@ayena.de> parents: 3352 diff changeset	14 ICU_FLAGS="-licui18n -licudata -licuuc"
502 21dc299387a6 Installation improvements (auto-creation of data directories) Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	15 OPENSSL_LIB=crypto
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	16 CC=gcc
3762 f02bac902a1e util.encodings: Support for ICU for IDNA operations. Tobias Markmann <tm@ayena.de> parents: 3352 diff changeset	17 CXX=g++
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	18 LD=gcc
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	19
802 33c012048492 Add -Wall to default CFLAGS Matthew Wild <mwild1@gmail.com> parents: 798 diff changeset	20 CFLAGS="-fPIC -Wall"
2315 174b4a83f5b7 configure: Add 'linux' ostype and rename lflags to LDFLAGS to match expectations. Brian Cully <bjc@junctionnetworks.com> parents: 1081 diff changeset	21 LDFLAGS="-shared"
511 f9ab28562fda Potential fixes for building on Mac OSX Matthew Wild <mwild1@gmail.com> parents: 502 diff changeset	22
3764 323169f229fa Make libidn default when not specifiying a IDN lib. Tobias Markmann <tm@ayena.de> parents: 3763 diff changeset	23 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	24 # Help
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	25
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	26 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	27 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	28 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	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 --help This help.
511 f9ab28562fda Potential fixes for building on Mac OSX Matthew Wild <mwild1@gmail.com> parents: 502 diff changeset	31 --ostype=OS Use one of the OS presets.
3306 59d56fd49e38 configure: Add ostype preset for FreeBSD (thanks dersd and tobias (no, the other one)) Matthew Wild <mwild1@gmail.com> parents: 3051 diff changeset	32 May be one of: debian, macosx, linux, freebsd
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	33 --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	34 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	35 --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	36 Default is \$PREFIX/etc/prosody
502 21dc299387a6 Installation improvements (auto-creation of data directories) Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	37 --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	38 Default is \$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	39 --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	40 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	41 --with-lua=PREFIX Use Lua from given prefix.
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	42 Default is $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	43 --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	44 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	45 --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	46 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	47 --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	48 Default is $IDN_LIB
3762 f02bac902a1e util.encodings: Support for ICU for IDNA operations. Tobias Markmann <tm@ayena.de> parents: 3352 diff changeset	49 --idn-library=(idn\|icu) Select library to use for IDNA functionality.
f02bac902a1e util.encodings: Support for ICU for IDNA operations. Tobias Markmann <tm@ayena.de> parents: 3352 diff changeset	50 idn: use GNU libidn (default)
f02bac902a1e util.encodings: Support for ICU for IDNA operations. Tobias Markmann <tm@ayena.de> parents: 3352 diff changeset	51 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	52 --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	53 Default is $OPENSSL_LIB
511 f9ab28562fda Potential fixes for building on Mac OSX Matthew Wild <mwild1@gmail.com> parents: 502 diff changeset	54 --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	55 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	56 --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	57 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	58 --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	59 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	60 --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	61 Default is $LD
511 f9ab28562fda Potential fixes for building on Mac OSX Matthew Wild <mwild1@gmail.com> parents: 502 diff changeset	62 --require-config Will cause Prosody to refuse to run when
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	63 it fails to find a configuration file
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	64 EOF
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	65 }
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	66
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	67
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	68 while [ "$1" ]
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	69 do
3050 76f0d653b347 configure: Fix to allow option values containing '=' (thanks Jakub) Matthew Wild <mwild1@gmail.com> parents: 1081 diff changeset	70 value="`echo $1 \| sed 's/[^=]=$.$/\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	71 if echo "$value" \| grep -q "~"
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	72 then
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	73 echo
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	74 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	75 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	76 echo
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	77 fi
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	78 case "$1" in
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	79 --help)
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	80 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	81 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	82 ;;
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	83 --prefix=*)
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	84 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	85 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	86 ;;
1063 b873715ffd96 configure: Honour --sysconfdir parameter; thanks to Michael Scherer Matthew Wild <mwild1@gmail.com> parents: 998 diff changeset	87 --sysconfdir=*)
b873715ffd96 configure: Honour --sysconfdir parameter; thanks to Michael Scherer Matthew Wild <mwild1@gmail.com> parents: 998 diff changeset	88 SYSCONFDIR="$value"
b873715ffd96 configure: Honour --sysconfdir parameter; thanks to Michael Scherer Matthew Wild <mwild1@gmail.com> parents: 998 diff changeset	89 SYSCONFDIR_SET=yes
b873715ffd96 configure: Honour --sysconfdir parameter; thanks to Michael Scherer Matthew Wild <mwild1@gmail.com> parents: 998 diff changeset	90 ;;
511 f9ab28562fda Potential fixes for building on Mac OSX Matthew Wild <mwild1@gmail.com> parents: 502 diff changeset	91 --ostype=*)
f9ab28562fda Potential fixes for building on Mac OSX Matthew Wild <mwild1@gmail.com> parents: 502 diff changeset	92 OSTYPE="$value"
f9ab28562fda Potential fixes for building on Mac OSX Matthew Wild <mwild1@gmail.com> parents: 502 diff changeset	93 OSTYPE_SET=yes
3352 770e27bf11ea configure: Make it possible to override ostype presets with values specified later on the command-line Matthew Wild <mwild1@gmail.com> parents: 3351 diff changeset	94 if [ "$OSTYPE" = "debian" ]
770e27bf11ea configure: Make it possible to override ostype presets with values specified later on the command-line Matthew Wild <mwild1@gmail.com> parents: 3351 diff changeset	95 then LUA_SUFFIX="5.1";
770e27bf11ea configure: Make it possible to override ostype presets with values specified later on the command-line Matthew Wild <mwild1@gmail.com> parents: 3351 diff changeset	96 LUA_SUFFIX_SET=yes
770e27bf11ea configure: Make it possible to override ostype presets with values specified later on the command-line Matthew Wild <mwild1@gmail.com> parents: 3351 diff changeset	97 LUA_INCDIR=/usr/include/lua5.1;
770e27bf11ea configure: Make it possible to override ostype presets with values specified later on the command-line Matthew Wild <mwild1@gmail.com> parents: 3351 diff changeset	98 LUA_INCDIR_SET=yes
770e27bf11ea configure: Make it possible to override ostype presets with values specified later on the command-line Matthew Wild <mwild1@gmail.com> parents: 3351 diff changeset	99 fi
770e27bf11ea configure: Make it possible to override ostype presets with values specified later on the command-line Matthew Wild <mwild1@gmail.com> parents: 3351 diff changeset	100 if [ "$OSTYPE" = "macosx" ]
770e27bf11ea configure: Make it possible to override ostype presets with values specified later on the command-line Matthew Wild <mwild1@gmail.com> parents: 3351 diff changeset	101 then LUA_INCDIR=/usr/local/include;
770e27bf11ea configure: Make it possible to override ostype presets with values specified later on the command-line Matthew Wild <mwild1@gmail.com> parents: 3351 diff changeset	102 LUA_INCDIR_SET=yes
770e27bf11ea configure: Make it possible to override ostype presets with values specified later on the command-line Matthew Wild <mwild1@gmail.com> parents: 3351 diff changeset	103 LUA_LIBDIR=/usr/local/lib
770e27bf11ea configure: Make it possible to override ostype presets with values specified later on the command-line Matthew Wild <mwild1@gmail.com> parents: 3351 diff changeset	104 LUA_LIBDIR_SET=yes
770e27bf11ea configure: Make it possible to override ostype presets with values specified later on the command-line Matthew Wild <mwild1@gmail.com> parents: 3351 diff changeset	105 LDFLAGS="-bundle -undefined dynamic_lookup"
770e27bf11ea configure: Make it possible to override ostype presets with values specified later on the command-line Matthew Wild <mwild1@gmail.com> parents: 3351 diff changeset	106 fi
770e27bf11ea configure: Make it possible to override ostype presets with values specified later on the command-line Matthew Wild <mwild1@gmail.com> parents: 3351 diff changeset	107 if [ "$OSTYPE" = "linux" ]
770e27bf11ea configure: Make it possible to override ostype presets with values specified later on the command-line Matthew Wild <mwild1@gmail.com> parents: 3351 diff changeset	108 then LUA_INCDIR=/usr/local/include;
770e27bf11ea configure: Make it possible to override ostype presets with values specified later on the command-line Matthew Wild <mwild1@gmail.com> parents: 3351 diff changeset	109 LUA_INCDIR_SET=yes
770e27bf11ea configure: Make it possible to override ostype presets with values specified later on the command-line Matthew Wild <mwild1@gmail.com> parents: 3351 diff changeset	110 LUA_LIBDIR=/usr/local/lib
770e27bf11ea configure: Make it possible to override ostype presets with values specified later on the command-line Matthew Wild <mwild1@gmail.com> parents: 3351 diff changeset	111 LUA_LIBDIR_SET=yes
770e27bf11ea configure: Make it possible to override ostype presets with values specified later on the command-line Matthew Wild <mwild1@gmail.com> parents: 3351 diff changeset	112 CFLAGS="-Wall -fPIC"
770e27bf11ea configure: Make it possible to override ostype presets with values specified later on the command-line Matthew Wild <mwild1@gmail.com> parents: 3351 diff changeset	113 LDFLAGS="-shared"
770e27bf11ea configure: Make it possible to override ostype presets with values specified later on the command-line Matthew Wild <mwild1@gmail.com> parents: 3351 diff changeset	114 fi
770e27bf11ea configure: Make it possible to override ostype presets with values specified later on the command-line Matthew Wild <mwild1@gmail.com> parents: 3351 diff changeset	115 if [ "$OSTYPE" = "freebsd" ]
770e27bf11ea configure: Make it possible to override ostype presets with values specified later on the command-line Matthew Wild <mwild1@gmail.com> parents: 3351 diff changeset	116 then LUA_INCDIR="/usr/local/include/lua51"
770e27bf11ea configure: Make it possible to override ostype presets with values specified later on the command-line Matthew Wild <mwild1@gmail.com> parents: 3351 diff changeset	117 LUA_INCDIR_SET=yes
770e27bf11ea configure: Make it possible to override ostype presets with values specified later on the command-line Matthew Wild <mwild1@gmail.com> parents: 3351 diff changeset	118 CFLAGS="-Wall -fPIC -I/usr/local/include"
770e27bf11ea configure: Make it possible to override ostype presets with values specified later on the command-line Matthew Wild <mwild1@gmail.com> parents: 3351 diff changeset	119 LDFLAGS="-I/usr/local/include -L/usr/local/lib -shared"
770e27bf11ea configure: Make it possible to override ostype presets with values specified later on the command-line Matthew Wild <mwild1@gmail.com> parents: 3351 diff changeset	120 LUA_SUFFIX="-5.1"
770e27bf11ea configure: Make it possible to override ostype presets with values specified later on the command-line Matthew Wild <mwild1@gmail.com> parents: 3351 diff changeset	121 LUA_SUFFIX_SET=yes
770e27bf11ea configure: Make it possible to override ostype presets with values specified later on the command-line Matthew Wild <mwild1@gmail.com> parents: 3351 diff changeset	122 LUA_DIR=/usr/local
770e27bf11ea configure: Make it possible to override ostype presets with values specified later on the command-line Matthew Wild <mwild1@gmail.com> parents: 3351 diff changeset	123 LUA_DIR_SET=yes
770e27bf11ea configure: Make it possible to override ostype presets with values specified later on the command-line Matthew Wild <mwild1@gmail.com> parents: 3351 diff changeset	124 fi
511 f9ab28562fda Potential fixes for building on Mac OSX Matthew Wild <mwild1@gmail.com> parents: 502 diff changeset	125 ;;
1081 d41e88b07225 configure: Change --data-dir to --datadir to make consistent with help and other dir flags Matthew Wild <mwild1@gmail.com> parents: 1063 diff changeset	126 --datadir=*)
502 21dc299387a6 Installation improvements (auto-creation of data directories) Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	127 DATADIR="$value"
21dc299387a6 Installation improvements (auto-creation of data directories) Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	128 DATADIR_SET=yes
21dc299387a6 Installation improvements (auto-creation of data directories) Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	129 ;;
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	130 --require-config)
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	131 REQUIRE_CONFIG=yes
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	132 ;;
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	133 --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	134 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	135 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	136 ;;
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	137 --with-lua=*)
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	138 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	139 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	140 ;;
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	141 --with-lua-include=*)
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	142 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	143 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	144 ;;
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	145 --with-lua-lib=*)
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	146 LUA_LIBDIR="$value" 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	147 ;;
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	148 --with-idn=*)
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	149 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	150 ;;
3762 f02bac902a1e util.encodings: Support for ICU for IDNA operations. Tobias Markmann <tm@ayena.de> parents: 3352 diff changeset	151 --idn-library=*)
f02bac902a1e util.encodings: Support for ICU for IDNA operations. Tobias Markmann <tm@ayena.de> parents: 3352 diff changeset	152 IDN_LIBRARY="$value"
f02bac902a1e util.encodings: Support for ICU for IDNA operations. Tobias Markmann <tm@ayena.de> parents: 3352 diff changeset	153 ;;
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	154 --with-ssl=*)
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	155 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	156 ;;
511 f9ab28562fda Potential fixes for building on Mac OSX Matthew Wild <mwild1@gmail.com> parents: 502 diff changeset	157 --cflags=*)
f9ab28562fda Potential fixes for building on Mac OSX Matthew Wild <mwild1@gmail.com> parents: 502 diff changeset	158 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	159 ;;
174b4a83f5b7 configure: Add 'linux' ostype and rename lflags to LDFLAGS to match expectations. Brian Cully <bjc@junctionnetworks.com> parents: 1081 diff changeset	160 --ldflags=*)
174b4a83f5b7 configure: Add 'linux' ostype and rename lflags to LDFLAGS to match expectations. Brian Cully <bjc@junctionnetworks.com> parents: 1081 diff changeset	161 LDFLAGS="$value"
174b4a83f5b7 configure: Add 'linux' ostype and rename lflags to LDFLAGS to match expectations. Brian Cully <bjc@junctionnetworks.com> parents: 1081 diff changeset	162 ;;
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	163 --c-compiler=*)
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	164 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	165 ;;
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	166 --linker=*)
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	167 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	168 ;;
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	169 *)
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	170 echo "Error: Unknown flag: $1"
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	171 exit 1
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	172 ;;
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	173 esac
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	174 shift
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	175 done
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	176
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	177 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	178 then
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	179 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	180 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	181 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	182 fi
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	183 fi
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	184
502 21dc299387a6 Installation improvements (auto-creation of data directories) Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	185 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	186 then
21dc299387a6 Installation improvements (auto-creation of data directories) Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	187 if [ "$PREFIX" = "/usr" ]
21dc299387a6 Installation improvements (auto-creation of data directories) Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	188 then DATADIR=/var/lib/prosody
21dc299387a6 Installation improvements (auto-creation of data directories) Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	189 else DATADIR=$PREFIX/var/lib/prosody
21dc299387a6 Installation improvements (auto-creation of data directories) Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	190 fi
21dc299387a6 Installation improvements (auto-creation of data directories) Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	191 fi
21dc299387a6 Installation improvements (auto-creation of data directories) Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	192
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	193 find_program() {
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	194 path="$PATH"
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	195 item="`echo "$path" \| sed 's/$[^:]$:./\1/'`"
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	196 path="`echo "$path" \| sed -n 's/[^:]::$.*$/\1/p'`"
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	197 found="no"
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	198 while [ "$item" ]
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	199 do
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	200 if [ -e "$item/$1" ]
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	201 then
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	202 found="yes"
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	203 break
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	204 fi
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	205 item="`echo "$path" \| sed 's/$[^:]$:./\1/'`"
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	206 path="`echo "$path" \| sed -n 's/[^:]::$.*$/\1/p'`"
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	207 done
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	208 if [ "$found" = "yes" ]
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	209 then
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	210 echo "$item"
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	211 else
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	212 echo ""
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	213 fi
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	214 }
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	215
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	216 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	217 then
467 66f145f5c932 Update Makefile to now pass config paths to prosody. Update prosody, modulemanager and connectionlisteners to obey these paths. Matthew Wild <mwild1@gmail.com> parents: 463 diff changeset	218 for suffix in "5.1" "51" ""
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	219 do
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	220 LUA_SUFFIX="$suffix"
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	221 if [ "$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	222 then
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	223 if [ -e "$LUA_DIR/bin/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	224 then
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	225 find_lua="$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	226 fi
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	227 else
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	228 find_lua=`find_program 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	229 fi
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	230 if [ "$find_lua" ]
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	231 then
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	232 echo "Lua interpreter found: $find_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	233 break
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	234 fi
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	235 done
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	236 fi
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	237
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	238 if ! [ "$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	239 then
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	240 echo -n "Looking for Lua... "
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	241 if [ ! "$find_lua" ]
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	242 then
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	243 find_lua=`find_program 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	244 echo "lua$LUA_SUFFIX found in \$PATH: $find_lua"
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	245 fi
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	246 if [ "$find_lua" ]
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	247 then
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	248 LUA_DIR=`dirname $find_lua`
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	249 LUA_BINDIR="$find_lua"
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	250 else
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	251 echo "lua$LUA_SUFFIX not found in \$PATH."
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	252 echo "You may want to use the flags --with-lua and/or --lua-suffix. See --help."
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	253 exit 1
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	254 fi
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	255 fi
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	256
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	257 if ! [ "$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	258 then
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	259 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	260 fi
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	261
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	262 if ! [ "$LUA_LIBDIR_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	263 then
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	264 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	265 fi
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	266
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	267 if [ "$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	268 then
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	269 LUA_BINDIR="$LUA_DIR/bin"
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	270 fi
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	271
3762 f02bac902a1e util.encodings: Support for ICU for IDNA operations. Tobias Markmann <tm@ayena.de> parents: 3352 diff changeset	272 if [ "$IDN_LIBRARY" = "icu" ]
f02bac902a1e util.encodings: Support for ICU for IDNA operations. Tobias Markmann <tm@ayena.de> parents: 3352 diff changeset	273 then
f02bac902a1e util.encodings: Support for ICU for IDNA operations. Tobias Markmann <tm@ayena.de> parents: 3352 diff changeset	274 IDNA_LIBS="$ICU_FLAGS"
f02bac902a1e util.encodings: Support for ICU for IDNA operations. Tobias Markmann <tm@ayena.de> parents: 3352 diff changeset	275 CFLAGS="$CFLAGS -DUSE_STRINGPREP_ICU"
f02bac902a1e util.encodings: Support for ICU for IDNA operations. Tobias Markmann <tm@ayena.de> parents: 3352 diff changeset	276 fi
3764 323169f229fa Make libidn default when not specifiying a IDN lib. Tobias Markmann <tm@ayena.de> parents: 3763 diff changeset	277 if [ "$IDN_LIBRARY" = "idn" ]
323169f229fa Make libidn default when not specifiying a IDN lib. Tobias Markmann <tm@ayena.de> parents: 3763 diff changeset	278 then
323169f229fa Make libidn default when not specifiying a IDN lib. Tobias Markmann <tm@ayena.de> parents: 3763 diff changeset	279 IDNA_LIBS="-l$IDN_LIB"
323169f229fa Make libidn default when not specifiying a IDN lib. Tobias Markmann <tm@ayena.de> parents: 3763 diff changeset	280 fi
323169f229fa Make libidn default when not specifiying a IDN lib. Tobias Markmann <tm@ayena.de> parents: 3763 diff changeset	281
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	282 echo -n "Checking Lua includes... "
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	283 lua_h="$LUA_INCDIR/lua.h"
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	284 if [ -e "$lua_h" ]
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	285 then
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	286 echo "lua.h found in $lua_h"
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	287 else
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	288 echo "lua.h not found (looked in $lua_h)"
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	289 echo "You may want to use the flag --with-lua-include. See --help."
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	290 exit 1
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	291 fi
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	292
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	293 find_helper() {
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	294 explanation="$1"
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	295 shift
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	296 tried="$*"
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	297 while [ "$1" ]
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	298 do
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	299 found=`find_program "$1"`
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	300 if [ "$found" ]
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	301 then
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	302 echo "$1 found at $found"
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	303 HELPER=$1
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	304 return
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	305 fi
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	306 shift
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	307 done
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	308 echo "Could not find a $explanation. Tried: $tried."
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	309 echo "Make sure one of them is installed and available in your PATH."
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	310 exit 1
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	311 }
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	312
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	313 # 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	314
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	315 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	316 echo
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	317
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	318 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	319 # 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	320 # 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	321
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	322 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	323 SYSCONFDIR=$SYSCONFDIR
502 21dc299387a6 Installation improvements (auto-creation of data directories) Matthew Wild <mwild1@gmail.com> parents: 467 diff changeset	324 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	325 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	326 LUA_DIR=$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	327 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	328 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	329 LUA_BINDIR=$LUA_BINDIR
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	330 REQUIRE_CONFIG=$REQUIRE_CONFIG
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	331 IDN_LIB=$IDN_LIB
3762 f02bac902a1e util.encodings: Support for ICU for IDNA operations. Tobias Markmann <tm@ayena.de> parents: 3352 diff changeset	332 IDNA_LIBS=$IDNA_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	333 OPENSSL_LIB=$OPENSSL_LIB
511 f9ab28562fda Potential fixes for building on Mac OSX Matthew Wild <mwild1@gmail.com> parents: 502 diff changeset	334 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	335 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	336 CC=$CC
3762 f02bac902a1e util.encodings: Support for ICU for IDNA operations. Tobias Markmann <tm@ayena.de> parents: 3352 diff changeset	337 CXX=$CXX
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	338 LD=$LD
463 a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	339
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	340 EOF
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	341
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	342 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	343 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	344 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	345
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	346 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	347
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	348 echo
a2452d3bd828 Add a top-level Makefile and ./configure script. Update util-src Makefile for this. Matthew Wild <mwild1@gmail.com> parents: diff changeset	349 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	350 echo

prosody

c77eff3ac5e1

configure

Software / code / prosody

Annotate

configure @ 3962:c77eff3ac5e1

Software `/` code `/` prosody