Changeset c2ee85c

Timestamp:

2006-05-16T21:21:34Z (19 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:

• configure (modified) (6 diffs)
• protocols/Makefile (modified) (1 diff)

configure

@@ -14 +14 @@
 datadir='$prefix/share/bitlbee/'
 config='/var/lib/bitlbee/'
+plugindir='$prefix/lib/bitlbee/'
+includedir='$prefix/include/bitlbee/'
+libevent='/usr/'
 pidfile='/var/run/bitlbee.pid'
 ipcsocket='/var/run/bitlbee'
-plugindir='$prefix/lib/bitlbee'
 pcdir='$prefix/lib/pkgconfig'
-includedir='$prefix/include/bitlbee'
 
 msn=1
@@ -28 +29 @@
 strip=1
 ipv6=1
+
+events=glib
 ssl=auto
 
@@ -64 +67 @@
 --ipv6=0/1      IPv6 socket support                     $ipv6
 
+--events=...    Event handler (glib, libevent)          $events
 --ssl=...       SSL library to use (gnutls, nss, openssl, bogus, auto)
                                                         $ssl
@@ -80 +84 @@
 config=`eval echo "$config/" | sed 's/\/\{1,\}/\//g'`
 plugindir=`eval echo "$plugindir/" | sed 's/\/\{1,\}/\//g'`
+includedir=`eval echo "$includedir"/ | sed 's/\/\{1,\}/\//g'`
+libevent=`eval echo "$libevent"/ | sed 's/\/\{1,\}/\//g'`
+
 pidfile=`eval echo "$pidfile" | sed 's/\/\{1,\}/\//g'`
 ipcsocket=`eval echo "$ipcsocket" | sed 's/\/\{1,\}/\//g'`
-includedir=`eval echo "$includedir" | sed 's/\/\{1,\}/\//g'`
 pcdir=`eval echo "$pcdir" | sed 's/\/\{1,\}/\//g'`
 
@@ -183 +189 @@
         :;
 elif [ -r /usr/local/include/iconv.h ]; then
-        echo CFLAGS+=-I/usr/local/include >> Makefile.settings;
+        echo CFLAGS+=-I/usr/local/include >> Makefile.settings
 else
         echo
         echo 'Warning: Could not find iconv.h, you might have to install it and/or modify'
-        echo 'Makefile.settings to tell where this file is.';
-fi
+        echo 'Makefile.settings to tell where this file is.'
+fi
+
+
+if [ "$events" = "libevent" ]; then
+        if ! [ -e "${libevent}include/event.h" ]; then
+                echo
+                echo 'Warning: Could not find event.h, you might have to install it and/or specify'
+                echo 'its location using the --libevent= argument. (Example: If event.h is in'
+                echo '/usr/local/include and binaries are in /usr/local/lib: --libevent=/usr/local)'
+        fi
+        
+        echo '#define EVENTS_LIBEVENT' >> config.h
+        cat <<EOF>>Makefile.settings
+EFLAGS+=-levent -L${libevent}lib
+CFLAGS+=-I${libevent}include
+EOF
+elif [ "$events" = "glib" ]; then
+        ## We already use glib anyway, so this is all we need (and in fact not even this, but just to be sure...):
+        echo '#define EVENTS_GLIB' >> config.h
+else
+        echo
+        echo 'ERROR: Unknown event handler specified.'
+        exit 1
+fi
+echo 'EVENT_HANDLER=events_'$events'.o' >> Makefile.settings
 
 
@@ -422 +452 @@
 fi
 
-if [ "$msn" = "1" ]; then
-        echo '  Using SSL library: '$ssl;
-fi
+echo '  Using event handler: '$events;
+echo '  Using SSL library: '$ssl;
 
 #if [ "$flood" = "0" ]; then

protocols/Makefile

@@ -10 +10 @@
 
 # [SH] Program variables
-objects = events_libevent.o http_client.o md5.o nogaim.o proxy.o sha.o $(SSL_CLIENT)
-#objects = events_glib.o http_client.o md5.o nogaim.o proxy.o sha.o $(SSL_CLIENT)
+objects = $(EVENT_HANDLER) http_client.o md5.o nogaim.o proxy.o sha.o $(SSL_CLIENT)
 
 # [SH] The next two lines should contain the directory name (in $(subdirs))