Changeset 6197702 for configure


Ignore:
Timestamp:
2010-10-09T18:41:19Z (13 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:
1 edited

Legend:

Unmodified
Added
Removed
  • configure

    r23b29c6 r6197702  
    3434gcov=0
    3535plugins=1
     36otr=0
    3637
    3738events=glib
     
    7273
    7374--purple=0/1    Disable/enable libpurple support        $purple
     75                (automatically disables other protocol modules)
    7476
    7577--debug=0/1     Disable/enable debugging                $debug
     
    7779--gcov=0/1      Disable/enable test coverage reporting  $gcov
    7880--plugins=0/1   Disable/enable plugins support          $plugins
     81--otr=0/1/auto/plugin
     82                Disable/enable OTR encryption support   $otr
    7983
    8084--events=...    Event handler (glib, libevent)          $events
     
    489493fi
    490494
     495otrprefix=""
     496for i in / /usr /usr/local; do
     497        if [ -f ${i}/lib/libotr.a ]; then
     498                otrprefix=${i}
     499                break
     500        fi
     501done
     502if [ "$otr" = "auto" ]; then
     503        if [ -n "$otrprefix" ]; then
     504                otr=1
     505        else
     506                otr=0
     507        fi
     508fi
     509if [ "$otr" = 1 ]; then
     510        # BI == built-in
     511        echo '#define OTR_BI' >> config.h
     512        echo "EFLAGS+=-L${otrprefix}/lib -lotr" >> Makefile.settings
     513        echo "CFLAGS+=-I${otrprefix}/include" >> Makefile.settings
     514        echo 'OTR_BI=otr.o' >> Makefile.settings
     515elif [ "$otr" = "plugin" ]; then
     516        echo '#define OTR_PI' >> config.h
     517        echo "OTRFLAGS=-L${otrprefix}/lib -lotr" >> Makefile.settings
     518        echo "CFLAGS+=-I${otrprefix}/include" >> Makefile.settings
     519        echo 'OTR_PI=otr.so' >> Makefile.settings
     520fi
     521
    491522if [ ! -e doc/user-guide/help.txt ] && ! type xmlto > /dev/null 2> /dev/null; then
    492523        echo
     
    683714fi
    684715
     716if [ "$otr" = "1" ]; then
     717        echo '  Off-the-Record (OTR) Messaging enabled.'
     718elif [ "$otr" = "plugin" ]; then
     719        echo '  Off-the-Record (OTR) Messaging enabled (as a plugin).'
     720else
     721        echo '  Off-the-Record (OTR) Messaging disabled.'
     722fi
     723
    685724echo '  Using event handler: '$events
    686725echo '  Using SSL library: '$ssl
Note: See TracChangeset for help on using the changeset viewer.