Comparison

configure @ 5935:a367bae38385

Merge 0.9->0.10
author Matthew Wild <mwild1@gmail.com>
date Wed, 11 Dec 2013 22:31:48 +0000
parent 5641:92ffddd02c96
parent 5933:56b1f151f4a3
child 6576:b7796a46aec2
comparison
equal deleted inserted replaced
5931:1c702c2455d7 5935:a367bae38385
15 OPENSSL_LIB=crypto 15 OPENSSL_LIB=crypto
16 CC=gcc 16 CC=gcc
17 CXX=g++ 17 CXX=g++
18 LD=gcc 18 LD=gcc
19 RUNWITH=lua 19 RUNWITH=lua
20 EXCERTS=yes
20 21
21 CFLAGS="-fPIC -Wall" 22 CFLAGS="-fPIC -Wall"
22 LDFLAGS="-shared" 23 LDFLAGS="-shared"
23 24
24 IDN_LIBRARY=idn 25 IDN_LIBRARY=idn
62 Default is $CC 63 Default is $CC
63 --linker=CC The linker to use when building modules. 64 --linker=CC The linker to use when building modules.
64 Default is $LD 65 Default is $LD
65 --require-config Will cause Prosody to refuse to run when 66 --require-config Will cause Prosody to refuse to run when
66 it fails to find a configuration file 67 it fails to find a configuration file
68 --no-example-certs Disables generation of example certificates.
67 EOF 69 EOF
68 } 70 }
69 71
70 72
71 while [ "$1" ] 73 while [ "$1" ]
175 LD="$value" 177 LD="$value"
176 ;; 178 ;;
177 --runwith=*) 179 --runwith=*)
178 RUNWITH="$value" 180 RUNWITH="$value"
179 ;; 181 ;;
182 --no-example-certs)
183 EXCERTS=
184 ;;
180 *) 185 *)
181 echo "Error: Unknown flag: $1" 186 echo "Error: Unknown flag: $1"
182 exit 1 187 exit 1
183 ;; 188 ;;
184 esac 189 esac
346 LDFLAGS=$LDFLAGS 351 LDFLAGS=$LDFLAGS
347 CC=$CC 352 CC=$CC
348 CXX=$CXX 353 CXX=$CXX
349 LD=$LD 354 LD=$LD
350 RUNWITH=$RUNWITH 355 RUNWITH=$RUNWITH
356 EXCERTS=$EXCERTS
351 357
352 EOF 358 EOF
353 359
354 echo "Installation prefix: $PREFIX" 360 echo "Installation prefix: $PREFIX"
355 echo "Prosody configuration directory: $SYSCONFDIR" 361 echo "Prosody configuration directory: $SYSCONFDIR"