Changeset c2ee85c


Ignore:
Timestamp:
2006-05-16T21:21:34Z (13 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
ac83732
Parents:
af9980f (diff), 85cf37f (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:

Merge from main tree.

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • configure

    raf9980f rc2ee85c  
    1414datadir='$prefix/share/bitlbee/'
    1515config='/var/lib/bitlbee/'
     16plugindir='$prefix/lib/bitlbee/'
     17includedir='$prefix/include/bitlbee/'
     18libevent='/usr/'
    1619pidfile='/var/run/bitlbee.pid'
    1720ipcsocket='/var/run/bitlbee'
    18 plugindir='$prefix/lib/bitlbee'
    1921pcdir='$prefix/lib/pkgconfig'
    20 includedir='$prefix/include/bitlbee'
    2122
    2223msn=1
     
    2829strip=1
    2930ipv6=1
     31
     32events=glib
    3033ssl=auto
    3134
     
    6467--ipv6=0/1      IPv6 socket support                     $ipv6
    6568
     69--events=...    Event handler (glib, libevent)          $events
    6670--ssl=...       SSL library to use (gnutls, nss, openssl, bogus, auto)
    6771                                                        $ssl
     
    8084config=`eval echo "$config/" | sed 's/\/\{1,\}/\//g'`
    8185plugindir=`eval echo "$plugindir/" | sed 's/\/\{1,\}/\//g'`
     86includedir=`eval echo "$includedir"/ | sed 's/\/\{1,\}/\//g'`
     87libevent=`eval echo "$libevent"/ | sed 's/\/\{1,\}/\//g'`
     88
    8289pidfile=`eval echo "$pidfile" | sed 's/\/\{1,\}/\//g'`
    8390ipcsocket=`eval echo "$ipcsocket" | sed 's/\/\{1,\}/\//g'`
    84 includedir=`eval echo "$includedir" | sed 's/\/\{1,\}/\//g'`
    8591pcdir=`eval echo "$pcdir" | sed 's/\/\{1,\}/\//g'`
    8692
     
    183189        :;
    184190elif [ -r /usr/local/include/iconv.h ]; then
    185         echo CFLAGS+=-I/usr/local/include >> Makefile.settings;
     191        echo CFLAGS+=-I/usr/local/include >> Makefile.settings
    186192else
    187193        echo
    188194        echo 'Warning: Could not find iconv.h, you might have to install it and/or modify'
    189         echo 'Makefile.settings to tell where this file is.';
    190 fi
     195        echo 'Makefile.settings to tell where this file is.'
     196fi
     197
     198
     199if [ "$events" = "libevent" ]; then
     200        if ! [ -e "${libevent}include/event.h" ]; then
     201                echo
     202                echo 'Warning: Could not find event.h, you might have to install it and/or specify'
     203                echo 'its location using the --libevent= argument. (Example: If event.h is in'
     204                echo '/usr/local/include and binaries are in /usr/local/lib: --libevent=/usr/local)'
     205        fi
     206       
     207        echo '#define EVENTS_LIBEVENT' >> config.h
     208        cat <<EOF>>Makefile.settings
     209EFLAGS+=-levent -L${libevent}lib
     210CFLAGS+=-I${libevent}include
     211EOF
     212elif [ "$events" = "glib" ]; then
     213        ## We already use glib anyway, so this is all we need (and in fact not even this, but just to be sure...):
     214        echo '#define EVENTS_GLIB' >> config.h
     215else
     216        echo
     217        echo 'ERROR: Unknown event handler specified.'
     218        exit 1
     219fi
     220echo 'EVENT_HANDLER=events_'$events'.o' >> Makefile.settings
    191221
    192222
     
    422452fi
    423453
    424 if [ "$msn" = "1" ]; then
    425         echo '  Using SSL library: '$ssl;
    426 fi
     454echo '  Using event handler: '$events;
     455echo '  Using SSL library: '$ssl;
    427456
    428457#if [ "$flood" = "0" ]; then
  • protocols/Makefile

    raf9980f rc2ee85c  
    1010
    1111# [SH] Program variables
    12 objects = events_libevent.o http_client.o md5.o nogaim.o proxy.o sha.o $(SSL_CLIENT)
    13 #objects = events_glib.o http_client.o md5.o nogaim.o proxy.o sha.o $(SSL_CLIENT)
     12objects = $(EVENT_HANDLER) http_client.o md5.o nogaim.o proxy.o sha.o $(SSL_CLIENT)
    1413
    1514# [SH] The next two lines should contain the directory name (in $(subdirs))
Note: See TracChangeset for help on using the changeset viewer.