Changes in configure [85cf37f:0a69d7b]

File:

• configure (modified) (9 diffs)

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
@@ -29 +28 @@
 strip=1
 ipv6=1
-
-events=glib
 ssl=auto
 
@@ -67 +64 @@
 --ipv6=0/1      IPv6 socket support                     $ipv6
 
---events=...    Event handler (glib, libevent)          $events
 --ssl=...       SSL library to use (gnutls, nss, openssl, bogus, auto)
                                                         $ssl
@@ -84 +80 @@
 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'`
 
@@ -169 +163 @@
 fi
 
+GLIB=0
+
 if $PKG_CONFIG --version > /dev/null 2>/dev/null && $PKG_CONFIG glib-2.0; then
         cat<<EOF>>Makefile.settings
@@ -175 +171 @@
 EOF
         echo '#define GLIB2' >> config.h
+        GLIB=2
 elif type glib-config > /dev/null 2> /dev/null; then
         cat<<EOF>>Makefile.settings
@@ -181 +178 @@
 EOF
         echo '#define GLIB1' >> config.h
+        GLIB=1
 else
         echo 'Cannot find glib development libraries, aborting. (Install libglib-dev?)'
@@ -186 +184 @@
 fi
 
-if [ -r /usr/include/iconv.h ]; then
+if [ GLIB = 1 -o -r /usr/include/iconv.h ]; then
         :;
 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
-
-
-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
+        echo 'Makefile.settings to tell where this file is.';
+fi
 
 
@@ -452 +426 @@
 fi
 
-echo '  Using event handler: '$events;
-echo '  Using SSL library: '$ssl;
+if [ "$msn" = "1" ]; then
+        echo '  Using SSL library: '$ssl;
+fi
 
 #if [ "$flood" = "0" ]; then