From 858ea0166108e9cfab3cc9290fc976f041411cce Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Wed, 29 Sep 2010 22:50:43 -0700 Subject: Allow building OTR support as a plugin. Fairly simple, let's hope I can get away with doing this without libtool (eep). --- configure | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 811f829e..f7c81cba 100755 --- a/configure +++ b/configure @@ -499,11 +499,16 @@ if [ "$otr" = "auto" ]; then fi fi if [ "$otr" = 1 ]; then - echo '#define WITH_OTR' >> config.h + # BI == built-in + echo '#define OTR_BI' >> config.h echo "EFLAGS+=-L${otrprefix}/lib -lotr" >> Makefile.settings echo "CFLAGS+=-I${otrprefix}/include" >> Makefile.settings -else - echo '#undef WITH_OTR' >> config.h + echo 'OTR_BI=otr.o' >> Makefile.settings +elif [ "$otr" = "plugin" ]; then + echo '#define OTR_PI' >> config.h + echo "OTRFLAGS=-L${otrprefix}/lib -lotr" >> Makefile.settings + echo "CFLAGS+=-I${otrprefix}/include" >> Makefile.settings + echo 'OTR_PI=otr.so' >> Makefile.settings fi if [ ! -e doc/user-guide/help.txt ] && ! type xmlto > /dev/null 2> /dev/null; then @@ -702,6 +707,8 @@ fi if [ "$otr" = "1" ]; then echo ' Off-the-Record (OTR) Messaging enabled.' +elif [ "$otr" = "plugin" ]; then + echo ' Off-the-Record (OTR) Messaging enabled (as a plugin).' else echo ' Off-the-Record (OTR) Messaging disabled.' fi -- cgit v1.2.3