diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2007-10-12 01:08:58 +0100 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2007-10-12 01:08:58 +0100 |
| commit | eda54e40d04c83028d84e91c895a550c1929b436 (patch) | |
| tree | 878f985af2ab5d2b9c59e8c955448bc4e9ddec17 /configure | |
| parent | 82135c7178b6379f35741991f6c06bb308143194 (diff) | |
| parent | d444c09e6c7ac6fc3c1686af0e63c09805d8cd00 (diff) | |
Merge from devel.
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 15 |
1 files changed, 11 insertions, 4 deletions
@@ -28,6 +28,7 @@ yahoo=1 debug=0 strip=1 gcov=0 +plugins=1 ipv6=1 events=glib @@ -68,11 +69,10 @@ Option Description Default --debug=0/1 Disable/enable debugging $debug --strip=0/1 Disable/enable binary stripping $strip --gcov=0/1 Disable/enable test coverage reporting $gcov +--plugins=0/1 Disable/enable plugins support $plugins --ipv6=0/1 IPv6 socket support $ipv6 ---ldap=0/1/auto LDAP support $ldap - --events=... Event handler (glib, libevent) $events --ssl=... SSL library to use (gnutls, nss, openssl, bogus, auto) $ssl @@ -139,13 +139,14 @@ if [ "$ipv6" = "1" ]; then fi if [ "$debug" = "1" ]; then - echo 'CFLAGS=-g' >> Makefile.settings + [ -z "$CFLAGS" ] && CFLAGS=-g echo 'DEBUG=1' >> Makefile.settings echo '#define DEBUG' >> config.h else - echo 'CFLAGS=-O3' >> Makefile.settings + [ -z "$CFLAGS" ] && CFLAGS=-O3 fi +echo CFLAGS=$CFLAGS >> Makefile.settings echo CFLAGS+=-I`pwd` -I`pwd`/lib -I`pwd`/protocols -I. >> Makefile.settings echo CFLAGS+=-DHAVE_CONFIG_H >> Makefile.settings @@ -384,6 +385,12 @@ if [ "$gcov" = "1" ]; then echo "EFLAGS+=-lgcov" >> Makefile.settings fi +if [ "$plugins" = 0 ]; then + echo '#undef WITH_PLUGINS' >> config.h +else + echo '#define WITH_PLUGINS' >> config.h +fi + echo if [ -z "$BITLBEE_VERSION" -a -d .bzr ] && type bzr > /dev/null 2> /dev/null; then nick=`bzr nick` |