Changeset 6197702 for configure

Timestamp:

2010-10-09T18:41:19Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

d150a9d

Parents:

23b29c6 (diff), 27b407f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging OTR branch. It's more or less a plugin if you enable it, and
otherwise a no-op. DO NOT INSTALL THIS ON PUBLIC SERVERS.

File:

• configure (modified) (5 diffs)

configure

@@ -34 +34 @@
 gcov=0
 plugins=1
+otr=0
 
 events=glib
@@ -72 +73 @@
 
 --purple=0/1    Disable/enable libpurple support        $purple
+                (automatically disables other protocol modules)
 
 --debug=0/1     Disable/enable debugging                $debug
@@ -77 +79 @@
 --gcov=0/1      Disable/enable test coverage reporting  $gcov
 --plugins=0/1   Disable/enable plugins support          $plugins
+--otr=0/1/auto/plugin
+                Disable/enable OTR encryption support   $otr
 
 --events=...    Event handler (glib, libevent)          $events
@@ -489 +493 @@
 fi
 
+otrprefix=""
+for i in / /usr /usr/local; do
+        if [ -f ${i}/lib/libotr.a ]; then
+                otrprefix=${i}
+                break
+        fi
+done
+if [ "$otr" = "auto" ]; then
+        if [ -n "$otrprefix" ]; then
+                otr=1
+        else
+                otr=0
+        fi
+fi
+if [ "$otr" = 1 ]; then
+        # BI == built-in
+        echo '#define OTR_BI' >> config.h
+        echo "EFLAGS+=-L${otrprefix}/lib -lotr" >> Makefile.settings
+        echo "CFLAGS+=-I${otrprefix}/include" >> Makefile.settings
+        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
         echo
@@ -683 +714 @@
 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
+
 echo '  Using event handler: '$events
 echo '  Using SSL library: '$ssl