Software /
code /
prosody
Annotate
configure @ 7548:69d8e1477c43
configure: Remove C++ compiler variable, not used
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Wed, 10 Aug 2016 13:56:27 +0200 |
parent | 7187:3d2c2f0809ee |
child | 7607:d17bc0d0748e |
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" |
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" |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
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" |
502
21dc299387a6
Installation improvements (auto-creation of data directories)
Matthew Wild <mwild1@gmail.com>
parents:
467
diff
changeset
|
16 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
|
17 CC=gcc |
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 |
5145
53f741a5a73a
configure, Makefile: Allow runtime to be overridden.
Kim Alvefur <zash@zash.se>
parents:
5048
diff
changeset
|
19 RUNWITH=lua |
5933
56b1f151f4a3
Makefile, configure: Add option for disabling generation of example certificates
Kim Alvefur <zash@zash.se>
parents:
5422
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 |
802
33c012048492
Add -Wall to default CFLAGS
Matthew Wild <mwild1@gmail.com>
parents:
798
diff
changeset
|
24 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
|
25 LDFLAGS="-shared" |
511
f9ab28562fda
Potential fixes for building on Mac OSX
Matthew Wild <mwild1@gmail.com>
parents:
502
diff
changeset
|
26 |
3764
323169f229fa
Make libidn default when not specifiying a IDN lib.
Tobias Markmann <tm@ayena.de>
parents:
3763
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. |
511
f9ab28562fda
Potential fixes for building on Mac OSX
Matthew Wild <mwild1@gmail.com>
parents:
502
diff
changeset
|
35 --ostype=OS Use one of the OS presets. |
6634
3e226e387a67
configure: Mention openbsd preset in --help
Kim Alvefur <zash@zash.se>
parents:
6580
diff
changeset
|
36 May be one of: debian, macosx, linux, freebsd, openbsd |
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 |
463
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
45 --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
|
46 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
|
47 --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
|
48 Default is $LUA_DIR |
5421
a3f0fe9431cf
configure: Add RUNWITH to --help
Kim Alvefur <zash@zash.se>
parents:
5401
diff
changeset
|
49 --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
|
50 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
|
51 --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
|
52 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
|
53 --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
|
54 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
|
55 --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
|
56 Default is $IDN_LIB |
5422
396072d62695
configure: Replaces tabs with spaces in --help
Kim Alvefur <zash@zash.se>
parents:
5421
diff
changeset
|
57 --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
|
58 idn: use GNU libidn (default) |
396072d62695
configure: Replaces tabs with spaces in --help
Kim Alvefur <zash@zash.se>
parents:
5421
diff
changeset
|
59 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
|
60 --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
|
61 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
|
62 --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
|
63 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
|
64 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
|
65 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
|
66 Default is to use /dev/urandom |
511
f9ab28562fda
Potential fixes for building on Mac OSX
Matthew Wild <mwild1@gmail.com>
parents:
502
diff
changeset
|
67 --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
|
68 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
|
69 --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
|
70 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
|
71 --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
|
72 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
|
73 --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
|
74 Default is $LD |
4451
70275ab52ab2
configure: Add 'openbsd' preset (thanks xavier)
Matthew Wild <mwild1@gmail.com>
parents:
4444
diff
changeset
|
75 --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
|
76 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
|
77 --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
|
78 EOF |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
79 } |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
80 |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
81 |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
82 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
|
83 do |
3050
76f0d653b347
configure: Fix to allow option values containing '=' (thanks Jakub)
Matthew Wild <mwild1@gmail.com>
parents:
1081
diff
changeset
|
84 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
|
85 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
|
86 then |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
87 echo |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
88 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
|
89 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
|
90 echo |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
91 fi |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
92 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
|
93 --help) |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
94 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
|
95 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
|
96 ;; |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
97 --prefix=*) |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
98 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
|
99 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
|
100 ;; |
1063
b873715ffd96
configure: Honour --sysconfdir parameter; thanks to Michael Scherer
Matthew Wild <mwild1@gmail.com>
parents:
998
diff
changeset
|
101 --sysconfdir=*) |
b873715ffd96
configure: Honour --sysconfdir parameter; thanks to Michael Scherer
Matthew Wild <mwild1@gmail.com>
parents:
998
diff
changeset
|
102 SYSCONFDIR="$value" |
b873715ffd96
configure: Honour --sysconfdir parameter; thanks to Michael Scherer
Matthew Wild <mwild1@gmail.com>
parents:
998
diff
changeset
|
103 SYSCONFDIR_SET=yes |
b873715ffd96
configure: Honour --sysconfdir parameter; thanks to Michael Scherer
Matthew Wild <mwild1@gmail.com>
parents:
998
diff
changeset
|
104 ;; |
511
f9ab28562fda
Potential fixes for building on Mac OSX
Matthew Wild <mwild1@gmail.com>
parents:
502
diff
changeset
|
105 --ostype=*) |
f9ab28562fda
Potential fixes for building on Mac OSX
Matthew Wild <mwild1@gmail.com>
parents:
502
diff
changeset
|
106 OSTYPE="$value" |
f9ab28562fda
Potential fixes for building on Mac OSX
Matthew Wild <mwild1@gmail.com>
parents:
502
diff
changeset
|
107 OSTYPE_SET=yes |
5641
92ffddd02c96
configure: Fix poor layout
James Callahan <james@chatid.com>
parents:
5422
diff
changeset
|
108 if [ "$OSTYPE" = "debian" ]; then |
92ffddd02c96
configure: Fix poor layout
James Callahan <james@chatid.com>
parents:
5422
diff
changeset
|
109 LUA_SUFFIX="5.1"; |
92ffddd02c96
configure: Fix poor layout
James Callahan <james@chatid.com>
parents:
5422
diff
changeset
|
110 LUA_SUFFIX_SET=yes |
92ffddd02c96
configure: Fix poor layout
James Callahan <james@chatid.com>
parents:
5422
diff
changeset
|
111 RUNWITH="lua5.1" |
92ffddd02c96
configure: Fix poor layout
James Callahan <james@chatid.com>
parents:
5422
diff
changeset
|
112 LUA_INCDIR=/usr/include/lua5.1; |
92ffddd02c96
configure: Fix poor layout
James Callahan <james@chatid.com>
parents:
5422
diff
changeset
|
113 LUA_INCDIR_SET=yes |
92ffddd02c96
configure: Fix poor layout
James Callahan <james@chatid.com>
parents:
5422
diff
changeset
|
114 CFLAGS="$CFLAGS -D_GNU_SOURCE" |
92ffddd02c96
configure: Fix poor layout
James Callahan <james@chatid.com>
parents:
5422
diff
changeset
|
115 fi |
92ffddd02c96
configure: Fix poor layout
James Callahan <james@chatid.com>
parents:
5422
diff
changeset
|
116 if [ "$OSTYPE" = "macosx" ]; then |
92ffddd02c96
configure: Fix poor layout
James Callahan <james@chatid.com>
parents:
5422
diff
changeset
|
117 LUA_INCDIR=/usr/local/include; |
92ffddd02c96
configure: Fix poor layout
James Callahan <james@chatid.com>
parents:
5422
diff
changeset
|
118 LUA_INCDIR_SET=yes |
92ffddd02c96
configure: Fix poor layout
James Callahan <james@chatid.com>
parents:
5422
diff
changeset
|
119 LUA_LIBDIR=/usr/local/lib |
92ffddd02c96
configure: Fix poor layout
James Callahan <james@chatid.com>
parents:
5422
diff
changeset
|
120 LUA_LIBDIR_SET=yes |
6878
53a74a80c91a
configure, util-src/Makefile: Move OS X deployment flag to an C compiler argument set by configure
Kim Alvefur <zash@zash.se>
parents:
6810
diff
changeset
|
121 CFLAGS="$CFLAGS -mmacosx-version-min=10.3" |
5641
92ffddd02c96
configure: Fix poor layout
James Callahan <james@chatid.com>
parents:
5422
diff
changeset
|
122 LDFLAGS="-bundle -undefined dynamic_lookup" |
92ffddd02c96
configure: Fix poor layout
James Callahan <james@chatid.com>
parents:
5422
diff
changeset
|
123 fi |
92ffddd02c96
configure: Fix poor layout
James Callahan <james@chatid.com>
parents:
5422
diff
changeset
|
124 if [ "$OSTYPE" = "linux" ]; then |
92ffddd02c96
configure: Fix poor layout
James Callahan <james@chatid.com>
parents:
5422
diff
changeset
|
125 LUA_INCDIR=/usr/local/include; |
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
|
126 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
|
127 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
|
128 LUA_LIBDIR_SET=yes |
5641
92ffddd02c96
configure: Fix poor layout
James Callahan <james@chatid.com>
parents:
5422
diff
changeset
|
129 CFLAGS="-Wall -fPIC -D_GNU_SOURCE" |
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
|
130 LDFLAGS="-shared" |
5641
92ffddd02c96
configure: Fix poor layout
James Callahan <james@chatid.com>
parents:
5422
diff
changeset
|
131 fi |
92ffddd02c96
configure: Fix poor layout
James Callahan <james@chatid.com>
parents:
5422
diff
changeset
|
132 if [ "$OSTYPE" = "freebsd" -o "$OSTYPE" = "openbsd" ]; then |
92ffddd02c96
configure: Fix poor layout
James Callahan <james@chatid.com>
parents:
5422
diff
changeset
|
133 LUA_INCDIR="/usr/local/include/lua51" |
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
|
134 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
|
135 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
|
136 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
|
137 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
|
138 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
|
139 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
|
140 LUA_DIR_SET=yes |
6635
ef88a6072228
configure: Set default compiler and linker to cc and ld on *bsd (thanks Tobias)
Kim Alvefur <zash@zash.se>
parents:
6634
diff
changeset
|
141 CC=cc |
ef88a6072228
configure: Set default compiler and linker to cc and ld on *bsd (thanks Tobias)
Kim Alvefur <zash@zash.se>
parents:
6634
diff
changeset
|
142 LD=ld |
5641
92ffddd02c96
configure: Fix poor layout
James Callahan <james@chatid.com>
parents:
5422
diff
changeset
|
143 fi |
92ffddd02c96
configure: Fix poor layout
James Callahan <james@chatid.com>
parents:
5422
diff
changeset
|
144 if [ "$OSTYPE" = "openbsd" ]; then |
92ffddd02c96
configure: Fix poor layout
James Callahan <james@chatid.com>
parents:
5422
diff
changeset
|
145 LUA_INCDIR="/usr/local/include"; |
92ffddd02c96
configure: Fix poor layout
James Callahan <james@chatid.com>
parents:
5422
diff
changeset
|
146 fi |
511
f9ab28562fda
Potential fixes for building on Mac OSX
Matthew Wild <mwild1@gmail.com>
parents:
502
diff
changeset
|
147 ;; |
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
|
148 --libdir=*) |
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
|
149 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
|
150 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
|
151 ;; |
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
|
152 --datadir=*) |
502
21dc299387a6
Installation improvements (auto-creation of data directories)
Matthew Wild <mwild1@gmail.com>
parents:
467
diff
changeset
|
153 DATADIR="$value" |
21dc299387a6
Installation improvements (auto-creation of data directories)
Matthew Wild <mwild1@gmail.com>
parents:
467
diff
changeset
|
154 DATADIR_SET=yes |
21dc299387a6
Installation improvements (auto-creation of data directories)
Matthew Wild <mwild1@gmail.com>
parents:
467
diff
changeset
|
155 ;; |
4451
70275ab52ab2
configure: Add 'openbsd' preset (thanks xavier)
Matthew Wild <mwild1@gmail.com>
parents:
4444
diff
changeset
|
156 --require-config) |
70275ab52ab2
configure: Add 'openbsd' preset (thanks xavier)
Matthew Wild <mwild1@gmail.com>
parents:
4444
diff
changeset
|
157 REQUIRE_CONFIG=yes |
70275ab52ab2
configure: Add 'openbsd' preset (thanks xavier)
Matthew Wild <mwild1@gmail.com>
parents:
4444
diff
changeset
|
158 ;; |
463
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
159 --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
|
160 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
|
161 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
|
162 ;; |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
163 --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
|
164 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
|
165 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
|
166 ;; |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
167 --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
|
168 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
|
169 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
|
170 ;; |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
171 --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
|
172 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
|
173 ;; |
463
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
174 --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
|
175 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
|
176 ;; |
3762
f02bac902a1e
util.encodings: Support for ICU for IDNA operations.
Tobias Markmann <tm@ayena.de>
parents:
3352
diff
changeset
|
177 --idn-library=*) |
f02bac902a1e
util.encodings: Support for ICU for IDNA operations.
Tobias Markmann <tm@ayena.de>
parents:
3352
diff
changeset
|
178 IDN_LIBRARY="$value" |
f02bac902a1e
util.encodings: Support for ICU for IDNA operations.
Tobias Markmann <tm@ayena.de>
parents:
3352
diff
changeset
|
179 ;; |
463
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
180 --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
|
181 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
|
182 ;; |
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
|
183 --with-random=getrandom) |
3d2c2f0809ee
util.crand: C binding to one of OpenSSL, Linux getrandom() or OpenBSD arc4random() CSPRNG
Kim Alvefur <zash@zash.se>
parents:
6886
diff
changeset
|
184 PRNG=GETRANDOM |
3d2c2f0809ee
util.crand: C binding to one of OpenSSL, Linux getrandom() or OpenBSD arc4random() CSPRNG
Kim Alvefur <zash@zash.se>
parents:
6886
diff
changeset
|
185 ;; |
3d2c2f0809ee
util.crand: C binding to one of OpenSSL, Linux getrandom() or OpenBSD arc4random() CSPRNG
Kim Alvefur <zash@zash.se>
parents:
6886
diff
changeset
|
186 --with-random=openssl) |
3d2c2f0809ee
util.crand: C binding to one of OpenSSL, Linux getrandom() or OpenBSD arc4random() CSPRNG
Kim Alvefur <zash@zash.se>
parents:
6886
diff
changeset
|
187 PRNG=OPENSSL |
3d2c2f0809ee
util.crand: C binding to one of OpenSSL, Linux getrandom() or OpenBSD arc4random() CSPRNG
Kim Alvefur <zash@zash.se>
parents:
6886
diff
changeset
|
188 PRNGLIBS=-lcrypto |
3d2c2f0809ee
util.crand: C binding to one of OpenSSL, Linux getrandom() or OpenBSD arc4random() CSPRNG
Kim Alvefur <zash@zash.se>
parents:
6886
diff
changeset
|
189 ;; |
3d2c2f0809ee
util.crand: C binding to one of OpenSSL, Linux getrandom() or OpenBSD arc4random() CSPRNG
Kim Alvefur <zash@zash.se>
parents:
6886
diff
changeset
|
190 --with-random=arc4random) |
3d2c2f0809ee
util.crand: C binding to one of OpenSSL, Linux getrandom() or OpenBSD arc4random() CSPRNG
Kim Alvefur <zash@zash.se>
parents:
6886
diff
changeset
|
191 PRNG=ARC4RANDOM |
3d2c2f0809ee
util.crand: C binding to one of OpenSSL, Linux getrandom() or OpenBSD arc4random() CSPRNG
Kim Alvefur <zash@zash.se>
parents:
6886
diff
changeset
|
192 ;; |
511
f9ab28562fda
Potential fixes for building on Mac OSX
Matthew Wild <mwild1@gmail.com>
parents:
502
diff
changeset
|
193 --cflags=*) |
f9ab28562fda
Potential fixes for building on Mac OSX
Matthew Wild <mwild1@gmail.com>
parents:
502
diff
changeset
|
194 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
|
195 ;; |
174b4a83f5b7
configure: Add 'linux' ostype and rename lflags to LDFLAGS to match expectations.
Brian Cully <bjc@junctionnetworks.com>
parents:
1081
diff
changeset
|
196 --ldflags=*) |
174b4a83f5b7
configure: Add 'linux' ostype and rename lflags to LDFLAGS to match expectations.
Brian Cully <bjc@junctionnetworks.com>
parents:
1081
diff
changeset
|
197 LDFLAGS="$value" |
174b4a83f5b7
configure: Add 'linux' ostype and rename lflags to LDFLAGS to match expectations.
Brian Cully <bjc@junctionnetworks.com>
parents:
1081
diff
changeset
|
198 ;; |
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
|
199 --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
|
200 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
|
201 ;; |
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
|
202 --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
|
203 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
|
204 ;; |
5145
53f741a5a73a
configure, Makefile: Allow runtime to be overridden.
Kim Alvefur <zash@zash.se>
parents:
5048
diff
changeset
|
205 --runwith=*) |
53f741a5a73a
configure, Makefile: Allow runtime to be overridden.
Kim Alvefur <zash@zash.se>
parents:
5048
diff
changeset
|
206 RUNWITH="$value" |
53f741a5a73a
configure, Makefile: Allow runtime to be overridden.
Kim Alvefur <zash@zash.se>
parents:
5048
diff
changeset
|
207 ;; |
5933
56b1f151f4a3
Makefile, configure: Add option for disabling generation of example certificates
Kim Alvefur <zash@zash.se>
parents:
5422
diff
changeset
|
208 --no-example-certs) |
56b1f151f4a3
Makefile, configure: Add option for disabling generation of example certificates
Kim Alvefur <zash@zash.se>
parents:
5422
diff
changeset
|
209 EXCERTS= |
56b1f151f4a3
Makefile, configure: Add option for disabling generation of example certificates
Kim Alvefur <zash@zash.se>
parents:
5422
diff
changeset
|
210 ;; |
463
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
211 *) |
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 "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
|
213 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
|
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 esac |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
216 shift |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
217 done |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
218 |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
219 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
|
220 then |
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 [ "$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
|
222 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
|
223 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
|
224 fi |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
225 fi |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
226 |
502
21dc299387a6
Installation improvements (auto-creation of data directories)
Matthew Wild <mwild1@gmail.com>
parents:
467
diff
changeset
|
227 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
|
228 then |
21dc299387a6
Installation improvements (auto-creation of data directories)
Matthew Wild <mwild1@gmail.com>
parents:
467
diff
changeset
|
229 if [ "$PREFIX" = "/usr" ] |
21dc299387a6
Installation improvements (auto-creation of data directories)
Matthew Wild <mwild1@gmail.com>
parents:
467
diff
changeset
|
230 then DATADIR=/var/lib/prosody |
21dc299387a6
Installation improvements (auto-creation of data directories)
Matthew Wild <mwild1@gmail.com>
parents:
467
diff
changeset
|
231 else DATADIR=$PREFIX/var/lib/prosody |
21dc299387a6
Installation improvements (auto-creation of data directories)
Matthew Wild <mwild1@gmail.com>
parents:
467
diff
changeset
|
232 fi |
21dc299387a6
Installation improvements (auto-creation of data directories)
Matthew Wild <mwild1@gmail.com>
parents:
467
diff
changeset
|
233 fi |
21dc299387a6
Installation improvements (auto-creation of data directories)
Matthew Wild <mwild1@gmail.com>
parents:
467
diff
changeset
|
234 |
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
|
235 if [ "$PREFIX_SET" = "yes" -a ! "$LIBDIR_SET" = "yes" ] |
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
|
236 then |
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
|
237 LIBDIR=$PREFIX/lib |
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
|
238 fi |
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
|
239 |
463
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
240 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
|
241 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
|
242 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
|
243 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
|
244 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
|
245 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
|
246 do |
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
|
247 if [ -f "$item/$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
|
248 then |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
249 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
|
250 break |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
251 fi |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
252 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
|
253 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
|
254 done |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
255 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
|
256 then |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
257 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
|
258 else |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
259 echo "" |
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 |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
263 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
|
264 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
|
265 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
|
266 do |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
267 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
|
268 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
|
269 then |
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
|
270 if [ -f "$LUA_DIR/bin/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
|
271 then |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
272 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
|
273 fi |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
274 else |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
275 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
|
276 fi |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
277 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
|
278 then |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
279 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
|
280 break |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
281 fi |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
282 done |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
283 fi |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
284 |
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
|
285 if [ "$LUA_DIR_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
|
286 then |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
287 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
|
288 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
|
289 then |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
290 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
|
291 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
|
292 fi |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
293 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
|
294 then |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
295 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
|
296 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
|
297 else |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
298 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
|
299 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
|
300 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
|
301 fi |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
302 fi |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
303 |
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
|
304 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
|
305 then |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
306 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
|
307 fi |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
308 |
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
|
309 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
|
310 then |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
311 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
|
312 fi |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
313 |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
314 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
|
315 then |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
316 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
|
317 fi |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
318 |
3762
f02bac902a1e
util.encodings: Support for ICU for IDNA operations.
Tobias Markmann <tm@ayena.de>
parents:
3352
diff
changeset
|
319 if [ "$IDN_LIBRARY" = "icu" ] |
f02bac902a1e
util.encodings: Support for ICU for IDNA operations.
Tobias Markmann <tm@ayena.de>
parents:
3352
diff
changeset
|
320 then |
f02bac902a1e
util.encodings: Support for ICU for IDNA operations.
Tobias Markmann <tm@ayena.de>
parents:
3352
diff
changeset
|
321 IDNA_LIBS="$ICU_FLAGS" |
f02bac902a1e
util.encodings: Support for ICU for IDNA operations.
Tobias Markmann <tm@ayena.de>
parents:
3352
diff
changeset
|
322 CFLAGS="$CFLAGS -DUSE_STRINGPREP_ICU" |
f02bac902a1e
util.encodings: Support for ICU for IDNA operations.
Tobias Markmann <tm@ayena.de>
parents:
3352
diff
changeset
|
323 fi |
5641
92ffddd02c96
configure: Fix poor layout
James Callahan <james@chatid.com>
parents:
5422
diff
changeset
|
324 if [ "$IDN_LIBRARY" = "idn" ] |
3764
323169f229fa
Make libidn default when not specifiying a IDN lib.
Tobias Markmann <tm@ayena.de>
parents:
3763
diff
changeset
|
325 then |
323169f229fa
Make libidn default when not specifiying a IDN lib.
Tobias Markmann <tm@ayena.de>
parents:
3763
diff
changeset
|
326 IDNA_LIBS="-l$IDN_LIB" |
323169f229fa
Make libidn default when not specifiying a IDN lib.
Tobias Markmann <tm@ayena.de>
parents:
3763
diff
changeset
|
327 fi |
323169f229fa
Make libidn default when not specifiying a IDN lib.
Tobias Markmann <tm@ayena.de>
parents:
3763
diff
changeset
|
328 |
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
|
329 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
|
330 |
463
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
331 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
|
332 lua_h="$LUA_INCDIR/lua.h" |
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
|
333 if [ -f "$lua_h" ] |
463
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
334 then |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
335 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
|
336 else |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
337 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
|
338 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
|
339 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
|
340 fi |
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 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
|
343 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
|
344 shift |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
345 tried="$*" |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
346 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
|
347 do |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
348 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
|
349 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
|
350 then |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
351 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
|
352 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
|
353 return |
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 |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
355 shift |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
356 done |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
357 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
|
358 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
|
359 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
|
360 } |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
361 |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
362 # 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
|
363 |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
364 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
|
365 echo |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
366 |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
367 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
|
368 # 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
|
369 # 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
|
370 |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
371 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
|
372 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
|
373 LIBDIR=$LIBDIR |
502
21dc299387a6
Installation improvements (auto-creation of data directories)
Matthew Wild <mwild1@gmail.com>
parents:
467
diff
changeset
|
374 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
|
375 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
|
376 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
|
377 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
|
378 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
|
379 LUA_BINDIR=$LUA_BINDIR |
4451
70275ab52ab2
configure: Add 'openbsd' preset (thanks xavier)
Matthew Wild <mwild1@gmail.com>
parents:
4444
diff
changeset
|
380 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
|
381 IDN_LIB=$IDN_LIB |
3762
f02bac902a1e
util.encodings: Support for ICU for IDNA operations.
Tobias Markmann <tm@ayena.de>
parents:
3352
diff
changeset
|
382 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
|
383 OPENSSL_LIBS=$OPENSSL_LIBS |
511
f9ab28562fda
Potential fixes for building on Mac OSX
Matthew Wild <mwild1@gmail.com>
parents:
502
diff
changeset
|
384 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
|
385 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
|
386 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
|
387 LD=$LD |
5145
53f741a5a73a
configure, Makefile: Allow runtime to be overridden.
Kim Alvefur <zash@zash.se>
parents:
5048
diff
changeset
|
388 RUNWITH=$RUNWITH |
5933
56b1f151f4a3
Makefile, configure: Add option for disabling generation of example certificates
Kim Alvefur <zash@zash.se>
parents:
5422
diff
changeset
|
389 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
|
390 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
|
391 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
|
392 |
463
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
393 |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
394 EOF |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
395 |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
396 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
|
397 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
|
398 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
|
399 |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
400 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
|
401 |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
402 echo |
a2452d3bd828
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
403 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
|
404 echo |